Hooke / xysBooking

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
836b309d 1 parent 10a64d2e

fix 二维码状态判断修改

Inline Side-by-side
Showing 2 changed files with 16 additions and 12 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-29 10:41:49 4 + * @LastEditTime: 2024-01-29 11:18:57
5 * @FilePath: /xysBooking/src/components/qrCode.vue 5 * @FilePath: /xysBooking/src/components/qrCode.vue
6 * @Description: 预约码卡组件 6 * @Description: 预约码卡组件
7 --> 7 -->
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </div> 19 </div>
20 <div class="center"> 20 <div class="center">
21 <img :src="userList[select_index].qr_code_url "> 21 <img :src="userList[select_index].qr_code_url ">
22 - <div v-if="useStatus === STATUS_CODE.CANCELED || useStatus === STATUS_CODE.USED" class="qrcode-used"> 22 + <div v-if="useStatus === STATUS_CODE.CANCELED || STATUS_CODE.USED.includes(useStatus)" class="qrcode-used">
23 <p>二维码{{ qr_code_status[useStatus] }}</p> 23 <p>二维码{{ qr_code_status[useStatus] }}</p>
24 </div> 24 </div>
25 </div> 25 </div>
...@@ -137,6 +137,7 @@ const qr_code_status = { ...@@ -137,6 +137,7 @@ const qr_code_status = {
137 '1': '未激活', 137 '1': '未激活',
138 '3': '待使用', 138 '3': '待使用',
139 '5': '被取消', 139 '5': '被取消',
140 + '7': '已使用',
140 '9': '已使用', 141 '9': '已使用',
141 }; 142 };
142 143
...@@ -144,15 +145,15 @@ const STATUS_CODE = { ...@@ -144,15 +145,15 @@ const STATUS_CODE = {
144 APPLY: '1', 145 APPLY: '1',
145 SUCCESS: '3', 146 SUCCESS: '3',
146 CANCELED: '5', 147 CANCELED: '5',
147 - USED: '9' 148 + USED: ['7', '9']
148 }; 149 };
149 150
150 -// const refreshBtn = async () => { 151 +const refreshBtn = async () => {
151 -// const { code, data } = await qrcodeStatusAPI({ qr_code: userList.value[select_index.value].qr_code }); 152 + const { code, data } = await qrcodeStatusAPI({ qr_code: userList.value[select_index.value].qr_code });
152 -// if (code) { 153 + if (code) {
153 -// useStatus.value = data.status; 154 + useStatus.value = data.status;
154 -// } 155 + }
155 -// } 156 +}
156 157
157 const formatStatus = (status) => { 158 const formatStatus = (status) => {
158 switch (status) { 159 switch (status) {
...@@ -243,6 +244,8 @@ const poll = async () => { ...@@ -243,6 +244,8 @@ const poll = async () => {
243 const { code, data } = await qrcodeStatusAPI({ qr_code: userList.value[select_index.value].qr_code }); 244 const { code, data } = await qrcodeStatusAPI({ qr_code: userList.value[select_index.value].qr_code });
244 if (code) { 245 if (code) {
245 useStatus.value = data.status; 246 useStatus.value = data.status;
247 +
248 + console.warn(STATUS_CODE.USED.includes(useStatus.value));
246 } 249 }
247 } 250 }
248 }; 251 };
......
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-29 10:42:11 4 + * @LastEditTime: 2024-01-29 11:14:51
5 * @FilePath: /xysBooking/src/components/qrCodeSearch.vue 5 * @FilePath: /xysBooking/src/components/qrCodeSearch.vue
6 * @Description: 预约码卡组件 6 * @Description: 预约码卡组件
7 --> 7 -->
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </div> 16 </div>
17 <div class="center"> 17 <div class="center">
18 <img :src="userinfo.qr_code_url "> 18 <img :src="userinfo.qr_code_url ">
19 - <div v-if="useStatus === STATUS_CODE.CANCELED || useStatus === STATUS_CODE.USED" class="qrcode-used"> 19 + <div v-if="useStatus === STATUS_CODE.CANCELED || STATUS_CODE.USED.includes(useStatus)" class="qrcode-used">
20 <p>二维码{{ qr_code_status[useStatus] }}</p> 20 <p>二维码{{ qr_code_status[useStatus] }}</p>
21 </div> 21 </div>
22 </div> 22 </div>
...@@ -98,6 +98,7 @@ const qr_code_status = { ...@@ -98,6 +98,7 @@ const qr_code_status = {
98 '1': '未激活', 98 '1': '未激活',
99 '3': '待使用', 99 '3': '待使用',
100 '5': '被取消', 100 '5': '被取消',
101 + '7': '已使用',
101 '9': '已使用', 102 '9': '已使用',
102 }; 103 };
103 104
...@@ -105,7 +106,7 @@ const STATUS_CODE = { ...@@ -105,7 +106,7 @@ const STATUS_CODE = {
105 APPLY: '1', 106 APPLY: '1',
106 SUCCESS: '3', 107 SUCCESS: '3',
107 CANCELED: '5', 108 CANCELED: '5',
108 - USED: '9' 109 + USED: ['7', '9']
109 }; 110 };
110 111
111 const formatStatus = (status) => { 112 const formatStatus = (status) => {
......