Merge remote-tracking branch 'origin/send_coupon' into send_coupon

zxl

2025-09-30 ef70f387ae504f20e15aa7d7a933800b768892fc

Merge remote-tracking branch 'origin/send_coupon' into send_coupon

 manager/src/views/activity-prize/prize-ruler.vue

@@ -143,11 +143,6 @@
          minWidth: 200,
        },
        {
          title: '规则编码',
          key: 'ruleCode',
          minWidth: 100,
        },
        {
          title: '规则值',
          key: 'ruleValue',
          minWidth: 100,

 manager/src/views/order/order/orderDetail.vue

@@ -784,6 +784,7 @@
      }
    },
    logisticsList () {
      this.packageTraceList = []
      this.logisticsModal = true;
      API_Order.getPackage(this.sn).then((res) => {
        if (res.success && res.result != null) {

 seller/src/views/order/order/orderDetail.vue

@@ -1204,6 +1204,7 @@
      }
    },
    logisticsList () {
      this.packageTraceList = []
      this.logisticsModal = true;
      API_Order.getPackage(this.sn).then((res) => {
        if (res.success && res.result != null) {