no message

src/pages/booking/booking.vue

@@ -309,6 +309,7 @@ const bindPickerChange = (e, item) => {
           </view>
         </view>
       </view>
+      <view :class="[!isBooking ? 'disabled' : '', 'submit']" @click="handleBooking">立即预约回收</view>
     </view>
 
     <!-- uni-ui 弹出层 -->
@@ -317,10 +318,6 @@ const bindPickerChange = (e, item) => {
       <TimePanel v-if="popupName === 'time'" @close="handlePopClose" />
       <SitePanel v-if="popupName === 'site'" @close="handlePopClose" />
     </uni-popup>
-
-    <view :class="[!isBooking ? 'disabled' : '', 'submit']" @click="handleBooking"
-      >立即预约回收</view
-    >
     <!-- 底部占位空盒子 -->
     <view class="toolbar-height" safe-area-inset-bottom></view>
   </view>
@@ -335,7 +332,7 @@ page {
   height: 100%;
   .section-map {
     width: 100vw;
-    height: 300rpx;
+    height: 28vh;
 
     .map {
       width: 100%;
@@ -348,7 +345,7 @@ page {
     border-radius: 12rpx;
     background-color: #fff;
     overflow: auto;
-    height: 600rpx;
+    height: 72vh;
     .module-title {
       font-size: 30rpx;
       color: #0d0d26;
@@ -408,7 +405,7 @@ page {
       .category-list {
         display: flex;
         flex-direction: column;
-        padding: 0 20rpx;
+        padding: 0 40rpx;
         .category-item {
           display: flex;
           margin: 12rpx 0;
@@ -429,7 +426,6 @@ page {
         }
       }
     }
-  }
     .submit {
       display: flex;
       flex-direction: column;
@@ -441,13 +437,14 @@ page {
       border-radius: 16rpx;
       font-size: 32rpx;
       color: #fff;
-    background: linear-gradient(119deg, #fd815f 7%, #f1484a 95%);
+      background: linear-gradient(158deg, #51B6FF 10%, #3775F6 97%);
       &.disabled {
         background: #d4caca;
         color: #f2f2fa;
       }
     }
   }
+}
 // 底部占位空盒子
 .toolbar-height {
   height: 100rpx;

src/pages/orderList/components/OrderList.vue

@@ -17,6 +17,17 @@ const memberStore = useMemberStore()
 const props = defineProps<{
   orderState: string
 }>()
+// const statusLabel = computed(() => {
+//   const orderTabs = {
+//     PENDING: '待接单',
+//     UNPROCESSED: '待服务',
+//     RECYCLING: '回收中',
+//     FINISHED: '已完成',
+//     CANCELED: '已取消',
+//   }
+//   const res = orderTabs[props.orderState]
+//   return res
+// })
 
 // 请求参数
 const queryParams: Required<OrderListParams> = {
@@ -50,9 +61,9 @@ const getMemberOrderData = async () => {
   isLoading.value = false
   res.data.list.forEach((e) => {
     const str = e.appointmentTimeStart.slice(0, 10)
-    const start = e.appointmentTimeStart.slice(11, 13)
-    const end = e.appointmentTimeEnd.slice(11, 13)
-    e.appointmentTime = str + ' ' + start + end
+    const start = e.appointmentTimeStart.slice(11, 16)
+    const end = e.appointmentTimeEnd.slice(11, 16)
+    e.appointmentTime = str + ' ' + start + '-' + end
   })
   // 数组追加
   orderList.value.push(...res.data.list)
@@ -168,9 +179,18 @@ const onRefresherrefresh = async () => {
     <view class="item" v-for="item in orderList" :key="item.id">
       <view class="hd" @click="handleDetail(item.id)">
         <view class="num">订单编号：{{ item.orderNumber }}</view>
-        <view class="img"></view>
+        <view class="statusLabel">{{ item.orderStatus.desc }}</view>
+      </view>
+      <view class="md" @click="handleDetail(item.id)">
+        <!-- <view class="orderDetails" v-for="detail in item.orderDetails" :key="detail.id">
+          <view class="productName">{{ detail.productName }}</view>
+          <view class="productName">{{ detail.productWeight.desc }}</view>
+        </view> -->
+        <view class="orderDetails">
+          <view class="productName">{{ item.orderDetails[0].productName }}</view>
+          <!-- <view class="productName">{{ item.orderDetails[0].productWeight.desc }}</view> -->
+        </view>
       </view>
-      <view class="md" @click="handleDetail(item.id)"></view>
       <view class="foot">
         <view class="time"> 预约时间： {{ item.appointmentTime }}</view>
         <view class="cancle" @click="handleCancle(item.id)">取消订单</view>
@@ -187,7 +207,6 @@ const onRefresherrefresh = async () => {
 // 订单列表
 .orders {
   .item {
-    min-height: 100rpx;
     padding: 20rpx;
     margin: 20rpx 20rpx 0;
     border-radius: 10rpx;
@@ -195,6 +214,12 @@ const onRefresherrefresh = async () => {
     .hd {
       padding: 10rpx;
       font-size: 28rpx;
+      display: flex;
+      justify-content: space-between;
+      .statusLabel {
+        font-size: 28rpx;
+        color: #FF7D00;
+      }
     }
     .md {
       padding: 10rpx;
@@ -210,9 +235,9 @@ const onRefresherrefresh = async () => {
       align-items: center;
       font-size: 24rpx;
       .cancle {
-        border: 2rpx solid #F2F2F2;
+        border: 2rpx solid #E30000;
         padding: 8rpx 20rpx;
-        color: #0D0D26;
+        color: #E30000;
         border-radius: 40rpx;
       }
     }