add 更换部分订单状态

kxmall-admin-ui/src/views/order/storeOrder/index.vue

@@ -75,7 +75,7 @@
       <el-table-column
         v-if="queryParams.orderStatus!=='14'&&queryParams.orderStatus!=='16'&&queryParams.orderStatus!=='10'"
         align="center"
-        label="配送员"
+        label="师傅名称"
       >
         <template slot-scope="{row}">
           <el-tag :type="row.riderName ? 'error' : 'success'">
@@ -116,14 +116,6 @@
         prop="userAddress"
         width="200"
       />
-      <el-table-column
-        align="center"
-        label="配送费"
-      >
-        <template slot-scope="scope">
-          <span>{{ scope.row.freightPrice == 0 ? '免配送' : scope.row.freightPrice }}</span>
-        </template>
-      </el-table-column>
       <el-table-column
         align="center"
         label="订单金额"
@@ -211,37 +203,23 @@
             @click="viewDetail(row.id)"
           >详情
           </el-button>
-          <el-button
-            v-if="row.status===14"
-            size="mini"
-            type="primary"
-            @click="handleOperation(row.id,'startStocking')"
-          >开始配货
-          </el-button>
-          <el-button
-            v-if="row.status===16"
-            size="mini"
-            type="primary"
-            @click="handleOperation(row.id,'completeAllocation')"
-          >完成配货
-          </el-button>
           <el-button
             v-if="row.status===30"
             size="mini"
             type="primary"
             @click="handleOperation(row.id,'completeDelivery')"
-          >完成配送
+          >完成服务
           </el-button>
           <el-button
-            v-if="(row.status===20||row.status===32||row.status===30) && row.shippingType===2"
+            v-if="(row.status===14||row.status===32||row.status===30) && row.shippingType===2"
             size="mini"
             type="success"
             @click="showVerifyDialog(row.id)"
           >完成取货
           </el-button>
-          <!-- 合并后的配送下拉按钮 -->
+          <!-- 合并后的服务下拉按钮 -->
           <el-button
-            v-if="(row.status === 20 || row.status===32||row.status===30) && row.shippingType===1"
+            v-if="(row.status === 14 || row.status===32||row.status===30) && row.shippingType===1"
             size="mini"
             style="margin-left: 10px;"
             type="primary"
@@ -250,7 +228,7 @@
           >指定师傅
           </el-button>
           <el-button
-            v-if="[16,20,30,32,34].includes(row.status)"
+            v-if="[14,30,32,34].includes(row.status)"
             size="mini"
             style="margin-left: 10px;"
             type="danger"
@@ -296,7 +274,7 @@
               <div class="detail-item">
                 <span class="item-label">订单类型:</span>
                 <el-tag :type="form.shippingType==1 ? 'primary' : 'success'">
-                  {{ form.shippingType == 1 ? '配送' : '自提' }}
+                  {{ form.shippingType == 1 ? '上门' : '自提' }}
                 </el-tag>
               </div>
             </el-col>
@@ -368,7 +346,7 @@
             </el-col>
             <el-col :span="8">
               <div class="detail-item">
-                <span class="item-label">配送状态:</span>
+                <span class="item-label">服务状态:</span>
                 <el-tag :type="getRiderStatusTagType(form.riderOrder.status)">
                   {{ getRiderStatus(form.riderOrder.status) }}
                 </el-tag>
@@ -391,7 +369,7 @@
           </div>
 
           <div class="detail-item">
-            <span class="item-label">配送时间:</span>
+            <span class="item-label">服务时间:</span>
             <span class="item-value">{{ form.riderOrder.finishTime ? form.riderOrder.finishTime : '未完成' }}</span>
           </div>
         </div>
@@ -563,7 +541,7 @@
 
     <el-dialog
       :visible.sync="allotShow"
-      title="选择配送员"
+      title="选择师傅"
       width="30%"
     >
       <el-table
@@ -573,7 +551,7 @@
       >
         <el-table-column
           align="center"
-          label="骑手名"
+          label="师傅名称"
           prop="name"
         />
         <el-table-column
@@ -763,17 +741,16 @@ export default {
       form: {},
       // 表单校验
       status: [
-        { label: '待配货', name: '14' },
-        { label: '配货中', name: '16' },
-        { label: '待配送', name: '20' },
-        { label: '配送中', name: '30' },
+        { label: '全部订单', name: 'all' },
+        { label: '待接单', name: '14' },
+        { label: '正在路上', name: '20' },
+        { label: '服务中', name: '30' },
         { label: '已完成', name: '40,50' },
-        { label: '配送异常', name: '32' },
+        { label: '服务异常', name: '32' },
         { label: '超时订单', name: '34' },
         { label: '待支付', name: '10' },
         { label: '已退款', name: '70' },
         { label: '已取消', name: '80' },
-        { label: '全部订单', name: 'all' }
       ],
       storages: []
     }
