From 15e9ca1687afb7c7ce7a08fa8b747d79d899693a Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 23 Sep 2024 11:24:52 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A2391=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=A6=82=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=AC=AC=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart.vue | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pages/cart.vue b/pages/cart.vue
index 3426d48..d773819 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -303,21 +303,26 @@
     />
     <u-popup :show="show " @close="closePopup" closeable>
       <view class="v12-secondary-dark-text v12-font-32 v12-text-center v12-py-4">收货地址</view>
-      <view class="v12-px-3 v12-mb-3 v12-font-32 v12-justify-start v12-align-center">
-        <view style="opacity: 0; width: 28px">
-          <image :src="webUrl+'/orderIcon/map.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
+      <view v-if="addressInfo">
+        <view class="v12-px-3 v12-mb-3 v12-font-32 v12-justify-start v12-align-center">
+          <view style="opacity: 0; width: 28px">
+            <image :src="webUrl+'/orderIcon/map.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
+          </view>
+          <view>收货人：{{ addressInfo.realName }}  {{ addressInfo.phone }}</view>
+          
+        </view>
+        <view class="v12-px-3 v12-mb-3 v12-font-28 v12-justify-between v12-align-start">
+          <view style="width: 30px;">
+            <image :src="webUrl+'/orderIcon/map.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
+          </view>
+          <view style="margin-bottom: 4px;width: 100%" class="more-t v12-text-left">{{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.district }}{{ addressInfo.detail }}</view>
+          <view style="width: 50px;" @click="editAddress">
+            <image :src="webUrl+'/orderIcon/编辑.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
+          </view>
         </view>
-        <view>收货人：{{ addressInfo.realName }}  {{ addressInfo.phone }}</view>
-        
       </view>
-      <view class="v12-px-3 v12-mb-3 v12-font-28 v12-justify-between v12-align-start">
-        <view style="width: 30px;">
-          <image :src="webUrl+'/orderIcon/map.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
-        </view>
-        <view style="margin-bottom: 4px;width: 100%" class="more-t v12-text-left">{{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.district }}{{ addressInfo.detail }}</view>
-        <view style="width: 50px;" @click="editAddress">
-          <image :src="webUrl+'/orderIcon/编辑.png'" style="width: 30rpx;height: 30rpx" class="v12-mr-1"/>
-        </view>
+      <view v-else>
+        <view class="v12-font-28 v12-pa-3 v12-secondary-dark-text ">尚未设置收货地址!</view>
       </view>
       <view class=" v12-px-3 v12-mb-3">
         <view class="v12-py-2 v12-primary-text v12-font-28 v12-radius-60 v12-text-center plus-btn" @click="addNewAddress">+ 添加新地址</view>
@@ -439,7 +444,7 @@ export default {
     getAddress() {
       getAddressList({page: 1, limit: 9999}).then(res => {
         this.addressList = res.data
-        this.addressInfo = res.data.find(e => e.isDefault == 1) || {}
+        this.addressInfo = res.data.find(e => e.isDefault == 1) || res.data[0] && res.data[0] || null
       });
     },
     clearCart() {