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();
+ }
};
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 @@
加入购物车
- 立即支付
+ 立即支付
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 @@
手机号
-