跑腿优化

ghsApp/src/admin/billing/affirm.vue

@@ -1052,9 +1052,15 @@ export default {
         }
       }
 
-      if(this.form.sendType == 2 && this.form.callErrand == 1 && this.form.hasPay == 0){
-        this.$msg('待付款，暂不支持马上发跑腿')
-        return false
+      if(this.form.callErrand == 1){
+        if(this.form.sendType == 2 && this.form.hasPay == 0){
+          this.$msg('待付款，暂不支持马上发跑腿')
+          return false
+        }
+        if (this.$util.isEmpty(this.customInfo.long) || this.$util.isEmpty(this.customInfo.lat) || this.$util.isEmpty(this.customInfo.address)) {
+          this.$msg('客户地址不完整，不支持马上发跑腿')
+          return false
+        }
       }
 
       if (this.option && this.option.orderId && this.option.orderId > 0) {

ghsPad/.gitignore

@@ -16,6 +16,7 @@ yarn-error.log*
 .project
 .idea
 .vscode
+.hbuilderx
 *.suo
 *.ntvs*
 *.njsproj

ghsPad/src/pages/home/components/settlePop.vue

@@ -60,7 +60,8 @@
                         </scroll-view>
                     </view>
                     <view v-else class="empty-quotes-view">
-                      <text style="font-size:12upx;">正在获取运费...</text>
+                      <text style="font-size:12upx;color:red;" v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)">请先完善客户地址</text>
+                      <text style="font-size:12upx;" v-else>正在获取运费...</text>
                     </view>
 
                     <view class="select-item_box">
@@ -414,7 +415,7 @@ export default {
                 if (this.isAddressInvalid) {
                     return;
                 }
-                this.getDeliveryQuotes();
+                this.getDeliveryQuotes()
             }
         },
         totalShop: {
@@ -555,7 +556,9 @@ export default {
                 this.selectedDeliveryData = null;
             } else {
                 if (this.openIntraCity == 1) {
-                    this.getDeliveryQuotes();
+                    //将上次的跑腿选项清掉
+                    this.deliveryQuotes = []
+                    this.getDeliveryQuotes()
                 }
             }
         },

hdApp/src/admin/billing/affirm.vue

@@ -1057,9 +1057,15 @@ export default {
           params.pickupTime = this.pickupTime.value
         }
       }
-      if(this.form.sendType == 2 && this.form.callErrand == 1 && this.form.hasPay == 0){
-        this.$msg('待付款，暂不支持马上发跑腿')
-        return false
+      if(this.form.callErrand == 1){
+        if(this.form.sendType == 2 && this.form.hasPay == 0){
+          this.$msg('待付款，暂不支持马上发跑腿')
+          return false
+        }
+        if (this.$util.isEmpty(this.customInfo.long) || this.$util.isEmpty(this.customInfo.lat) || this.$util.isEmpty(this.customInfo.address)) {
+          this.$msg('客户地址不完整，不支持马上发跑腿')
+          return false
+        }
       }
 
       //多颜色