Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let into dev

pagesOrder/detail/detail.vue

@@ -25,7 +25,7 @@
     				color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view>
     	</view>
     </view>
-    <view class="m-card m-address" style="margin-top: 20rpx;">
+    <view class="m-card m-address" style="margin-top: 20rpx;" v-if="addressInfo && addressInfo.address_id">
       <view class="address-info">
         <view class="top">
           <up-icon name="account"></up-icon>
@@ -41,6 +41,18 @@
             :customStyle="{color:'#666666'}">修改</up-button></view>
       </view>
     </view>
+    <view class="m-card m-address" style="margin-top: 20rpx;" v-else>
+      <view class="address-info">
+        <view class="top">
+          <up-icon name="account"></up-icon>
+          <view class="t-name">未填写收货人信息</view>
+        </view>
+      </view>
+      <view class="address-btn" v-if="datas.paid==0">
+        <view style="width: 80px;"><up-button @click="showAddress = true" size="small" shape="circle" color="#f6f6f6"
+            :customStyle="{color:'#666666'}">修改</up-button></view>
+      </view>
+    </view>
     <view class="m-card m-good" v-for="(item,index) in datas.goods_list" :key="index">
       <view class="image">
         <up-image :src="item.imgs" width="160rpx" height="160rpx"></up-image>
@@ -217,7 +229,9 @@
   // 选择地址
   const addressRef = ref(null);
   const showAddress = ref(false);
-  const addressInfo = ref({});
+  const addressInfo = ref({
+    address_id:''
+  });
   const changeAddress = (e) => {
     addressInfo.value = e;
     showAddress.value = false;

pagesOrder/order/order.vue

@@ -41,10 +41,10 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+	</view>
   <orderCanclePopup :show="showCancel" @close="showCancel=false" @change="submitCancel" />
   <modal :show="showTake" title="确认收货" content="请确认您已收到货" @close="showTake=false" @change="confirmReceipt">
   </modal>
-	</view>
 </template>
 
 <script setup>