From dae3542d363ba61d1bb023e28abab9bfada4cba4 Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Wed, 3 Apr 2024 16:10:12 +0800
Subject: [PATCH] no message

---
 .../orderSiteList/components/OrderList.vue    | 20 +++++++++---------
 src/pages/orderSiteList/orderSiteList.vue     | 21 ++++++++-----------
 src/pagesMember/address/address.vue           |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/pages/orderSiteList/components/OrderList.vue b/src/pages/orderSiteList/components/OrderList.vue
index c9478d5..24478c4 100644
--- a/src/pages/orderSiteList/components/OrderList.vue
+++ b/src/pages/orderSiteList/components/OrderList.vue
@@ -43,15 +43,15 @@ const getData = async () => {
   // 发送请求后，重置标记
   isLoading.value = false
   data.list.forEach((e) => {
-    // if (e.orderDetails) {
-    //   e.orderDetails.forEach((q) => {
-    //     const arr = JSON.parse(q.product.photo)
-    //     const imgUrl = serviceDomain + arr[0].url
-    //     q.imgUrl = imgUrl
-    //   })
-    // } else {
-    //   e.orderDetails = []
-    // }
+    if (e.orderDetails) {
+      e.orderDetails.forEach((q) => {
+        const arr = JSON.parse(q.product.photo)
+        const imgUrl = serviceDomain + arr[0].url
+        q.imgUrl = imgUrl
+      })
+    } else {
+      e.orderDetails = []
+    }
   })
   // 数组追加
   orderList.value.push(...data.list)
@@ -110,7 +110,7 @@ const onRefresherrefresh = async () => {
             <view class="product-name">{{ item2.product?.name }}</view>
           </view>
         </view>
-        <view class="predict-weight">预估重量：{{ item.predictWeight?.desc }}</view>
+        <!-- <view class="predict-weight">预估重量：{{ item.predictWeight?.desc }}</view> -->
       </view>
       <view class="foot">
         <view class="appointment-time"> 预约时间： {{ item.appointmentTime }}</view>
diff --git a/src/pages/orderSiteList/orderSiteList.vue b/src/pages/orderSiteList/orderSiteList.vue
index b687721..8b822f3 100644
--- a/src/pages/orderSiteList/orderSiteList.vue
+++ b/src/pages/orderSiteList/orderSiteList.vue
@@ -1,23 +1,17 @@
-<!--
- * @Author: 王文杰 
- * @Date: 2024-03-26 16:57:42
- * @LastEditors: 王文杰 
- * @LastEditTime: 2024-03-26 17:13:03
- * @FilePath: /app-nx-personal/src/pages/orderSiteList/orderSiteList.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <script setup lang="ts">
 import { ref } from 'vue'
 import OrderList from './components/OrderList.vue'
+// 获取页面参数
+const query = defineProps<{
+  type: string
+}>()
+
 </script>
 
 <template>
   <view class="viewport">
     <!-- 滑动容器 -->
-    <swiper class="swiper">
-      <!-- 滑动项 -->
-      <OrderList />
-    </swiper>
+    <OrderList />
   </view>
 </template>
 
@@ -31,7 +25,10 @@ page {
   height: 100%;
   display: flex;
   flex-direction: column;
+  background-color: #fff;
 }
+
+
 // swiper
 .swiper {
   background-color: #f7f7f8;
diff --git a/src/pagesMember/address/address.vue b/src/pagesMember/address/address.vue
index b4572f3..0dc96fe 100644
--- a/src/pagesMember/address/address.vue
+++ b/src/pagesMember/address/address.vue
@@ -68,7 +68,7 @@ const onChangeAddress = (item: AddressItem) => {
                 <text class="contact">{{ item.receiveMobilePhone }}</text>
                 <text v-if="item.isDefault" class="badge">默认</text>
               </view>
-              <view class="locate">{{ item.receiveStreet }}</view>
+              <view class="locate">{{ item.receiveStreet }} {{ item.receiveHouseNumber }}</view>
               <navigator class="edit" hover-class="none"
                 :url="`/pagesMember/address-form/address-form?info=${JSON.stringify(item)}`" @tap.stop="() => { }"
                 @tap.prevent="() => { }">