Hooke / xysBooking

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
2c78d3ef 1 parent 9090f8fe

fix 隐藏二维码头部状态显示，订单详情上显示订单的状态

Inline Side-by-side
Showing 2 changed files with 16 additions and 4 deletions
1 <!-- 1 <!--
2 * @Date: 2024-01-16 10:06:47 2 * @Date: 2024-01-16 10:06:47
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-30 09:59:59 4 + * @LastEditTime: 2024-01-30 10:50:03
5 * @FilePath: /xysBooking/src/components/qrCode.vue 5 * @FilePath: /xysBooking/src/components/qrCode.vue
6 * @Description: 预约码卡组件 6 * @Description: 预约码卡组件
7 --> 7 -->
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
9 <div class="qr-code-page"> 9 <div class="qr-code-page">
10 <div v-if="userList.length" class="show-qrcode"> 10 <div v-if="userList.length" class="show-qrcode">
11 <div class="qrcode-content"> 11 <div class="qrcode-content">
12 - <div v-if="props.status" class="user-status"> 12 + <!-- <div v-if="props.status" class="user-status">
13 <div :class="[formatStatus(props.status).key, 'status']">{{ formatStatus(props.status).value }}</div> 13 <div :class="[formatStatus(props.status).key, 'status']">{{ formatStatus(props.status).value }}</div>
14 - </div> 14 + </div> -->
15 <div class="user-info">{{ userinfo.name }}&nbsp;{{ userinfo.id }}</div> 15 <div class="user-info">{{ userinfo.name }}&nbsp;{{ userinfo.id }}</div>
16 <div class="user-qrcode"> 16 <div class="user-qrcode">
17 <div class="left" @click="prevCode"> 17 <div class="left" @click="prevCode">
......
1 <!-- 1 <!--
2 * @Date: 2024-01-16 13:19:23 2 * @Date: 2024-01-16 13:19:23
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-29 16:05:29 4 + * @LastEditTime: 2024-01-30 10:55:56
5 * @FilePath: /xysBooking/src/views/bookingDetail.vue 5 * @FilePath: /xysBooking/src/views/bookingDetail.vue
6 * @Description: 预约记录详情 6 * @Description: 预约记录详情
7 --> 7 -->
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
29 <div>订单编号：</div> 29 <div>订单编号：</div>
30 <div>{{ billInfo?.pay_id }}</div> 30 <div>{{ billInfo?.pay_id }}</div>
31 </div> 31 </div>
32 + <div class="detail-item">
33 + <div>订单状态：</div>
34 + <div>{{ qrCodeStatusText }}</div>
35 + </div>
32 </div> 36 </div>
33 <div style="height: 5rem;"></div> 37 <div style="height: 5rem;"></div>
34 <div v-if="billInfo.status === CodeStatus.SUCCESS && billInfo.show_cancel_reserve === 1" class="cancel-wrapper"> 38 <div v-if="billInfo.status === CodeStatus.SUCCESS && billInfo.show_cancel_reserve === 1" class="cancel-wrapper">
...@@ -60,6 +64,7 @@ const go = useGo(); ...@@ -60,6 +64,7 @@ const go = useGo();
60 64
61 const pay_id = $route.query.pay_id; 65 const pay_id = $route.query.pay_id;
62 const qrCodeStatus = ref(''); 66 const qrCodeStatus = ref('');
67 +const qrCodeStatusText = ref('');
63 const loading = ref(false); 68 const loading = ref(false);
64 69
65 const cancelBooking = (item) => { 70 const cancelBooking = (item) => {
...@@ -124,12 +129,19 @@ onMounted(async () => { ...@@ -124,12 +129,19 @@ onMounted(async () => {
124 switch (billInfo.value.status) { 129 switch (billInfo.value.status) {
125 case CodeStatus.SUCCESS: 130 case CodeStatus.SUCCESS:
126 qrCodeStatus.value = 'success'; 131 qrCodeStatus.value = 'success';
132 + qrCodeStatusText.value = '待使用';
133 + break;
134 + case CodeStatus.CANCEL:
135 + qrCodeStatus.value = 'cancel';
136 + qrCodeStatusText.value = '已取消';
127 break; 137 break;
128 case CodeStatus.CANCELED: 138 case CodeStatus.CANCELED:
129 qrCodeStatus.value = 'cancel'; 139 qrCodeStatus.value = 'cancel';
140 + qrCodeStatusText.value = '已取消';
130 break; 141 break;
131 case CodeStatus.USED: 142 case CodeStatus.USED:
132 qrCodeStatus.value = 'used'; 143 qrCodeStatus.value = 'used';
144 + qrCodeStatusText.value = '已使用';
133 break; 145 break;
134 } 146 }
135 } 147 }
......