hookehuyr

fix: 修复弹窗拖动问题和修改订单操作确认文本

为评价弹窗和订单详情弹窗添加catch-move属性防止拖动时关闭
将删除订单和取消订单的确认提示文本修改为更简洁的表述
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-14 17:03:37 4 + * @LastEditTime: 2025-07-14 18:18:12
5 * @FilePath: /jgdl/src/pages/myOrders/index.vue 5 * @FilePath: /jgdl/src/pages/myOrders/index.vue
6 * @Description: 订单管理页面 6 * @Description: 订单管理页面
7 --> 7 -->
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <payCard :visible="show_pay" :data="payData" @close="onPayClose" @paySuccess="onPaySuccess" /> 127 <payCard :visible="show_pay" :data="payData" @close="onPayClose" @paySuccess="onPaySuccess" />
128 128
129 <!-- 评价弹窗 --> 129 <!-- 评价弹窗 -->
130 - <nut-popup v-model:visible="showRatePopup" position="right" :style="{ width: '100%', height: '100%' }" closeable 130 + <nut-popup v-model:visible="showRatePopup" position="right" :catch-move="true" :style="{ width: '100%', height: '100%' }" closeable
131 close-icon-position="top-right" @close="closeRatePopup"> 131 close-icon-position="top-right" @close="closeRatePopup">
132 <view class="rate-popup"> 132 <view class="rate-popup">
133 <view class="rate-header"> 133 <view class="rate-header">
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
177 </nut-popup> 177 </nut-popup>
178 178
179 <!-- 订单详情弹窗 --> 179 <!-- 订单详情弹窗 -->
180 - <nut-popup v-model:visible="showOrderDetailPopup" position="right" :style="{ width: '100%', height: '100%' }" 180 + <nut-popup v-model:visible="showOrderDetailPopup" position="right" :catch-move="true" :style="{ width: '100%', height: '100%' }"
181 @close="closeOrderDetailPopup"> 181 @close="closeOrderDetailPopup">
182 <view class="order-detail-popup"> 182 <view class="order-detail-popup">
183 <view class="detail-header"> 183 <view class="detail-header">
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
285 > 285 >
286 <template #default> 286 <template #default>
287 <view> 287 <view>
288 - <text style="font-size: 1rem;">删除订单将无法恢复,请谨慎操作。</text> 288 + <text style="font-size: 1rem;">是否确认删除订单?</text>
289 </view> 289 </view>
290 </template> 290 </template>
291 </nut-dialog> 291 </nut-dialog>
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
301 > 301 >
302 <template #default> 302 <template #default>
303 <view> 303 <view>
304 - <text style="font-size: 1rem;">取消订单后将无法恢复,确定要取消吗?</text> 304 + <text style="font-size: 1rem;">是否确认取消订单?</text>
305 </view> 305 </view>
306 </template> 306 </template>
307 </nut-dialog> 307 </nut-dialog>
...@@ -684,23 +684,23 @@ const submitRate = async () => { ...@@ -684,23 +684,23 @@ const submitRate = async () => {
684 note: rateContent.value, 684 note: rateContent.value,
685 created_time: new Date().toLocaleString('zh-CN') 685 created_time: new Date().toLocaleString('zh-CN')
686 } 686 }
687 - 687 +
688 // 同时更新order.review和order.details.review,确保状态一致 688 // 同时更新order.review和order.details.review,确保状态一致
689 order.review = reviewData 689 order.review = reviewData
690 if (order.details) { 690 if (order.details) {
691 order.details.review = reviewData 691 order.details.review = reviewData
692 } 692 }
693 - 693 +
694 // 确保订单状态为已完成 694 // 确保订单状态为已完成
695 order.status = 5 695 order.status = 5
696 } 696 }
697 - 697 +
698 Taro.showToast({ 698 Taro.showToast({
699 title: response.msg || '评价提交成功', 699 title: response.msg || '评价提交成功',
700 icon: 'success', 700 icon: 'success',
701 duration: 2000 701 duration: 2000
702 }) 702 })
703 - 703 +
704 closeRatePopup() 704 closeRatePopup()
705 } else { 705 } else {
706 throw new Error(response.msg || '提交失败') 706 throw new Error(response.msg || '提交失败')
......