hookehuyr

fix(订单管理): 修复订单状态显示和操作按钮逻辑

- 统一待发货和待收货的显示文本,移除viewMode条件判断
- 区分购车和卖车模式下的已取消订单操作按钮
- 更新订单状态注释为待收货
1 <!-- 1 <!--
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2025-07-29 17:05:33 4 + * @LastEditTime: 2025-07-30 11:06:55
5 * @FilePath: /jgdl/src/pages/myOrders/index.vue 5 * @FilePath: /jgdl/src/pages/myOrders/index.vue
6 * @Description: 订单管理页面 6 * @Description: 订单管理页面
7 --> 7 -->
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
29 待支付 29 待支付
30 </view> 30 </view>
31 <view class="tab-item" :class="{ active: activeTab === 5 }" @click="setActiveTab(5)"> 31 <view class="tab-item" :class="{ active: activeTab === 5 }" @click="setActiveTab(5)">
32 - {{ viewMode === 'buy' ? '待发货' : '待发货' }} 32 + 待发货
33 </view> 33 </view>
34 <view class="tab-item" :class="{ active: activeTab === 9 }" @click="setActiveTab(9)"> 34 <view class="tab-item" :class="{ active: activeTab === 9 }" @click="setActiveTab(9)">
35 - {{ viewMode === 'buy' ? '待收货' : '已发货' }} 35 + 待收货
36 </view> 36 </view>
37 <view class="tab-item" :class="{ active: activeTab === 11 }" @click="setActiveTab(11)"> 37 <view class="tab-item" :class="{ active: activeTab === 11 }" @click="setActiveTab(11)">
38 已完成 38 已完成
...@@ -155,13 +155,20 @@ ...@@ -155,13 +155,20 @@
155 </nut-button> 155 </nut-button>
156 </template> 156 </template>
157 157
158 - <!-- 已取消状态 --> 158 + <!-- 购车模式:已取消状态 -->
159 - <template v-if="order.status === 7"> 159 + <template v-if="viewMode === 'buy' && order.status === 7">
160 <nut-button type="default" size="small" @click="deleteOrder(order.id)" 160 <nut-button type="default" size="small" @click="deleteOrder(order.id)"
161 :loading="deletingOrderId === order.id" :disabled="deletingOrderId === order.id"> 161 :loading="deletingOrderId === order.id" :disabled="deletingOrderId === order.id">
162 {{ deletingOrderId === order.id ? '删除中...' : '删除订单' }} 162 {{ deletingOrderId === order.id ? '删除中...' : '删除订单' }}
163 </nut-button> 163 </nut-button>
164 </template> 164 </template>
165 +
166 + <!-- 卖车模式:已取消状态 -->
167 + <template v-if="viewMode === 'sell' && order.status === 7">
168 + <nut-button type="default" size="small" @click="viewOrderDetail(order.id)">
169 + 订单详情
170 + </nut-button>
171 + </template>
165 </view> 172 </view>
166 </view> 173 </view>
167 </view> 174 </view>
...@@ -693,7 +700,7 @@ const getStatusText = (status) => { ...@@ -693,7 +700,7 @@ const getStatusText = (status) => {
693 case 5: 700 case 5:
694 return '待发货' 701 return '待发货'
695 case 9: 702 case 9:
696 - return viewMode.value === 'buy' ? '待收货' : '已发货' 703 + return '待收货'
697 case 11: 704 case 11:
698 return '已完成' 705 return '已完成'
699 case 7: 706 case 7:
...@@ -1278,7 +1285,7 @@ const performConfirmShip = async (orderId) => { ...@@ -1278,7 +1285,7 @@ const performConfirmShip = async (orderId) => {
1278 const order = orders.value.find(o => o.id === orderId) 1285 const order = orders.value.find(o => o.id === orderId)
1279 1286
1280 if (order) { 1287 if (order) {
1281 - // 更新订单状态为已发货/待收货 1288 + // 更新订单状态为待收货
1282 order.status = 9 1289 order.status = 9
1283 1290
1284 Taro.showToast({ 1291 Taro.showToast({
......