呼叫跑腿

ghsApp/src/admin/order/callExpress.vue

@@ -61,13 +61,11 @@
       </view>
 
       <!-- 操作按钮 -->
-      <view class="button-section">
-        <button class="express-button query-button" @click="queryDeliveryFee">
+      <view class="button-section" style="display: flex; justify-content: center; gap: 50rpx;">
+        <button class="admin-button-com blue big" @click="queryDeliveryFee">
           查运费
         </button>
-        <button class="express-button submit-button" @click="submitExpress">
-          提交
-        </button>
+        <button class="admin-button-com blue big" style="padding: 0 30rpx; display: flex; align-items: center; justify-content: center;" @click="submitExpress">提交</button>
       </view>
     </view>
   </view>

ghsApp/src/pagesOrder/detail.vue

@@ -414,6 +414,8 @@
 			<button class="admin-button-com middle blue" @click="shareOrder()">分享</button>
 			<!-- #endif -->
 
+			<button class="admin-button-com middle blue" v-if="detailInfo.sendStatus == '-1' && detailInfo.payStatus == 1" @click.stop="openExpressPage()">呼叫跑腿</button>
+
 			<button class="admin-button-com middle blue" style="background-color: green;border-color: green;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价格)</button>
 
 			<template v-for="s in detailInfo.buttonList">

hdApp/src/admin/express/create.vue

@@ -62,13 +62,11 @@
       </view>
 
       <!-- 操作按钮 -->
-      <view class="button-section">
-        <button class="express-button query-button" @click="queryDeliveryFee">
+      <view class="button-section" style="display: flex; justify-content: center; gap: 50rpx;">
+        <button class="admin-button-com blue big" @click="queryDeliveryFee">
           查运费
         </button>
-        <button class="express-button submit-button" @click="submitExpress">
-          提交
-        </button>
+        <button class="admin-button-com blue big" style="padding: 0 30rpx; display: flex; align-items: center; justify-content: center;" @click="submitExpress">提交</button>
       </view>
     </view>
   </view>
@@ -83,7 +81,6 @@ export default {
   data() {
     return {
       orderId: '',
-      isNew: 0, // 0: 重新配送, 1: 首次配送
       orderInfo: null,
       // 配送表单数据
       expressForm: {
@@ -111,7 +108,6 @@ export default {
   onLoad(options) {
     if (options.orderId) {
       this.orderId = options.orderId
-      this.isNew = options.isNew
     }
 
     //返回上一页时刷新
@@ -234,8 +230,7 @@ export default {
             user_address: this.expressForm.user_address,
             user_lng: this.expressForm.user_lng,
             user_lat: this.expressForm.user_lat,
-            note: this.expressForm.note,
-            isNew: this.isNew
+            note: this.expressForm.note
           }
           const res = await createExpressOrder(data)
           if (res.code === 1) {

hdApp/src/admin/home/order.vue

@@ -87,8 +87,8 @@
                 <view class="admin-button-com middle default" @click.stop="">呼叫跑腿</view>
               </block>
               <block v-else>
-                <view class="admin-button-com middle" v-if="item.sendStatus == '-1'" @click.stop="openExpressPage(item.id, true)">呼叫跑腿</view>
-                <view class="admin-button-com middle" v-else-if="item.sendStatus == '3'" @click.stop="openExpressPage(item.id, false)">重叫跑腿</view>
+                <view class="admin-button-com middle" v-if="item.sendStatus == '-1'" @click.stop="openExpressPage(item.id)">呼叫跑腿</view>
+                <view class="admin-button-com middle" v-else-if="item.sendStatus == '3'" @click.stop="openExpressPage(item.id)">重叫跑腿</view>
                 <view class="admin-button-com default" v-else-if="item.sendStatus == '2'">跑腿完成</view>
                 <view class="admin-button-com default" v-else="item.sendStatus == '1' && item.payStatus == 1">已发跑腿</view>
               </block>
@@ -347,12 +347,8 @@ export default {
     /**
      * 打开配送页面
      */
-    openExpressPage(orderId, isNew) {
-      const val = isNew ? 1 : 0;
-      this.$util.pageTo({ 
-        url: '/admin/express/create', 
-        query: { orderId: orderId, isNew: val }
-      })
+    openExpressPage(orderId) {
+      this.$util.pageTo({url:'/admin/express/create?orderId='+orderId})
     },
     /**
      * 取消配送订单

hdApp/src/admin/order/detail.vue

@@ -24,7 +24,7 @@
               <view class="value">{{getProgressText(orderInfo.sendStatus)}}</view>
               <view class="express-actions">
                 <button class="admin-button-com mini-btn btn-danger" v-if="orderInfo.sendStatus == '0' || orderInfo.sendStatus == '1'" @click.stop="cancelMyExpress(orderInfo.id)">取消跑腿</button>
-                <button class="admin-button-com mini-btn" v-if="orderInfo.sendStatus == '3'" @click.stop="openExpressPage(orderInfo.id, false)">重叫跑腿</button>
+                <button class="admin-button-com mini-btn" v-if="orderInfo.sendStatus == '3'" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
               </view>
             </view>
           </view>
@@ -368,7 +368,7 @@
           v-if="orderInfo.status == 1">
           扫码收款
         </button>
-        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-1' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id, true)">呼叫跑腿</button>
+        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-1' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
         <button 
           class="admin-button-com middle" 
           @click.stop="printOrder(orderInfo)" 
@@ -601,12 +601,8 @@ export default {
     /**
      * 打开配送页面
      */
-    openExpressPage(orderId, isNew) {
-      const val = isNew ? 1 : 0;
-      this.$util.pageTo({ 
-        url: '/admin/express/create', 
-        query: { orderId: orderId, isNew: val }
-      })
+    openExpressPage(orderId) {
+      this.$util.pageTo({url: '/admin/express/create?orderId='+orderId})
     },
     /**
      * 取消配送订单