diff --git a/components.d.ts b/components.d.ts index b1336f0..ea47d18 100644 --- a/components.d.ts +++ b/components.d.ts @@ -1,57 +1,58 @@ -// generated by unplugin-vue-components -// We suggest you to commit this file into source control +/* eslint-disable */ +// @ts-nocheck +// Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 -import '@vue/runtime-core'; +// biome-ignore lint: disable +export {} -export {}; - -declare module '@vue/runtime-core' { +/* prettier-ignore */ +declare module 'vue' { export interface GlobalComponents { - Auth: typeof import('./src/components/Auth.vue')['default']; - Back: typeof import('./src/components/Back.vue')['default']; - Cart: typeof import('./src/components/Cart.vue')['default']; - MerList: typeof import('./src/components/MerList.vue')['default']; - NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']; - NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']; - NutButton: typeof import('@nutui/nutui-taro')['Button']; - NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']; - NutCell: typeof import('@nutui/nutui-taro')['Cell']; - NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']; - NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']; - NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']; - NutDialog: typeof import('@nutui/nutui-taro')['Dialog']; - NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']; - NutEmpty: typeof import('@nutui/nutui-taro')['Empty']; - NutForm: typeof import('@nutui/nutui-taro')['Form']; - NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']; - NutGrid: typeof import('@nutui/nutui-taro')['Grid']; - NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']; - NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']; - NutInput: typeof import('@nutui/nutui-taro')['Input']; - NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']; - NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']; - NutPagination: typeof import('@nutui/nutui-taro')['Pagination']; - NutPicker: typeof import('@nutui/nutui-taro')['Picker']; - NutPopover: typeof import('@nutui/nutui-taro')['Popover']; - NutPopup: typeof import('@nutui/nutui-taro')['Popup']; - NutPrice: typeof import('@nutui/nutui-taro')['Price']; - NutRadio: typeof import('@nutui/nutui-taro')['Radio']; - NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']; - NutRate: typeof import('@nutui/nutui-taro')['Rate']; - NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']; - NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']; - NutSwitch: typeof import('@nutui/nutui-taro')['Switch']; - NutTable: typeof import('@nutui/nutui-taro')['Table']; - NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']; - NutTabs: typeof import('@nutui/nutui-taro')['Tabs']; - NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']; - NutUploader: typeof import('@nutui/nutui-taro')['Uploader']; - Pay: typeof import('./src/components/Pay.vue')['default']; - Popup: typeof import('./src/components/Popup.vue')['default']; - RichEditor: typeof import('./src/components/RichEditor.vue')['default']; - StoreList: typeof import('./src/components/StoreList.vue')['default']; - Ucharts: typeof import('./src/components/Ucharts.vue')['default']; - Upload: typeof import('./src/components/Upload.vue')['default']; - UserModal: typeof import('./src/components/UserModal.vue')['default']; + Auth: typeof import('./src/components/Auth.vue')['default'] + Back: typeof import('./src/components/Back.vue')['default'] + Cart: typeof import('./src/components/Cart.vue')['default'] + MerList: typeof import('./src/components/MerList.vue')['default'] + NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'] + NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'] + NutButton: typeof import('@nutui/nutui-taro')['Button'] + NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'] + NutCell: typeof import('@nutui/nutui-taro')['Cell'] + NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'] + NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'] + NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'] + NutDialog: typeof import('@nutui/nutui-taro')['Dialog'] + NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'] + NutEmpty: typeof import('@nutui/nutui-taro')['Empty'] + NutForm: typeof import('@nutui/nutui-taro')['Form'] + NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'] + NutGrid: typeof import('@nutui/nutui-taro')['Grid'] + NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'] + NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'] + NutInput: typeof import('@nutui/nutui-taro')['Input'] + NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'] + NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'] + NutPagination: typeof import('@nutui/nutui-taro')['Pagination'] + NutPicker: typeof import('@nutui/nutui-taro')['Picker'] + NutPopover: typeof import('@nutui/nutui-taro')['Popover'] + NutPopup: typeof import('@nutui/nutui-taro')['Popup'] + NutPrice: typeof import('@nutui/nutui-taro')['Price'] + NutRadio: typeof import('@nutui/nutui-taro')['Radio'] + NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup'] + NutRate: typeof import('@nutui/nutui-taro')['Rate'] + NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'] + NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'] + NutSwitch: typeof import('@nutui/nutui-taro')['Switch'] + NutTable: typeof import('@nutui/nutui-taro')['Table'] + NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'] + NutTabs: typeof import('@nutui/nutui-taro')['Tabs'] + NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'] + NutUploader: typeof import('@nutui/nutui-taro')['Uploader'] + Pay: typeof import('./src/components/Pay.vue')['default'] + Popup: typeof import('./src/components/Popup.vue')['default'] + RichEditor: typeof import('./src/components/RichEditor.vue')['default'] + StoreList: typeof import('./src/components/StoreList.vue')['default'] + Ucharts: typeof import('./src/components/Ucharts.vue')['default'] + Upload: typeof import('./src/components/Upload.vue')['default'] + UserModal: typeof import('./src/components/UserModal.vue')['default'] } } diff --git a/package.json b/package.json index 7a0d67c..c92aa86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jdt-user", - "version": "4.0.9", + "version": "4.0.10", "private": true, "description": "", "templateInfo": { @@ -9,7 +9,7 @@ "css": "sass" }, "taroConfig": { - "version": "4.0.9" + "version": "4.0.10" }, "scripts": { "build:weapp": "taro build --type weapp", @@ -116,8 +116,8 @@ "stylelint": "9.3.0", "tailwindcss": "^3.4.17", "ts-node": "^10.9.2", - "typescript": "^4.9.5", - "unplugin-vue-components": "^0.23.0", + "typescript": "^5.8.2", + "unplugin-vue-components": "^28.4.1", "vue-loader": "^17.4.2", "weapp-tailwindcss": "^3.7.0", "webpack": "^5.97.1", diff --git a/src/pages/admin/verify/index.vue b/src/pages/admin/verify/index.vue index 19c41ae..c8fa942 100644 --- a/src/pages/admin/verify/index.vue +++ b/src/pages/admin/verify/index.vue @@ -7,11 +7,83 @@ src="http://p1.meituan.net/csc/696924dda634f05689dabdfbb18e88cc13551.png" /> 扫描二维码核销 + + 最近核销记录 + + + + 订单号:{{ item.oid }} + {{ + item.status === 0 + ? '待付款' + : item.status === 1 + ? '待使用' + : item.status === 2 + ? '已使用' + : '已失效' + }} + + + + + + + + {{ itm.Goods?.name }} + + {{ itm.pay_price }}元 + +{{ itm.pay_integral }}积分 + + + + + x{{ itm.number }} + + + + + 共{{ item.count }}件商品 + {{ item.status !== 0 ? '实' : '应' }}付款: + {{ item.discount_price }} (元) + 积分抵扣: {{ item.exchange }} + + + + + + diff --git a/src/pages/admin/verify/verify_list/index.vue b/src/pages/admin/verify/verify_list/index.vue index ba359f9..164bb01 100644 --- a/src/pages/admin/verify/verify_list/index.vue +++ b/src/pages/admin/verify/verify_list/index.vue @@ -102,7 +102,7 @@ const subVerify = async () => { // icon: 'none', //}); Taro.showModal({ - title: '核销提示', + title: '核销成功', content: res.msg, success: () => { setTimeout(() => {