diff --git a/components.d.ts b/components.d.ts index 30a484c..b1336f0 100644 --- a/components.d.ts +++ b/components.d.ts @@ -7,51 +7,51 @@ export {}; declare module '@vue/runtime-core' { 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/config/index.ts b/config/index.ts index 6e4b13a..d4843be 100644 --- a/config/index.ts +++ b/config/index.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import Components from 'unplugin-vue-components/webpack'; import NutUIResolver from '@nutui/nutui-taro/dist/resolver'; import {UnifiedWebpackPluginV5} from 'weapp-tailwindcss/webpack'; @@ -12,6 +11,7 @@ const CIPluginOptFn = async () => { * @typedef { import('@tarojs/plugin-mini-ci').CIOptions } CIOptions * @type {CIOptions} */ + return { weapp: { appid: process.env.TARO_APP_ID, diff --git a/package.json b/package.json index 0126b74..7a0d67c 100644 --- a/package.json +++ b/package.json @@ -65,20 +65,20 @@ "@nutui/icons-vue-taro": "^0.0.9", "@nutui/nutui-taro": "^4.3.13", "@qiun/vue-ucharts": "2.5.0-20230101", - "@tarojs/components": "4.0.9", - "@tarojs/helper": "4.0.9", - "@tarojs/plugin-framework-vue3": "4.0.9", - "@tarojs/plugin-html": "4.0.9", - "@tarojs/plugin-platform-alipay": "4.0.9", - "@tarojs/plugin-platform-h5": "4.0.9", - "@tarojs/plugin-platform-jd": "4.0.9", - "@tarojs/plugin-platform-qq": "4.0.9", - "@tarojs/plugin-platform-swan": "4.0.9", - "@tarojs/plugin-platform-tt": "4.0.9", - "@tarojs/plugin-platform-weapp": "4.0.9", - "@tarojs/runtime": "4.0.9", - "@tarojs/shared": "4.0.9", - "@tarojs/taro": "4.0.9", + "@tarojs/components": "3.6.35", + "@tarojs/helper": "3.6.35", + "@tarojs/plugin-framework-vue3": "3.6.35", + "@tarojs/plugin-html": "3.6.35", + "@tarojs/plugin-platform-alipay": "3.6.35", + "@tarojs/plugin-platform-h5": "3.6.35", + "@tarojs/plugin-platform-jd": "3.6.35", + "@tarojs/plugin-platform-qq": "3.6.35", + "@tarojs/plugin-platform-swan": "3.6.35", + "@tarojs/plugin-platform-tt": "3.6.35", + "@tarojs/plugin-platform-weapp": "3.6.35", + "@tarojs/runtime": "3.6.35", + "@tarojs/shared": "3.6.35", + "@tarojs/taro": "3.6.35", "dayjs": "^1.11.13", "pinia": "^2.3.1", "uqrcodejs": "^4.0.7", @@ -88,10 +88,10 @@ "@babel/core": "^7.26.8", "@commitlint/cli": "^18.6.1", "@commitlint/config-conventional": "^18.6.3", - "@tarojs/cli": "4.0.9", - "@tarojs/plugin-mini-ci": "4.0.9", - "@tarojs/taro-loader": "4.0.9", - "@tarojs/webpack5-runner": "4.0.9", + "@tarojs/cli": "3.6.35", + "@tarojs/plugin-mini-ci": "3.6.35", + "@tarojs/taro-loader": "3.6.35", + "@tarojs/webpack5-runner": "3.6.35", "@types/node": "^18.19.75", "@types/webpack-env": "^1.18.8", "@typescript-eslint/eslint-plugin": "^6.21.0", @@ -100,12 +100,12 @@ "@vue/babel-plugin-jsx": "^1.2.5", "@vue/compiler-sfc": "^3.5.13", "autoprefixer": "^10.4.20", - "babel-preset-taro": "4.0.9", + "babel-preset-taro": "3.6.35", "commitizen": "^4.3.1", "css-loader": "3.4.2", "cz-customizable": "^7.4.0", "eslint": "^8.57.1", - "eslint-config-taro": "4.0.9", + "eslint-config-taro": "3.6.35", "eslint-plugin-vue": "^9.32.0", "husky": "^8.0.3", "lint-staged": "^15.4.3", @@ -120,7 +120,8 @@ "unplugin-vue-components": "^0.23.0", "vue-loader": "^17.4.2", "weapp-tailwindcss": "^3.7.0", - "webpack": "^5.97.1" + "webpack": "^5.97.1", + "yargs": "^17.7.2" }, "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0" } diff --git a/src/index.html b/src/index.html index 71d8313..9c9c2c7 100644 --- a/src/index.html +++ b/src/index.html @@ -1,4 +1,4 @@ - + diff --git a/src/pages/admin/order_manage/detail/index.vue b/src/pages/admin/order_manage/detail/index.vue index 8d45a40..35ce110 100644 --- a/src/pages/admin/order_manage/detail/index.vue +++ b/src/pages/admin/order_manage/detail/index.vue @@ -48,10 +48,10 @@ info.status === 0 ? '待付款' : info.status === 1 - ? '待使用' - : info.status === 2 - ? '已使用' - : '已失效' + ? '待使用' + : info.status === 2 + ? '已使用' + : '已失效' "> diff --git a/src/pages/admin/order_manage/list/index.vue b/src/pages/admin/order_manage/list/index.vue index 6ea3b6e..0516fcb 100644 --- a/src/pages/admin/order_manage/list/index.vue +++ b/src/pages/admin/order_manage/list/index.vue @@ -33,19 +33,19 @@ item.status === 0 ? '#FF850A' : item.status === 1 - ? '#F83D3D' - : item.status === 2 - ? '#333333' - : '#9C9C9C', + ? '#F83D3D' + : item.status === 2 + ? '#333333' + : '#9C9C9C', }" >{{ item.status === 0 ? '待付款' : item.status === 1 - ? '待使用' - : item.status === 2 - ? '已使用' - : '已失效' + ? '待使用' + : item.status === 2 + ? '已使用' + : '已失效' }} diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue index dcd0313..842c368 100644 --- a/src/pages/admin/withdrawal/index.vue +++ b/src/pages/admin/withdrawal/index.vue @@ -195,15 +195,15 @@ Taro.useReachBottom(() => { item.status === 1 ? 'success' : item.status === 1 - ? 'danger' - : 'warning' + ? 'danger' + : 'warning' " >{{ item.status === 1 ? '已打款' : item.status === 2 - ? '已拒绝' - : '待审核' + ? '已拒绝' + : '待审核' }} diff --git a/src/pages/goods/pay/index.vue b/src/pages/goods/pay/index.vue index 5e319e4..8601092 100644 --- a/src/pages/goods/pay/index.vue +++ b/src/pages/goods/pay/index.vue @@ -66,8 +66,8 @@ item.number > 0 ? `可用积分:${item.number}` : item.name.includes('微信') - ? '微信全额支付' - : '' + ? '微信全额支付' + : '' " @click="cellClick(item.ID)">