Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/delivery/allDelivery.vue

@@ -406,6 +406,7 @@ export default {
         this.$msg('请输入货物总重量');
         return;
       }
+      uni.showLoading({mask:false})
       // 调用API提交配送订单
       createDeliveryOrder({
         orderId: this.orderId,
@@ -416,6 +417,7 @@ export default {
         pickupTime: this.pickupTime,
         remark: this.remark,
       }).then(res => {
+        uni.hideLoading()
         if (res && res.code === 1) {
           this.$msg('下单成功');
           //this.pageTo({url: '/pagesOrder/detail?id=' + this.orderId, type: 2 }); 

hdApp/src/admin/delivery/allDelivery.vue

@@ -403,6 +403,7 @@ export default {
         this.$msg('请输入货物总重量');
         return;
       }
+      uni.showLoading({mask:false})
       // 调用API提交配送订单
       createDeliveryOrder({
         orderId: this.orderId,
@@ -413,6 +414,7 @@ export default {
         pickupTime: this.pickupTime,
         remark: this.remark,
       }).then(res => {
+        uni.hideLoading()
         if (res && res.code === 1) {
           this.$msg('下单成功');
           uni.$emit('updateOrderStatus', this.orderId, 3, 0);