Merge branch 'zhongqi-delivery'

ghsApp/src/admin/delivery/allDelivery.vue

@@ -450,10 +450,19 @@ export default {
           //this.pageTo({url: '/pagesOrder/detail?id=' + this.orderId, type: 2 }); 
           // 为了能正常返回，需要使用navigateBack
           uni.navigateBack({ delta: 1 });
+        }else{
+          if(res.msg == '订单已发货'){
+            uni.navigateBack({ delta: 1 });
+            return;
+          }
+          this.$msg(res.msg);
         }
       }).catch(err => {
-        this.$msg(res.msg);
         console.log('下单失败:', err);
+        if (err && err.msg === '订单已发货') {
+          uni.navigateBack({ delta: 1 });
+          return;
+        }
       });
     },
     // 减少重量

ghsApp/src/admin/shop/sk.vue

@@ -92,25 +92,6 @@
 
           <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
 
-          <!-- 批发花束 -->
-          <view class="section-title" style="border-top:2upx solid #2bb931;">【批发-花束】跑腿费计算方式</view>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">包运费的</view>
-            <input class="input-field" v-model="pfHsFreeKm" type="number" placeholder="0" @focus="pfHsFreeKm = ''" />
-            <view>公里内免费配送</view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">{{pfHsFreeKm}}公里以上</view>
-            <view class="input-row">
-              <text>每公里加收</text>
-              <input class="input-field" v-model="pfHsAddFee" type="digit" placeholder="0" @focus="pfHsAddFee = ''" />
-              <text>元</text>
-            </view>
-          </tui-list-cell>
-
-          <view class="warning-text">没有包运费的花束，按实际跑腿费计算</view>
 
           <!-- 零售花材 -->
           <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
@@ -201,9 +182,6 @@ export default {
       // 批发花材配置
       pfFlowerMaterials: [{num:0,price:0,distance:0}],
       pfHcFreeKm:0,
-      // 批发花束配置
-      pfHsFreeKm:0,
-      pfHsAddFee:0,
     };
   },
   onLoad() {
@@ -276,9 +254,6 @@ export default {
         // 批发-花材
         pfHcFreeKm: this.pfHcFreeKm,
         pfHcMap: JSON.stringify(this.pfFlowerMaterials),
-        // 批发-花束
-        pfHsFreeKm: this.pfHsFreeKm,
-        pfHsAddFee: this.pfHsAddFee,
       }).then(res=>{
         if(res.code == 1){
           this.$msg(res.msg)
@@ -318,8 +293,6 @@ export default {
           // 加载批发配置
           this.pfFlowerMaterials = res.data.pfHcMap ? JSON.parse(res.data.pfHcMap) : [{num:0,price:0,distance:0}]
           this.pfHcFreeKm = res.data.pfHcFreeKm ? res.data.pfHcFreeKm : 0
-          this.pfHsFreeKm = res.data.pfHsFreeKm ? res.data.pfHsFreeKm : 0
-          this.pfHsAddFee = res.data.pfHsAddFee ? res.data.pfHsAddFee : 0
         }
       })
     },