@@ -849,9 +826,9 @@ export default {
     getRiderStatusTagType(status) {
       const typeMap = {
         0: 'warning', // 待取货 - 黄色
-        1: 'primary', // 配送中 - 蓝色
+        1: 'primary', // 服务中 - 蓝色
         2: 'danger', // 超时 - 红色
-        3: 'danger', // 配送异常 - 红色
+        3: 'danger', // 服务异常 - 红色
         4: 'success', // 已完成 - 绿色
         5: 'info' // 被更改分配 - 灰色
       }
@@ -860,9 +837,9 @@ export default {
     getRiderStatus(status) {
       const statusMap = {
         0: '待取货',
-        1: '配送中',
+        1: '服务中',
         2: '超时',
-        3: '配送异常',
+        3: '服务异常',
         4: '已完成',
         5: '被更改分配'
       }
@@ -1024,13 +1001,13 @@ export default {
     },
     getStatusTagType(status) {
       const typeMap = {
-        14: 'warning', // 待配货 - 黄色
+        14: 'primary', // 待配货 - 黄色
         16: 'warning', // 配货中 - 黄色
-        20: 'primary', // 待配送 - 蓝色
-        30: 'primary', // 配送中 - 蓝色
+        20: 'primary', // 正在路上 - 蓝色
+        30: 'primary', // 服务中 - 蓝色
         40: 'success', // 已完成 - 绿色
         50: 'success', // 已完成 - 绿色
-        32: 'danger', // 配送异常 - 红色
+        32: 'danger', // 服务异常 - 红色
         34: 'danger', // 超时订单 - 红色
         10: 'info', // 待支付 - 灰色
         70: 'danger', // 已退款 - 红色
@@ -1041,13 +1018,11 @@ export default {
     },
     getStatus(s) {
       const status = {
-        14: '待配货',
-        16: '配货中',
-        20: '待配送',
-        30: '配送中',
+        14: '待接单',
+        30: '正在路上',
         50: '已完成',
         40: '已完成',
-        32: '配送异常',
+        32: '服务异常',
         34: '超时订单',
         10: '待支付',
         70: '已退款',

kxmall-admin-ui/src/views/product/storeProduct/index.vue

@@ -92,7 +92,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(row)"
-          >修改2
+          >修改
           </el-button>
           <el-button
             v-hasPermi="['product:storeProductRule:remove']"

kxmall-app-ui/pages/order/create.vue

@@ -262,7 +262,7 @@ export default {
         mono: '',
         takeWay: '',
         freightPrice: 0,
-        urgentFee: undefined, // 加急费用
+        urgentFee: 0, // 加急费用
         addressId: undefined,
         predictTime: '',
         phone: '',

kxmall-app-ui/pages/order/detail.vue

@@ -579,7 +579,7 @@ export default {
         }
         if (res.data.status === 14 || res.data.status === 16) {
           this.state = 1
-          this.stateText = '备货中'
+          this.stateText = '派单中'
           this.getRiderLocation(res.data.postId, res.data.id)
         }
         if (res.data.status === 20 && res.data.shippingType === 1) {

kxmall-app-ui/pages/order/list.vue

@@ -101,7 +101,7 @@
         statusMap: {
           10: '未付款',
           12: '正在拼团',
-          14: '等待配货',
+          14: '派单中',
           16: '配货中',
           20: '待出库',
           30: '待收货',

kxmall-rider-ui/pages/order/order.vue

@@ -89,7 +89,7 @@
       </view>
     </view>
     
-    <view class="count" >
+    <view class="count" v-if="userOrderPhotos.length > 0">
       <view class="count_item">
         <text class="txt3">用户上传照片</text>
       </view>
@@ -112,7 +112,7 @@
     </view>
     
     <!-- 照片上传区域 - 仅在订单状态为4时显示 -->
-    <view class="count" >
+    <view class="count"  v-if="orderPhotos.length > 0">
       <view class="count_item">
         <text class="txt3">订单照片</text>
         <view class="photo-mode-btn" @click="togglePhotoMode" v-if="details.status === 4">

kxmall-rider-ui/pages/task/task.vue

@@ -32,11 +32,6 @@
       <view class="form" v-for="(item, index) in list" :key="index">
         <view class="form_item">
           <view class="form_item_l item2">{{ menuList[menuIndex].label }}</view>
-          <view class="form_item_r">配送费<span style="color: red">￥{{ item.freightPrice }}</span></view>
-        </view>
-        <view class="form_item">
-          <view class="form_item_l">前置仓库</view>
-          <view class="form_item_r">{{ item.storeName }}</view>
         </view>
         <view class="form_item" v-if="item.predictTime">
           <view class="form_item_l">送达时间</view>
@@ -153,22 +148,27 @@
 
         menuIndex: 0,
         menuList: [{
-            label: '待取货',
+            label: '待接单',
             status: 0,
             num: 0
           },
           {
-            label: '配送中',
+            label: '已接单',
+            status: 6,
+            num: 0
+          },
+          {
+            label: '正在路上',
             status: 1,
             num: 0
           },
           {
-            label: '超时',
+            label: '服务中',
             status: 2,
             num: 0
           },
           {
-            label: '配送异常',
+            label: '服务异常',
             status: 3,
             num: 0
           },