From 922a1614a63796ba43b6dc4c231d5e94a0810503 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Sat, 7 Sep 2024 13:52:50 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8)?=
 =?UTF-8?q?=EF=BC=9A=E5=BE=85=E6=94=B6=E8=B4=A7=E6=8F=90=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=EF=BC=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B0=89=E6=B0=8F=E5=8E=BF=EF=BC=8C=E7=BC=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 073f1df..d072c38 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -117,7 +117,7 @@
           </view>
           <template v-else>
             <view class="v12-justify-between" style="width: 100%">
-              <view class="bnt service" @click="goRoom(order)" v-if="order.merName">联系商家</view>
+              <view class="bnt service" @click="goRoom(order)" v-if="order.merName && order._status._type != 0">联系商家</view>
               <view class="v12-justify-between">
                 <view class="bnt service" @click="goOrderDetails(order)" v-if="['-1','-2','-3'].includes(order._status._type)">查看详情</view>
                 <view class="bnt v12-primary-text v12-primary-border" @click="takeOrder(order)" v-if="['-2','-3'].includes(order._status._type)">确认收货</view>
@@ -128,7 +128,8 @@
 
           <view class="flex">
             <template v-if="order._status._type == 0">
-              <view class="bnt cancelBnt " @click="cancelOrder(order)">取消订单</view>
+              <view class="bnt cancelBnt v12-dark-text v12-dark-border" @click="cancelOrder(order)">取消订单</view>
+              <!-- <view class="bnt cancelBnt v12-dark-text v12-dark-border" @click="addressTap()">修改地址</view> -->
               <view class="bnt bg-color-lightred  v12-white v12-primary-text v12-primary-border v12-radius-40" @click="goOrderDetails(order)">立即付款</view>
             </template>
             <template v-if="(order._status._type == 1 || order._status._type == 9) && order.isTickets==0">
@@ -152,6 +153,9 @@
             </template>
           </view>
         </view>
+        <view class="v12-px-3 v12-pb-4" v-if="order._status._type == 1">
+          <view class="v12-font-22 v12-secondary-dark-text order-tips">商家已接收您的订单，支付成功后预计48/72小时内发货</view>
+        </view>
       </view>
     </view>
 
@@ -244,6 +248,14 @@ export default {
     this.loading = false;
   },
   methods: {
+    addressTap() {
+      this.$yrouter.push({
+        path: "/pages/user/address/AddressManagement/index",
+        query: {
+          choosMode: 1
+        }
+      });
+    },
     force2Decimal(v) {
       return this.$force2Decimal(v);
     },
@@ -504,6 +516,13 @@ export default {
 page {
   background-color: #fff;
 }
+.order-tips{
+  height: 44rpx;
+  background: rgba(0,0,0,0.05);
+  border-radius: 40rpx;
+  padding: 5rpx 24rpx;
+  line-height: 44rpx;
+}
 .m-tab-warp{
   position: sticky;
   top: 0;