Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!170

src/components/DragImageUpload/index.vue

@@ -180,7 +180,7 @@ export default {
           var pitem = {
             name: item.fileName,
             url:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName,
-            thumbUrl:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "_s"
+            thumbUrl:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "?imageView2/2/w/375"
           };
           this.previewList.push(pitem)
           return item;

src/components/ImageShow/index.vue

@@ -111,7 +111,7 @@
             var pitem = {
               name: item.fileName,
               url:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName,
-              thumbUrl: (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "_s",
+              thumbUrl: (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "?imageView2/2/w/375",
             };
             this.previewList.push(pitem)
             return item;

src/components/ImageUpload/index.vue

@@ -158,7 +158,7 @@
             var pitem = {
               name: item.fileName,
               url:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName,
-              thumbUrl:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "_s"
+              thumbUrl:  (this.isPublic ? publicFileGetUrl : (this.baseUrl + privateFileGetUrl)) + item.fileName + "?imageView2/2/w/375"
             };
             this.previewList.push(pitem)
             return item;

src/views/order/channel/components/ExpressEdit.vue

@@ -101,7 +101,7 @@ export default {
     getFormData(){
       this.shipForm.deliveryId = this.goodsInfo.deliveryId
       this.shipForm.deliveryFlowId = this.goodsInfo.deliveryFlowId
-      this.shipForm.deliveryType = this.goodsInfo.deliveryType
+      this.shipForm.deliveryType = this.goodsInfo.deliveryFlowId?"1":"2"
     },
 
     // 关闭发货弹框

src/views/order/channel/detail.vue

@@ -84,8 +84,6 @@
             @click="toGoods()"
             >发货</el-button
           >
-          <!--              ============================================================================================改-->
-
           <div class="info-item-content-one" v-if="status.value === 2">
             <div class="title">配送方式：</div>
             <div class="txt">

src/views/order/deliver/components/ExpressEdit.vue

@@ -105,7 +105,7 @@ export default {
     getFormData(){
       this.shipForm.deliveryId = this.goodsInfo.deliveryId
       this.shipForm.deliveryFlowId = this.goodsInfo.deliveryFlowId
-      this.shipForm.deliveryType = this.goodsInfo.deliveryType
+      this.shipForm.deliveryType = this.goodsInfo.deliveryFlowId?"1":"2"
     },
 
     // 关闭发货弹框

src/views/order/deliver/components/SendGoods.vue

@@ -127,7 +127,7 @@ export default {
       shipForm: {
         deliveryId: "",
         deliveryFlowId: "",
-        deliveryType:"1",
+        deliveryType: "1",
       },
       // 快递下拉列表
       companyData: [],
@@ -148,6 +148,7 @@ export default {
   methods: {
     // 关闭发货弹框
     close() {
+      this.shipForm.deliveryType = "1";
       this.$emit("close");
       this.loading = false;
       this.ids = [];