跑腿优化

ghsApp/src/admin/home/components/OrderItem.vue

@@ -146,19 +146,19 @@
 
     <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
       <view class="more-popup-body">
-        <view class="text-center"><button class="admin-button-com" @click="addExpress(item)">顺丰下单</button></view>
-        <view class="text-center"><button class="admin-button-com" @click="cancelExpress(item)">取消顺丰订单</button></view>
-        <view class="text-center"><button class="admin-button-com" @click="fillNoFh(item)">填单发货</button></view>
-        <view class="text-center"><button class="admin-button-com" @click="sim(item)">模拟</button></view>
         <block v-if="item.sendStatus == -1">
-          <view class="text-center"><button class="admin-button-com" @click="callExpress(item)">呼叫跑腿</button></view>
+          <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">呼叫跑腿</button></view>
         </block>
         <block v-else-if="item.sendStatus == 0 || item.sendStatus == 1 || item.sendStatus == 4 || item.sendStatus == 5">
           <view class="text-center"><button class="admin-button-com" @click="cancelExpressOrder(item)">取消跑腿</button></view>
         </block>
         <block v-else-if="item.sendStatus == 3">
-          <view class="text-center"><button class="admin-button-com" @click="callExpress(item)">重叫跑腿</button></view>
+          <view class="text-center"><button class="admin-button-com" @click="callIntraCity(item)">重叫跑腿</button></view>
         </block>
+        <view class="text-center"><button class="admin-button-com" @click="addExpress(item)">顺丰下单</button></view>
+        <view class="text-center"><button class="admin-button-com" @click="cancelExpress(item)">取消顺丰订单</button></view>
+        <view class="text-center"><button class="admin-button-com" @click="fillNoFh(item)">填单发货</button></view>
+        <!-- <view class="text-center"><button class="admin-button-com" @click="sim(item)">模拟</button></view> -->
         <view class="text-center"><button class="admin-button-com default" @click="closeMore">取消</button></view>
       </view>
     </uni-popup>
@@ -216,16 +216,8 @@
     <!-- 跑腿弹窗 -->
     <uni-popup ref="callExpressRef" background-color="#fff" type="center" :animation="true" class="class-popup-style" :mask-click="false">
       <view class="call-express-popup-body">
-        <view class="popup-title">发货信息</view>
+        <view class="popup-title">呼叫跑腿信息</view>
         <view class="form-vertical">
-          <view class="form-row">
-            <view class="form-label">包裹数量：</view>
-            <input class="input-control" type="number" v-model="callExpressData.packageNum" placeholder="请输入包裹数量" />
-          </view>
-          <view class="form-row">
-            <view class="form-label">重量(kg)：</view>
-            <input class="input-control" type="digit" v-model="callExpressData.weight" placeholder="请输入重量" />
-          </view>
           <view class="form-row">
             <view class="form-label">姓名：</view>
             <view class="form-value">{{ callExpressData.user_name }}</view>
@@ -240,13 +232,26 @@
           </view>
           <view class="form-row">
             <view class="form-label">地址：</view>
-            <view class="form-value">{{ callExpressData.fullAddress }}{{ callExpressData.floor }}</view>
+            <view class="form-value">{{ callExpressData.address }}</view>
+          </view>
+          <view class="form-row">
+            <view class="form-label">包裹数：</view>
+            <input class="input-control" type="number" v-model="callExpressData.packageNum" @focus="callExpressData.packageNum=''" placeholder="包裹数量" />
+          </view>
+          <view class="form-row">
+            <view class="form-label">重量：</view>
+            <input class="input-control" type="digit" v-model="callExpressData.weight" @focus="callExpressData.weight=''" placeholder="公斤" />
+          </view>
+          <view class="form-row">
+            <view class="form-label">运费：</view>
+            <view class="form-value" style="color:#3385FF;font-weight:bold;">{{ callExpressData.sendCost?parseFloat(callExpressData.sendCost):0 }}</view>
           </view>
         </view>
         <view class="popup-actions">
           <button class="admin-button-com default" @click="closeCallExpressPop">取消</button>
-          <button class="admin-button-com bule" @click="modifyAddress(item)">修改地址</button>
-          <button class="admin-button-com bule" @click="confirmCallExpress(item)">提交</button>
+          <button class="admin-button-com bule" @click="modifyAddress(item)">改地址</button>
+          <button class="admin-button-com bule" @click="selectFee(item)">查运费</button>
+          <button class="admin-button-com bule" @click="confirmMyExpress(item)">提交</button>
         </view>
       </view>
     </uni-popup>
