Merge remote-tracking branch 'origin/master'

src/views/hisStore/components/productOrder.vue

@@ -24,7 +24,7 @@
           <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
-          <el-button size="mini" @click="showExpress()" v-if="false">查看物流</el-button>
+          <el-button size="mini" @click="showExpress()">查看物流</el-button>
         </div>
         <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>

src/views/hisStore/storeOrder/index.vue

@@ -1290,9 +1290,15 @@ export default {
           this.getTreeselect();
         }
     });
-    this.getDicts("crm_customer_source").then((response) => {
-      this.orderMediumOptions = response.data;
-    });
+    if(process.env.NODE_ENV === "prod-hst"){
+      this.getDicts("store_order_medium").then((response) => {
+        this.orderMediumOptions = response.data;
+      });
+    } else {
+      this.getDicts("crm_customer_source").then((response) => {
+        this.orderMediumOptions = response.data;
+      });
+    }
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });