Hooke / xysBooking

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
8435e432 1 parent db251728

fix

Inline Side-by-side
Showing 3 changed files with 32 additions and 22 deletions
...@@ -14,13 +14,11 @@ declare module '@vue/runtime-core' { ...@@ -14,13 +14,11 @@ declare module '@vue/runtime-core' {
14 VanButton: typeof import('vant/es')['Button'] 14 VanButton: typeof import('vant/es')['Button']
15 VanCheckbox: typeof import('vant/es')['Checkbox'] 15 VanCheckbox: typeof import('vant/es')['Checkbox']
16 VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup'] 16 VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
17 - VanCol: typeof import('vant/es')['Col']
18 VanDatePicker: typeof import('vant/es')['DatePicker'] 17 VanDatePicker: typeof import('vant/es')['DatePicker']
19 VanIcon: typeof import('vant/es')['Icon'] 18 VanIcon: typeof import('vant/es')['Icon']
20 VanList: typeof import('vant/es')['List'] 19 VanList: typeof import('vant/es')['List']
21 VanPicker: typeof import('vant/es')['Picker'] 20 VanPicker: typeof import('vant/es')['Picker']
22 VanPopup: typeof import('vant/es')['Popup'] 21 VanPopup: typeof import('vant/es')['Popup']
23 - VanRow: typeof import('vant/es')['Row']
24 VanSwipe: typeof import('vant/es')['Swipe'] 22 VanSwipe: typeof import('vant/es')['Swipe']
25 VanSwipeItem: typeof import('vant/es')['SwipeItem'] 23 VanSwipeItem: typeof import('vant/es')['SwipeItem']
26 VanToast: typeof import('vant/es')['Toast'] 24 VanToast: typeof import('vant/es')['Toast']
......
1 <!-- 1 <!--
2 * @Date: 2024-01-24 16:38:13 2 * @Date: 2024-01-24 16:38:13
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-24 17:17:11 4 + * @LastEditTime: 2024-01-24 17:57:11
5 * @FilePath: /xysBooking/src/components/reserveCard.vue 5 * @FilePath: /xysBooking/src/components/reserveCard.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -157,10 +157,22 @@ const pay_show = computed(() => { ...@@ -157,10 +157,22 @@ const pay_show = computed(() => {
157 return flag; 157 return flag;
158 }); 158 });
159 159
160 +watch(
161 + () => props.data,
162 + (val) => {
163 + if (val) {
164 + remain_time.value = val.rest_second;
165 + }
166 + },
167 + {
168 + deep: true,
169 + immediate: true,
170 + }
171 +);
172 +
160 // 支付超时显示 173 // 支付超时显示
161 const delay_pay_show = computed(() => { 174 const delay_pay_show = computed(() => {
162 - // return props.data.status === CodeStatus.APPLY && !remain_time.value; 175 + return props.data.status === CodeStatus.APPLY && !remain_time.value;
163 - return props.data.status === CodeStatus.SUCCESS && !remain_time.value;
164 }); 176 });
165 177
166 let timeId = null; 178 let timeId = null;
...@@ -239,19 +251,5 @@ const payOrder = () => { ...@@ -239,19 +251,5 @@ const payOrder = () => {
239 } 251 }
240 } 252 }
241 253
242 - .no-qrcode { 254 +
243 - display: flex;
244 - justify-content: center;
245 - align-items: center;
246 - flex-direction: column;
247 - img {
248 - margin-top: 1rem;
249 - margin-bottom: 1rem;
250 - width: 10rem;
251 - }
252 - .no-qrcode-title {
253 - color: #A67939;
254 - font-size: 1.05rem;
255 - }
256 - }
257 </style> 255 </style>
......
1 <!-- 1 <!--
2 * @Date: 2024-01-16 11:37:10 2 * @Date: 2024-01-16 11:37:10
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-24 16:49:34 4 + * @LastEditTime: 2024-01-24 17:52:56
5 * @FilePath: /xysBooking/src/views/bookingList.vue 5 * @FilePath: /xysBooking/src/views/bookingList.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -106,6 +106,20 @@ const onLoad = async () => { ...@@ -106,6 +106,20 @@ const onLoad = async () => {
106 <style lang="less" scoped> 106 <style lang="less" scoped>
107 .booking-list-page { 107 .booking-list-page {
108 padding: 1rem; 108 padding: 1rem;
109 - 109 + .no-qrcode {
110 + display: flex;
111 + justify-content: center;
112 + align-items: center;
113 + flex-direction: column;
114 + img {
115 + margin-top: 1rem;
116 + margin-bottom: 1rem;
117 + width: 10rem;
118 + }
119 + .no-qrcode-title {
120 + color: #A67939;
121 + font-size: 1.05rem;
122 + }
123 + }
110 } 124 }
111 </style> 125 </style>
......