Hooke / meihua-island-book

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
b34ac52d 1 parent c6f6e427

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

Inline Side-by-side
Showing 3 changed files with 28 additions and 11 deletions
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
64 <view style="display: flex;"> 64 <view style="display: flex;">
65 <view style="flex: 2;"> 65 <view style="flex: 2;">
66 <view class="check-in-text">入住日期</view> 66 <view class="check-in-text">入住日期</view>
67 - <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_in }} {{ getDayOfWeek(plan_in) }}</view> 67 + <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_in }}</view>
68 + <view class="check-in-info" style="margin-top: 5rpx;">{{ getDayOfWeek(plan_in) }}</view>
68 </view> 69 </view>
69 <view style="flex: 1;" class="book-days"> 70 <view style="flex: 1;" class="book-days">
70 <view class="book-days-text" 71 <view class="book-days-text"
...@@ -73,7 +74,8 @@ ...@@ -73,7 +74,8 @@
73 </view> 74 </view>
74 <view style="flex: 2; text-align: right;"> 75 <view style="flex: 2; text-align: right;">
75 <view class="check-in-text">退房日期</view> 76 <view class="check-in-text">退房日期</view>
76 - <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_out }} {{ getDayOfWeek(plan_out) }}</view> 77 + <view class="check-in-info" style="margin-top: 5rpx;">{{ plan_out }}</view>
78 + <view class="check-in-info" style="margin-top: 5rpx;">{{ getDayOfWeek(plan_out) }}</view>
77 </view> 79 </view>
78 </view> 80 </view>
79 </view> 81 </view>
...@@ -559,23 +561,30 @@ page { ...@@ -559,23 +561,30 @@ page {
559 } 561 }
560 .check-in-text { 562 .check-in-text {
561 color: #7d7c7c; 563 color: #7d7c7c;
562 - font-size: 3.5vw; 564 + font-size: 3.75vw;
563 } 565 }
564 .check-in-info { 566 .check-in-info {
565 color: #7d7c7c; 567 color: #7d7c7c;
566 - font-size: 3.5vw; 568 + font-size: 3.75vw;
567 font-weight: bold; 569 font-weight: bold;
568 } 570 }
569 .book-days { 571 .book-days {
570 padding: 0 10rpx; 572 padding: 0 10rpx;
573 + display: flex;
574 + align-items: center;
575 + justify-content: center;
571 .book-days-text { 576 .book-days-text {
572 color: #7d7c7c; 577 color: #7d7c7c;
573 - margin-top: 15%; 578 + // margin-top: 15%;
574 - font-size: 0.8rem; 579 + font-size: 0.9rem;
575 text-align: center; 580 text-align: center;
576 background-color: #fff; 581 background-color: #fff;
577 - padding: 0.25rem 0; 582 + // padding: 0.25rem 0;
578 - border-radius: 0.5rem; 583 + // border-radius: 0.5rem;
584 + border-radius: 50%;
585 + height: 3rem;
586 + width: 3rem;
587 + line-height: 3rem;
579 } 588 }
580 } 589 }
581 } 590 }
......
...@@ -289,7 +289,7 @@ const onPayClose = () => { ...@@ -289,7 +289,7 @@ const onPayClose = () => {
289 show_pay.value = false; 289 show_pay.value = false;
290 // 订房成功页面，不一定支付了 290 // 订房成功页面，不一定支付了
291 Taro.navigateTo({ 291 Taro.navigateTo({
292 - url: '/pages/payInfo/index', 292 + url: '/pages/payInfo/index?type=no-pay',
293 }); 293 });
294 } 294 }
295 </script> 295 </script>
......
1 <!-- 1 <!--
2 * @Date: 2023-12-15 14:03:40 2 * @Date: 2023-12-15 14:03:40
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2023-12-26 17:58:58 4 + * @LastEditTime: 2024-01-04 14:22:26
5 * @FilePath: /meihuaApp/src/pages/payInfo/index.vue 5 * @FilePath: /meihuaApp/src/pages/payInfo/index.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -9,10 +9,15 @@ ...@@ -9,10 +9,15 @@
9 <view class="pay-info-page"> 9 <view class="pay-info-page">
10 <view style="display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 3rem;"> 10 <view style="display: flex; align-items: center; justify-content: center; flex-direction: column; margin-top: 3rem;">
11 <image style="width: 8rem; height: 8rem; border-radius: 10rpx;" mode="aspectFill" src="https://cdn.ipadbiz.cn/meihua/edit-icon.png" /> 11 <image style="width: 8rem; height: 8rem; border-radius: 10rpx;" mode="aspectFill" src="https://cdn.ipadbiz.cn/meihua/edit-icon.png" />
12 - <div style="margin-top: 1rem; text-align: center; color: #6A4925; font-size: 35rpx;"> 12 + <div v-if="type !== 'no-pay'" style="margin-top: 1rem; text-align: center; color: #6A4925; font-size: 35rpx;">
13 <view>您的订单提交成功，</view> 13 <view>您的订单提交成功，</view>
14 <view> 期待您的入住！</view> 14 <view> 期待您的入住！</view>
15 </div> 15 </div>
16 + <div v-else style="margin-top: 1.5rem; text-align: center; color: #6A4925; font-size: 35rpx; line-height: 1.75;">
17 + <view>您的订单还未支付</view>
18 + <view> 请尽快支付</view>
19 + <view> 超时，订单会自动取消</view>
20 + </div>
16 </view> 21 </view>
17 </view> 22 </view>
18 </template> 23 </template>
...@@ -20,6 +25,9 @@ ...@@ -20,6 +25,9 @@
20 <script setup> 25 <script setup>
21 import Taro from '@tarojs/taro' 26 import Taro from '@tarojs/taro'
22 import { ref, onMounted } from "vue"; 27 import { ref, onMounted } from "vue";
28 +import { getCurrentPageParam } from "@/utils/weapp";
29 +
30 +const { type } = getCurrentPageParam("type");
23 31
24 onMounted(() => { 32 onMounted(() => {
25 setTimeout(() => { 33 setTimeout(() => {
......