Bob提的新需求修改显示样式

@@ -64,7 +64,8 @@
       <view style="display: flex;">
       <view style="display: flex;">
         <view style="flex: 2;">
         <view style="flex: 2;">
           <view class="check-in-text">入住日期</view>
           <view class="check-in-text">入住日期</view>
-          <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_in }} {{ getDayOfWeek(plan_in) }}</view>
+          <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_in }}</view>
+          <view class="check-in-info" style="margin-top: 5rpx;">{{ getDayOfWeek(plan_in) }}</view>
         </view>
         </view>
         <view style="flex: 1;" class="book-days">
         <view style="flex: 1;" class="book-days">
           <view class="book-days-text"
           <view class="book-days-text"
@@ -73,7 +74,8 @@
         </view>
         </view>
         <view style="flex: 2; text-align: right;">
         <view style="flex: 2; text-align: right;">
           <view class="check-in-text">退房日期</view>
           <view class="check-in-text">退房日期</view>
-          <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_out }} {{ getDayOfWeek(plan_out) }}</view>
+          <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_out }}</view>
+          <view class="check-in-info" style="margin-top: 5rpx;">{{ getDayOfWeek(plan_out) }}</view>
         </view>
         </view>
       </view>
       </view>
     </view>
     </view>
@@ -559,23 +561,30 @@ page {
     }
     }
     .check-in-text {
     .check-in-text {
       color: #7d7c7c;
       color: #7d7c7c;
-      font-size: 3.5vw;
+      font-size: 3.75vw;
     }
     }
     .check-in-info {
     .check-in-info {
       color: #7d7c7c;
       color: #7d7c7c;
-      font-size: 3.5vw;
+      font-size: 3.75vw;
       font-weight: bold;
       font-weight: bold;
     }
     }
     .book-days {
     .book-days {
       padding: 0 10rpx;
       padding: 0 10rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
       .book-days-text {
       .book-days-text {
         color: #7d7c7c;
         color: #7d7c7c;
-        margin-top: 15%;
-        font-size: 0.8rem;
+        // margin-top: 15%;
+        font-size: 0.9rem;
         text-align: center;
         text-align: center;
         background-color: #fff;
         background-color: #fff;
-        padding: 0.25rem 0;
-        border-radius: 0.5rem;
+        // padding: 0.25rem 0;
+        // border-radius: 0.5rem;
+        border-radius: 50%;
+        height: 3rem;
+        width: 3rem;
+        line-height: 3rem;
       }
       }
     }
     }
   }
   }

@@ -289,7 +289,7 @@ const onPayClose = () => {
   show_pay.value = false;
   show_pay.value = false;
   // 订房成功页面，不一定支付了
   // 订房成功页面，不一定支付了
   Taro.navigateTo({
   Taro.navigateTo({
-    url: '/pages/payInfo/index',
+    url: '/pages/payInfo/index?type=no-pay',
   });
   });
 }
 }
 </script>
 </script>

 <!--
 <!--
  * @Date: 2023-12-15 14:03:40
  * @Date: 2023-12-15 14:03:40
  * @LastEditors: hookehuyr hookehuyr@gmail.com
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-12-26 17:58:58
+ * @LastEditTime: 2024-01-04 14:22:26
  * @FilePath: /meihuaApp/src/pages/payInfo/index.vue
  * @FilePath: /meihuaApp/src/pages/payInfo/index.vue
  * @Description: 文件描述
  * @Description: 文件描述
 -->
 -->
@@ -9,10 +9,15 @@
   <view class="pay-info-page">
   <view class="pay-info-page">
     <view style="display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 3rem;">
     <view style="display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 3rem;">
       <image style="width: 8rem; height: 8rem; border-radius: 10rpx;" mode="aspectFill" src="https://cdn.ipadbiz.cn/meihua/edit-icon.png" />
       <image style="width: 8rem; height: 8rem; border-radius: 10rpx;" mode="aspectFill" src="https://cdn.ipadbiz.cn/meihua/edit-icon.png" />
-      <div style="margin-top: 1rem; text-align: center; color: #6A4925; font-size: 35rpx;">
+      <div v-if="type !== 'no-pay'" style="margin-top: 1rem; text-align: center; color: #6A4925; font-size: 35rpx;">
         <view>您的订单提交成功，</view>
         <view>您的订单提交成功，</view>
         <view> 期待您的入住！</view>
         <view> 期待您的入住！</view>
       </div>
       </div>
+      <div v-else style="margin-top: 1.5rem; text-align: center; color: #6A4925; font-size: 35rpx; line-height: 1.75;">
+        <view>您的订单还未支付</view>
+        <view> 请尽快支付</view>
+        <view> 超时，订单会自动取消</view>
+      </div>
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>
@@ -20,6 +25,9 @@
 <script setup>
 <script setup>
 import Taro from '@tarojs/taro'
 import Taro from '@tarojs/taro'
 import { ref, onMounted } from "vue";
 import { ref, onMounted } from "vue";
+import { getCurrentPageParam } from "@/utils/weapp";
+
+const { type } = getCurrentPageParam("type");
 
 
 onMounted(() => {
 onMounted(() => {
   setTimeout(() => {
   setTimeout(() => {