From d6f3f9c812ed4ca75e2032b25715ca574e56bd08 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Sat, 13 Apr 2024 19:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mall/subs/order/order-confirm.vue         | 2 +-
 src/pages/mine/subs/address/create.vue              | 6 +++---
 src/pages/mine/subs/address/index.vue               | 7 +++++--
 src/pages/mine/subs/order/components/order-item.vue | 2 +-
 src/pages/mine/subs/profile/index.vue               | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index 49408e9..b3cc535 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -200,7 +200,7 @@ const payment = async () => {
     // 'allowIntegral': 0,
     // 'produceIntegralNumber': 0,
     'remark': orderBean.value?.remark,
-    // 'address': JSON.stringify(deliveryAddress.value),
+    'address': JSON.stringify(deliveryAddress.value),
     'orderGoods': orderBean?.value?.orderGoods?.map(item => (
       {
         'goodsId': item.id,
diff --git a/src/pages/mine/subs/address/create.vue b/src/pages/mine/subs/address/create.vue
index e979e5e..d6af000 100644
--- a/src/pages/mine/subs/address/create.vue
+++ b/src/pages/mine/subs/address/create.vue
@@ -61,9 +61,9 @@ const params = ref<{
 });
 
 onLoad(async (e: any) => {
-  // const result = await getAddressDetail(e.addrid);
-  params.value = JSON.parse(decodeURIComponent(e.bean));
-  console.log('----------->>>', params.value);
+  if(e.bean) {
+    params.value = JSON.parse(decodeURIComponent(e.bean));
+  }
 });
 
 const bindConsignee = (e: any) => {
diff --git a/src/pages/mine/subs/address/index.vue b/src/pages/mine/subs/address/index.vue
index da9bcd7..84f6e9b 100644
--- a/src/pages/mine/subs/address/index.vue
+++ b/src/pages/mine/subs/address/index.vue
@@ -43,8 +43,11 @@ const fetchAddressList = async () => {
 };
 
 const onChecked = (e: any) => {
-  uni.navigateBack();
-  userStore.setDeliveryAddress(e);
+  const pages = getCurrentPages();
+  if(pages.length > 2 && pages[pages.length - 2].route?.includes('pages/mall/subs/order/order-confirm')) {
+    userStore.setDeliveryAddress(e);
+    uni.navigateBack();
+  }
 };
 </script>
 
diff --git a/src/pages/mine/subs/order/components/order-item.vue b/src/pages/mine/subs/order/components/order-item.vue
index 2b6726c..d9c1dd8 100644
--- a/src/pages/mine/subs/order/components/order-item.vue
+++ b/src/pages/mine/subs/order/components/order-item.vue
@@ -33,7 +33,7 @@
 
       <view class='c-flex-row'>
         <text class='add-shoppingcart secondary-text-color' @click.stop='add(item?.orderGoods[0])'>加入购物车</text>
-        <text class='payment accent-text-color' v-if='isPending(item)' @click.stop='pay(item?.id)'>立即支付
+        <text class='payment accent-text-color' v-if='isPending(item)' @click.stop='goPath(`/pages/mine/subs/order/detail?orderId=${item?.id}`)'>立即支付
         </text>
       </view>
     </view>
diff --git a/src/pages/mine/subs/profile/index.vue b/src/pages/mine/subs/profile/index.vue
index b226153..1b9d96c 100644
--- a/src/pages/mine/subs/profile/index.vue
+++ b/src/pages/mine/subs/profile/index.vue
@@ -24,7 +24,7 @@
       <view class='divider' />
       <view class='c-flex-row'>
         <text>手机号</text>
-        <input placeholder='请输入手机号' :disabled='userInfo.telephone.length!=0'
+        <input placeholder='请输入手机号' :disabled='(userInfo.telephone?.length||0)!=0'
                v-model='params.telephone'
                @input='bindTelephone' />
       </view>