@@ -255,7 +260,7 @@
 <script>
 import { getUserDet } from '@/api/member';
 import { createExpressOrder, cancelExpressOrder as cancelSFExpressOrder } from '@/api/express';
-import { createCallExpressOrder as apiCreateCallExpressOrder, cancelExpressOrder as apiCancelCallExpressOrder } from '@/api/shop/shop-express.js';
+import { createCallExpressOrder as apiCreateCallExpressOrder, cancelExpressOrder as apiCancelCallExpressOrder,getOrderFee } from '@/api/shop/shop-express';
 export default {
   name: 'OrderItem',
   components: {},
@@ -281,7 +286,7 @@ export default {
       receiverFloor: '',
       receiverName: '',
       receiverMobile: '',
-      callExpressData: {}
+      callExpressData: {sendCost:0,packageNum:1,weight:0}
     };
   },
   mounted() {
@@ -291,10 +296,8 @@ export default {
   },
   methods: {
     modifyAddress(item) {
-      this.closeExpressPop();
-      this.$util.pageTo({
-        url: '/pagesClient/member/modify?id=' + item.customId + '&name=' + item.customName
-      });
+      this.closeExpressPop()
+      this.$util.pageTo({url: '/pagesClient/member/modify?id=' + item.customId + '&name=' + item.customName,type:2})
     },
     shareOrder(info) {
       this.$emit('shareOrder', info);
@@ -331,20 +334,19 @@ export default {
     sim(item) {
       //testUpdate({id:item.id}).then(res=>{ })
     },
-    callExpress(item) {
+    callIntraCity(item) {
       this.closeMore();
       this.callExpressData = {
         orderId: item.id,
         orderSn: item.orderSn,
         weight: Number(item.weight),
-        packageNum: item.smallNum > 0 ? item.bigNum / item.smallNum : item.bigNum,
+        packageNum: 1,
         user_name: item.customName,
         user_phone: item.customMobile,
         user_lng: item.long,
         user_lat: item.lat,
         note: item.remark,
-        fullAddress: item.fullAddress,
-        floor: item.floor
+        address: item.address
       };
       this.$refs.callExpressRef.open('center');
     },
@@ -388,28 +390,33 @@ export default {
     closeCallExpressPop() {
       this.$refs.callExpressRef.close();
     },
-    confirmCallExpress(item) {
-      console.log(item);
+    selectFee(item){
+      getOrderFee({id:item.id,packageNum:this.callExpressData.packageNum,weight:this.callExpressData.weight}).then(res=>{
+        if(res.code == 1){
+          if(res.data.est_fee){
+            let fee = res.data.est_fee
+            fee = Number(res.data.est_fee)/100
+            fee = Number(fee).toFixed(2)
+            fee = parseFloat(fee)
+            this.callExpressData.sendCost = fee
+            this.$forceUpdate()
+          }
+          this.$msg('查询成功')
+        }
+      })
+    },
+    confirmMyExpress(item) {
       this.$util.confirmModal({ content: '确认提交？' }, () => {
         const data = {
           orderId: item.id,
-          weight: Number(item.weight),
-          packageNum: item.smallNum > 0 ? item.bigNum / item.smallNum : item.bigNum,
-          user_name: item.customName,
-          user_phone: item.customMobile,
-          user_address: item.fullAddress + item.floor,
-          user_lng: item.long,
-          user_lat: item.lat,
-          note: item.remark
-        };
-        //处理表单数据
+          weight: this.callExpressData.weight,
+          packageNum: this.callExpressData.packageNum
+        }
         apiCreateCallExpressOrder(data).then((res) => {
           if (res.code == 1) {
-            // item.sendStatus = 0;
-            // this.$emit('listendUpdateField', { id: item.id, key: 'sendStatus', value: 0 });
-            this.updateFiled({ id: item.id, key: 'sendStatus', value: 0 });
-            this.$msg(res.msg);
-            this.closeCallExpressPop();
+            this.updateFiled({ id: item.id, key: 'sendStatus', value: 0 })
+            this.$msg(res.msg)
+            this.closeCallExpressPop()
           }
         });
       });

ghsApp/src/api/shop/shop-express.js

@@ -32,6 +32,11 @@ export const getStoreFee = data => {
 	return https.post('/intra-city/store-fee', data)
 }
 
+//根据订单查询运费
+export const getOrderFee = data => {
+	return https.post('/intra-city/get-order-fee', data)
+}
+
 /**
  * 创建跑腿订单
  */