Showing
4 changed files
with
11 additions
and
12 deletions
| ... | @@ -7,7 +7,6 @@ export {} | ... | @@ -7,7 +7,6 @@ export {} |
| 7 | 7 | ||
| 8 | declare module '@vue/runtime-core' { | 8 | declare module '@vue/runtime-core' { |
| 9 | export interface GlobalComponents { | 9 | export interface GlobalComponents { |
| 10 | - Calendar: typeof import('./src/components/calendar.vue')['default'] | ||
| 11 | QrCode: typeof import('./src/components/qrCode.vue')['default'] | 10 | QrCode: typeof import('./src/components/qrCode.vue')['default'] |
| 12 | ReserveCard: typeof import('./src/components/reserveCard.vue')['default'] | 11 | ReserveCard: typeof import('./src/components/reserveCard.vue')['default'] |
| 13 | RouterLink: typeof import('vue-router')['RouterLink'] | 12 | RouterLink: typeof import('vue-router')['RouterLink'] | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2023-08-24 09:42:27 | 2 | * @Date: 2023-08-24 09:42:27 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2024-01-25 08:36:47 | 4 | + * @LastEditTime: 2024-01-25 14:56:16 |
| 5 | * @FilePath: /xysBooking/src/api/index.js | 5 | * @FilePath: /xysBooking/src/api/index.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| ... | @@ -20,7 +20,7 @@ const Api = { | ... | @@ -20,7 +20,7 @@ const Api = { |
| 20 | QRCODE_LIST: '/srv/?a=api&t=qrcode_list', | 20 | QRCODE_LIST: '/srv/?a=api&t=qrcode_list', |
| 21 | QRCODE_STATUS: '/srv/?a=api&t=qrcode_status', | 21 | QRCODE_STATUS: '/srv/?a=api&t=qrcode_status', |
| 22 | BILL_LIST: '/srv/?a=api&t=bill_list', | 22 | BILL_LIST: '/srv/?a=api&t=bill_list', |
| 23 | - CANCEL_PREPARE: '/srv/?a=api&t=cancel_prepare', | 23 | + ICBC_REFUND: '/srv/?a=icbc_refund', |
| 24 | BILL_PREPARE: '/srv/?a=api&t=bill_person', | 24 | BILL_PREPARE: '/srv/?a=api&t=bill_person', |
| 25 | BILL_PAY_STATUS: '/srv/?a=api&t=bill_pay_status', | 25 | BILL_PAY_STATUS: '/srv/?a=api&t=bill_pay_status', |
| 26 | }; | 26 | }; |
| ... | @@ -117,11 +117,11 @@ export const qrcodeStatusAPI = (params) => fn(fetch.get(Api.QRCODE_STATUS, param | ... | @@ -117,11 +117,11 @@ export const qrcodeStatusAPI = (params) => fn(fetch.get(Api.QRCODE_STATUS, param |
| 117 | export const billListAPI = (params) => fn(fetch.get(Api.BILL_LIST, params)); | 117 | export const billListAPI = (params) => fn(fetch.get(Api.BILL_LIST, params)); |
| 118 | 118 | ||
| 119 | /** | 119 | /** |
| 120 | - * @description: 取消预约退款准备(模拟) | 120 | + * @description: 取消预约 |
| 121 | - * @param {String} bill_id 预约单id | 121 | + * @param {String} pay_id |
| 122 | - * @returns {String} bill_id 预约单id | 122 | + * @returns {String} |
| 123 | */ | 123 | */ |
| 124 | -export const cancelPrepareAPI = (params) => fn(fetch.post(Api.CANCEL_PREPARE, params)); | 124 | +export const icbcRefundAPI = (params) => fn(fetch.post(Api.ICBC_REFUND, params)); |
| 125 | 125 | ||
| 126 | /** | 126 | /** |
| 127 | * @description: 预约单的参观者列表 | 127 | * @description: 预约单的参观者列表 | ... | ... |
| 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-25 11:33:44 | 4 | + * @LastEditTime: 2024-01-25 15:13:04 |
| 5 | * @FilePath: /xysBooking/src/components/reserveCard.vue | 5 | * @FilePath: /xysBooking/src/components/reserveCard.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -101,7 +101,7 @@ const formatStatus = (status) => { | ... | @@ -101,7 +101,7 @@ const formatStatus = (status) => { |
| 101 | case CodeStatus.CANCELED: | 101 | case CodeStatus.CANCELED: |
| 102 | return { | 102 | return { |
| 103 | key: 'cancel', | 103 | key: 'cancel', |
| 104 | - value: '已取消' | 104 | + value: '支付超时' |
| 105 | } | 105 | } |
| 106 | case CodeStatus.USED: | 106 | case CodeStatus.USED: |
| 107 | return { | 107 | return { | ... | ... |
| 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-24 18:47:48 | 4 | + * @LastEditTime: 2024-01-25 14:57:11 |
| 5 | * @FilePath: /xysBooking/src/views/bookingDetail.vue | 5 | * @FilePath: /xysBooking/src/views/bookingDetail.vue |
| 6 | * @Description: 预约记录详情 | 6 | * @Description: 预约记录详情 |
| 7 | --> | 7 | --> |
| ... | @@ -48,7 +48,7 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@ | ... | @@ -48,7 +48,7 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@ |
| 48 | import qrCode from '@/components/qrCode'; | 48 | import qrCode from '@/components/qrCode'; |
| 49 | import { showConfirmDialog } from 'vant'; | 49 | import { showConfirmDialog } from 'vant'; |
| 50 | import { showSuccessToast, showFailToast } from 'vant'; | 50 | import { showSuccessToast, showFailToast } from 'vant'; |
| 51 | -import { billInfoAPI, cancelPrepareAPI } from '@/api/index' | 51 | +import { billInfoAPI, icbcRefundAPI } from '@/api/index' |
| 52 | const $route = useRoute(); | 52 | const $route = useRoute(); |
| 53 | const $router = useRouter(); | 53 | const $router = useRouter(); |
| 54 | useTitle($route.meta.title); | 54 | useTitle($route.meta.title); |
| ... | @@ -67,7 +67,7 @@ const cancelBooking = (item) => { | ... | @@ -67,7 +67,7 @@ const cancelBooking = (item) => { |
| 67 | }) | 67 | }) |
| 68 | .then(async () => { | 68 | .then(async () => { |
| 69 | // on confirm | 69 | // on confirm |
| 70 | - const { code, data } = await cancelPrepareAPI({ bill_id: billInfo.value.bill_id }); | 70 | + const { code, data } = await icbcRefundAPI({ pay_id }); |
| 71 | if (code) { | 71 | if (code) { |
| 72 | showSuccessToast('取消成功'); | 72 | showSuccessToast('取消成功'); |
| 73 | $router.go(-1); | 73 | $router.go(-1); | ... | ... |
-
Please register or login to post a comment