From e7ba7a82e351e4d246867e34947a5616edc00441 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 9 Aug 2024 10:10:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=9C=B0=E5=9D=80=E5=8D=A1=E7=89=87=E4=BC=9A=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E9=A1=B5=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/addressSelection.vue |  2 +-
 pages/user/address/list.vue      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
index 106621e3..2432d413 100644
--- a/pages/order/addressSelection.vue
+++ b/pages/order/addressSelection.vue
@@ -86,7 +86,7 @@
   // 选择地址
   function onSelectAddress() {
     let emitName = 'SELECT_ADDRESS'
-    let addressPage = '/pages/user/address/list'
+    let addressPage = '/pages/user/address/list?type=select';
     if (state.value.deliveryType === 2){
       emitName = 'SELECT_PICK_UP_INFO'
       addressPage = '/pages/user/goods_details_store/index'
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index 47b0b1a3..f3bc6869 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -39,8 +39,8 @@
 </template>
 
 <script setup>
-  import { reactive, onBeforeMount } from 'vue';
-  import { onShow } from '@dcloudio/uni-app';
+  import { onBeforeMount, reactive } from 'vue';
+  import { onShow, onLoad } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash-es';
   import AreaApi from '@/sheep/api/system/area';
@@ -49,10 +49,14 @@
   const state = reactive({
     list: [], // 地址列表
     loading: true,
+    openType: '', // 页面打开类型
   });
 
   // 选择收货地址
   const onSelect = (addressInfo) => {
+    if (state.openType !== 'select'){ // 不作为选择组件时阻断操作
+      return
+    }
     uni.$emit('SELECT_ADDRESS', {
       addressInfo,
     });
@@ -110,6 +114,12 @@
     // #endif
   }
 
+  onLoad((option) => {
+    if (option.type) {
+      state.openType = option.type;
+    }
+  });
+
   onShow(async () => {
     state.list = (await AddressApi.getAddressList()).data;
     state.loading = false;

From a9a522880d45a568d6e1c657e014b5338916e4e9 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 9 Aug 2024 10:46:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E5=A4=8D=E7=A7=92=E6=9D=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/seckill.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index aed2cd33..6ae46d6e 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -63,7 +63,7 @@
             <detail-progress :percent="state.percent" />
           </view>
 
-          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo?.name }}</view>
+          <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name || '' }}</view>
           <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
         </view>
 
@@ -135,7 +135,7 @@
 </template>
 
 <script setup>
-  import { reactive, computed, ref } from 'vue';
+  import { reactive, computed, ref, unref } from 'vue';
   import { onLoad, onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty, min } from 'lodash-es';
@@ -198,7 +198,7 @@
 
   // 分享信息 TODO 芋艿：待接入
   const shareInfo = computed(() => {
-    if (isEmpty(activity)) return {};
+    if (isEmpty(unref(activity))) return {};
     return sheep.$platform.share.getShareInfo(
       {
         title: activity.value.name,