From 2bd750a3d60e1bb1f4fff5466d89c0290e65aa9a Mon Sep 17 00:00:00 2001 From: xingyu Date: Fri, 19 May 2023 15:23:41 +0800 Subject: [PATCH 01/18] chore: update deps --- package.json | 65 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 7a00c122..fdd251a2 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "serve:pro": "vite preview --mode pro", "serve:dev": "vite preview --mode dev", "serve:test": "vite preview --mode test", + "preview": "pnpm build:front && vite preview", "npm:check": "npx npm-check-updates", "clean": "npx rimraf node_modules", "clean:cache": "npx rimraf node_modules/.cache", @@ -33,12 +34,12 @@ "@form-create/element-ui": "^3.1.17", "@iconify/iconify": "^3.1.0", "@videojs-player/vue": "^1.0.0", - "@vueuse/core": "^10.1.0", + "@vueuse/core": "^10.1.2", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.10", - "@zxcvbn-ts/core": "^2.2.1", + "@zxcvbn-ts/core": "^3.0.1", "animate.css": "^4.1.1", - "axios": "^1.3.6", + "axios": "^1.4.0", "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.10.0", "camunda-bpmn-moddle": "^7.0.1", @@ -48,34 +49,34 @@ "diagram-js": "^11.6.0", "echarts": "^5.4.2", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.3.3", + "element-plus": "2.3.4", "fast-xml-parser": "^4.2.2", - "highlight.js": "^11.7.0", + "highlight.js": "^11.8.0", "intro.js": "^7.0.1", "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21", - "min-dash": "^4.1.0", + "min-dash": "^4.1.1", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.0.35", + "pinia": "^2.1.3", "qrcode": "^1.5.3", - "qs": "^6.11.1", + "qs": "^6.11.2", "steady-xml": "^0.1.0", "url": "^0.11.0", - "video.js": "^8.0.4", - "vue": "3.2.47", + "video.js": "^8.3.0", + "vue": "3.3.4", "vue-i18n": "9.2.2", - "vue-router": "^4.1.6", - "vue-types": "^5.0.2", + "vue-router": "^4.2.1", + "vue-types": "^5.0.3", "vuedraggable": "^4.1.0", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.7", "xml-js": "^1.6.11" }, "devDependencies": { - "@commitlint/cli": "^17.6.1", - "@commitlint/config-conventional": "^17.6.1", - "@iconify/json": "^2.2.54", + "@commitlint/cli": "^17.6.3", + "@commitlint/config-conventional": "^17.6.3", + "@iconify/json": "^2.2.67", "@intlify/unplugin-vue-i18n": "^0.10.0", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.1", @@ -84,39 +85,39 @@ "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.0", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.59.0", - "@typescript-eslint/parser": "^5.59.0", - "@vitejs/plugin-legacy": "^4.0.2", - "@vitejs/plugin-vue": "^4.1.0", + "@typescript-eslint/eslint-plugin": "^5.59.6", + "@typescript-eslint/parser": "^5.59.6", + "@vitejs/plugin-legacy": "^4.0.3", + "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", "autoprefixer": "^10.4.14", "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", "consola": "^3.1.0", - "eslint": "^8.39.0", + "eslint": "^8.40.0", "eslint-config-prettier": "^8.8.0", - "eslint-define-config": "^1.18.0", + "eslint-define-config": "^1.20.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-vue": "^9.11.0", - "lint-staged": "^13.2.1", + "eslint-plugin-vue": "^9.13.0", + "lint-staged": "^13.2.2", "postcss": "^8.4.23", "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "prettier": "^2.8.8", - "rimraf": "^5.0.0", - "rollup": "^3.20.7", - "sass": "^1.62.0", - "stylelint": "^15.6.0", + "rimraf": "^5.0.1", + "rollup": "^3.22.0", + "sass": "^1.62.1", + "stylelint": "^15.6.2", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^12.0.0", "stylelint-config-standard": "^33.0.0", "stylelint-order": "^6.0.3", - "terser": "^5.17.1", + "terser": "^5.17.4", "typescript": "5.0.4", - "unplugin-auto-import": "^0.15.3", + "unplugin-auto-import": "^0.16.0", "unplugin-element-plus": "^0.7.1", "unplugin-vue-components": "^0.24.1", - "vite": "4.3.1", + "vite": "4.3.8", "vite-plugin-compression": "^0.5.1", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", @@ -125,8 +126,8 @@ "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.0", "vite-plugin-vue-setup-extend-plus": "^0.1.0", - "vite-plugin-windicss": "^1.8.10", - "vue-tsc": "^1.4.4", + "vite-plugin-windicss": "^1.9.0", + "vue-tsc": "^1.6.5", "windicss": "^3.5.6" }, "engines": { From 45ee4116b7b84ca5d76ed099ae5a0167a5cb7689 Mon Sep 17 00:00:00 2001 From: xingyu Date: Fri, 19 May 2023 15:24:01 +0800 Subject: [PATCH 02/18] fix: echart --- src/components/Echart/src/Echart.vue | 2 +- src/plugins/echarts/index.ts | 10 +++++++--- src/views/infra/redis/index.vue | 7 +------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/components/Echart/src/Echart.vue b/src/components/Echart/src/Echart.vue index 31f2eea0..cec28e42 100644 --- a/src/components/Echart/src/Echart.vue +++ b/src/components/Echart/src/Echart.vue @@ -27,7 +27,7 @@ const props = defineProps({ const isDark = computed(() => appStore.getIsDark) const theme = computed(() => { - const echartTheme: boolean | string = unref(isDark) ? true : 'auto' + const echartTheme: boolean | string = unref(isDark) ? true : 'inherit' return echartTheme }) diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts index 34f756f6..bfccbb48 100644 --- a/src/plugins/echarts/index.ts +++ b/src/plugins/echarts/index.ts @@ -6,7 +6,8 @@ import { PieChart, MapChart, PictorialBarChart, - RadarChart + RadarChart, + GaugeChart } from 'echarts/charts' import { @@ -16,7 +17,8 @@ import { PolarComponent, AriaComponent, ParallelComponent, - LegendComponent + LegendComponent, + ToolboxComponent } from 'echarts/components' import { CanvasRenderer } from 'echarts/renderers' @@ -25,6 +27,7 @@ echarts.use([ LegendComponent, TitleComponent, TooltipComponent, + ToolboxComponent, GridComponent, PolarComponent, AriaComponent, @@ -35,7 +38,8 @@ echarts.use([ MapChart, CanvasRenderer, PictorialBarChart, - RadarChart + RadarChart, + GaugeChart ]) export default echarts diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue index 011f8e59..f98f2f30 100644 --- a/src/views/infra/redis/index.vue +++ b/src/views/infra/redis/index.vue @@ -63,9 +63,6 @@ \ No newline at end of file From 43f3c6743483544343eb814dfe98419e19cfc52e Mon Sep 17 00:00:00 2001 From: wangding <857299269.com> Date: Mon, 29 May 2023 11:26:51 +0800 Subject: [PATCH 07/18] add router search --- .vscode/settings.json | 2 +- src/App.vue | 6 +- src/components/RouterSearch/index.vue | 94 +++++++++++++-------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3036ebf1..5b3aa477 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,7 @@ "source.fixAll.eslint": true }, "[vue]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "Vue.volar" }, "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" diff --git a/src/App.vue b/src/App.vue index c40f767e..f75478cd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,8 +3,7 @@ import { isDark } from '@/utils/is' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' -import routerSearch from '@/components/RouterSearch' - +import routerSearch from '@/components/RouterSearch/index.vue' const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('app') @@ -26,11 +25,12 @@ setDefaultTheme() diff --git a/src/views/mall/trade/order/tradeOrderDetail.vue b/src/views/mall/trade/order/tradeOrderDetail.vue new file mode 100644 index 00000000..3e261550 --- /dev/null +++ b/src/views/mall/trade/order/tradeOrderDetail.vue @@ -0,0 +1,355 @@ + + + From 1dca8476b35962c278124075acc731319fca60cb Mon Sep 17 00:00:00 2001 From: xiaqing Date: Sat, 10 Jun 2023 20:57:16 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=A8=A1=E5=9D=97=201.=E7=A7=AF=E5=88=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=202.=E7=A7=AF=E5=88=86=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E8=A7=84=E5=88=99=E7=AE=A1=E7=90=86=203.=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=204.=E7=94=A8=E6=88=B7=E7=AD=BE=E5=88=B0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/point/config/index.ts | 39 +++ src/api/point/record/index.ts | 47 ++++ src/api/point/signInConfig/index.ts | 37 +++ src/api/point/signInRecord/index.ts | 38 +++ src/utils/dict.ts | 5 +- src/views/point/config/ConfigForm.vue | 122 +++++++++ src/views/point/config/index.vue | 199 ++++++++++++++ src/views/point/record/RecordForm.vue | 179 ++++++++++++ src/views/point/record/index.vue | 259 ++++++++++++++++++ .../point/signInConfig/SignInConfigForm.vue | 97 +++++++ src/views/point/signInConfig/index.vue | 171 ++++++++++++ .../point/signInRecord/SignInRecordForm.vue | 99 +++++++ src/views/point/signInRecord/index.vue | 194 +++++++++++++ 13 files changed, 1485 insertions(+), 1 deletion(-) create mode 100644 src/api/point/config/index.ts create mode 100644 src/api/point/record/index.ts create mode 100644 src/api/point/signInConfig/index.ts create mode 100644 src/api/point/signInRecord/index.ts create mode 100644 src/views/point/config/ConfigForm.vue create mode 100644 src/views/point/config/index.vue create mode 100644 src/views/point/record/RecordForm.vue create mode 100644 src/views/point/record/index.vue create mode 100644 src/views/point/signInConfig/SignInConfigForm.vue create mode 100644 src/views/point/signInConfig/index.vue create mode 100644 src/views/point/signInRecord/SignInRecordForm.vue create mode 100644 src/views/point/signInRecord/index.vue diff --git a/src/api/point/config/index.ts b/src/api/point/config/index.ts new file mode 100644 index 00000000..1bf7b094 --- /dev/null +++ b/src/api/point/config/index.ts @@ -0,0 +1,39 @@ +import request from '@/config/axios' + +export interface ConfigVO { + id: number + tradeDeductEnable: number + tradeDeductUnitPrice: number + tradeDeductMaxPrice: number + tradeGivePoint: number +} + +// 查询积分设置列表 +export const getConfigPage = async (params) => { + return await request.get({ url: `/point/config/page`, params }) +} + +// 查询积分设置详情 +export const getConfig = async (id: number) => { + return await request.get({ url: `/point/config/get?id=` + id }) +} + +// 新增积分设置 +export const createConfig = async (data: ConfigVO) => { + return await request.post({ url: `/point/config/create`, data }) +} + +// 修改积分设置 +export const updateConfig = async (data: ConfigVO) => { + return await request.put({ url: `/point/config/update`, data }) +} + +// 删除积分设置 +export const deleteConfig = async (id: number) => { + return await request.delete({ url: `/point/config/delete?id=` + id }) +} + +// 导出积分设置 Excel +export const exportConfig = async (params) => { + return await request.download({ url: `/point/config/export-excel`, params }) +} diff --git a/src/api/point/record/index.ts b/src/api/point/record/index.ts new file mode 100644 index 00000000..15eaff35 --- /dev/null +++ b/src/api/point/record/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +export interface RecordVO { + id: number + bizId: string + bizType: string + type: string + title: string + description: string + point: number + totalPoint: number + status: number + userId: number + freezingTime: Date + thawingTime: Date + createDate: Date +} + +// 查询用户积分记录列表 +export const getRecordPage = async (params) => { + return await request.get({ url: `/point/record/page`, params }) +} + +// 查询用户积分记录详情 +export const getRecord = async (id: number) => { + return await request.get({ url: `/point/record/get?id=` + id }) +} + +// 新增用户积分记录 +export const createRecord = async (data: RecordVO) => { + return await request.post({ url: `/point/record/create`, data }) +} + +// 修改用户积分记录 +export const updateRecord = async (data: RecordVO) => { + return await request.put({ url: `/point/record/update`, data }) +} + +// 删除用户积分记录 +export const deleteRecord = async (id: number) => { + return await request.delete({ url: `/point/record/delete?id=` + id }) +} + +// 导出用户积分记录 Excel +export const exportRecord = async (params) => { + return await request.download({ url: `/point/record/export-excel`, params }) +} diff --git a/src/api/point/signInConfig/index.ts b/src/api/point/signInConfig/index.ts new file mode 100644 index 00000000..3786c06e --- /dev/null +++ b/src/api/point/signInConfig/index.ts @@ -0,0 +1,37 @@ +import request from '@/config/axios' + +export interface SignInConfigVO { + id: number + day: number + point: number +} + +// 查询积分签到规则列表 +export const getSignInConfigPage = async (params) => { + return await request.get({ url: `/point/sign-in-config/page`, params }) +} + +// 查询积分签到规则详情 +export const getSignInConfig = async (id: number) => { + return await request.get({ url: `/point/sign-in-config/get?id=` + id }) +} + +// 新增积分签到规则 +export const createSignInConfig = async (data: SignInConfigVO) => { + return await request.post({ url: `/point/sign-in-config/create`, data }) +} + +// 修改积分签到规则 +export const updateSignInConfig = async (data: SignInConfigVO) => { + return await request.put({ url: `/point/sign-in-config/update`, data }) +} + +// 删除积分签到规则 +export const deleteSignInConfig = async (id: number) => { + return await request.delete({ url: `/point/sign-in-config/delete?id=` + id }) +} + +// 导出积分签到规则 Excel +export const exportSignInConfig = async (params) => { + return await request.download({ url: `/point/sign-in-config/export-excel`, params }) +} diff --git a/src/api/point/signInRecord/index.ts b/src/api/point/signInRecord/index.ts new file mode 100644 index 00000000..0f9b9f64 --- /dev/null +++ b/src/api/point/signInRecord/index.ts @@ -0,0 +1,38 @@ +import request from '@/config/axios' + +export interface SignInRecordVO { + id: number + userId: number + day: number + point: number +} + +// 查询用户签到积分列表 +export const getSignInRecordPage = async (params) => { + return await request.get({ url: `/point/sign-in-record/page`, params }) +} + +// 查询用户签到积分详情 +export const getSignInRecord = async (id: number) => { + return await request.get({ url: `/point/sign-in-record/get?id=` + id }) +} + +// 新增用户签到积分 +export const createSignInRecord = async (data: SignInRecordVO) => { + return await request.post({ url: `/point/sign-in-record/create`, data }) +} + +// 修改用户签到积分 +export const updateSignInRecord = async (data: SignInRecordVO) => { + return await request.put({ url: `/point/sign-in-record/update`, data }) +} + +// 删除用户签到积分 +export const deleteSignInRecord = async (id: number) => { + return await request.delete({ url: `/point/sign-in-record/delete?id=` + id }) +} + +// 导出用户签到积分 Excel +export const exportSignInRecord = async (params) => { + return await request.download({ url: `/point/sign-in-record/export-excel`, params }) +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index c742274f..55e6de4a 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -150,5 +150,8 @@ export enum DICT_TYPE { PRODUCT_UNIT = 'product_unit', // 商品单位 PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态 // ========== MALL 交易模块 ========== - EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode' //快递的计费方式 + EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式 + //积分模块// + POINT_BIZ_TYPE = 'point_biz_type', + POINT_STATUS = 'point_status' } diff --git a/src/views/point/config/ConfigForm.vue b/src/views/point/config/ConfigForm.vue new file mode 100644 index 00000000..0b7f3747 --- /dev/null +++ b/src/views/point/config/ConfigForm.vue @@ -0,0 +1,122 @@ + + diff --git a/src/views/point/config/index.vue b/src/views/point/config/index.vue new file mode 100644 index 00000000..b8259831 --- /dev/null +++ b/src/views/point/config/index.vue @@ -0,0 +1,199 @@ + + + diff --git a/src/views/point/record/RecordForm.vue b/src/views/point/record/RecordForm.vue new file mode 100644 index 00000000..6da630eb --- /dev/null +++ b/src/views/point/record/RecordForm.vue @@ -0,0 +1,179 @@ + + diff --git a/src/views/point/record/index.vue b/src/views/point/record/index.vue new file mode 100644 index 00000000..94db7d92 --- /dev/null +++ b/src/views/point/record/index.vue @@ -0,0 +1,259 @@ + + + diff --git a/src/views/point/signInConfig/SignInConfigForm.vue b/src/views/point/signInConfig/SignInConfigForm.vue new file mode 100644 index 00000000..345da7df --- /dev/null +++ b/src/views/point/signInConfig/SignInConfigForm.vue @@ -0,0 +1,97 @@ + + diff --git a/src/views/point/signInConfig/index.vue b/src/views/point/signInConfig/index.vue new file mode 100644 index 00000000..cd34d0c9 --- /dev/null +++ b/src/views/point/signInConfig/index.vue @@ -0,0 +1,171 @@ + + + diff --git a/src/views/point/signInRecord/SignInRecordForm.vue b/src/views/point/signInRecord/SignInRecordForm.vue new file mode 100644 index 00000000..99f6122b --- /dev/null +++ b/src/views/point/signInRecord/SignInRecordForm.vue @@ -0,0 +1,99 @@ + + diff --git a/src/views/point/signInRecord/index.vue b/src/views/point/signInRecord/index.vue new file mode 100644 index 00000000..a79b2987 --- /dev/null +++ b/src/views/point/signInRecord/index.vue @@ -0,0 +1,194 @@ + + + From 8666307d472cd1b335b0102af9a8fede76823919 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 17 Jun 2023 17:38:20 +0800 Subject: [PATCH 14/18] =?UTF-8?q?code=20review=EF=BC=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E7=9A=84=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 73913b91..7058ea02 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -146,7 +146,14 @@ export enum DICT_TYPE { MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型 MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型 - // ========== MALL - PROMOTION 模块 ========== + // ========== MALL - 商品模块 ========== + PRODUCT_UNIT = 'product_unit', // 商品单位 + PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态 + + // ========== MALL - 交易模块 ========== + EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式 + + // ========== MALL - 营销模块 ========== PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型 PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围 PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型 From 5eaf054646d4eb701f1ce54d566cce16549dde98 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 17 Jun 2023 18:33:07 +0800 Subject: [PATCH 15/18] =?UTF-8?q?code=20review=EF=BC=9A=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 824d8624..99eab8e0 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -146,6 +146,11 @@ export enum DICT_TYPE { MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型 MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型 + // ========== MALL - 会员模块 ========== + // 积分模块 TODO 芋艿：改成 member_ 前缀；包括枚举和值； + POINT_BIZ_TYPE = 'point_biz_type', + POINT_STATUS = 'point_status', + // ========== MALL - 商品模块 ========== PRODUCT_UNIT = 'product_unit', // 商品单位 PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态 @@ -161,8 +166,4 @@ export enum DICT_TYPE { PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式 PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态 PROMOTION_CONDITION_TYPE = 'promotion_condition_type' // 营销的条件类型枚举 - // 积分模块 TODO 芋艿：这里枚举要改下 - POINT_BIZ_TYPE = 'point_biz_type', - POINT_STATUS = 'point_status' - } From ae69492b53ceeb006c72c1ef70d1b0b15685dee2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 17 Jun 2023 18:48:49 +0800 Subject: [PATCH 16/18] =?UTF-8?q?code=20review=EF=BC=9Aspu=20todo=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mall/product/spu/components/spu.data.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/mall/product/spu/components/spu.data.ts b/src/views/mall/product/spu/components/spu.data.ts index 2f024d5b..41c43df9 100644 --- a/src/views/mall/product/spu/components/spu.data.ts +++ b/src/views/mall/product/spu/components/spu.data.ts @@ -1,7 +1,5 @@ import { CrudSchema } from '@/hooks/web/useCrudSchemas' -// TODO @puhui999：如果只要 detail，可以不用 CrudSchema，只要描述的 Schema -// fix: useCrudSchemas 中没有单独处理的情况且只要 detail 的情况只要 spu 这里有使用 如果改动得添加/修改代码 export const basicInfoSchema = reactive([ { label: '商品名称', From e3f250fff07ee496c54050d1ed28041c9786d0fd Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 17 Jun 2023 21:02:29 +0800 Subject: [PATCH 17/18] =?UTF-8?q?code=20review=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mall/trade/order/index.ts | 1 + src/api/mall/trade/order/type/orderType.ts | 4 + src/utils/dict.ts | 20 +-- src/views/mall/trade/order/index.vue | 174 ++++++++++----------- 4 files changed, 100 insertions(+), 99 deletions(-) diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts index 5a401030..9d0fab2e 100644 --- a/src/api/mall/trade/order/index.ts +++ b/src/api/mall/trade/order/index.ts @@ -1,6 +1,7 @@ import request from '@/config/axios' // 获得交易订单分页 +// TODO @xiaobai：改成 getOrderPage export const getOrderList = (params: PageParam) => { return request.get({ url: '/trade/order/page', params }) } diff --git a/src/api/mall/trade/order/type/orderType.ts b/src/api/mall/trade/order/type/orderType.ts index cba4fbff..759d9f9a 100644 --- a/src/api/mall/trade/order/type/orderType.ts +++ b/src/api/mall/trade/order/type/orderType.ts @@ -1,3 +1,6 @@ +// TODO @xiaobai：这个放到 order/index.ts 里哈 +// TODO @xiaobai：注释放到变量后面，这样简洁一点 +// TODO @xiaobai：这个改成 TradeOrderRespVO export interface TradeOrderPageItemRespVO { // 订单编号 id: number @@ -85,6 +88,7 @@ export interface TradeOrderPageItemRespVO { items: TradeOrderItemBaseVO[] } +// TODO @xiaobai：这个改成 TradeOrderItemRespVO /** * 交易订单项 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 56d7c4c4..fda02848 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -156,6 +156,13 @@ export enum DICT_TYPE { // ========== MALL - 交易模块 ========== EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式 + TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态 + TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式 + TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型 + TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型 + TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态 + TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态 + TERMINAL = 'terminal', // 终端 // ========== MALL - 营销模块 ========== PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型 @@ -164,16 +171,5 @@ export enum DICT_TYPE { PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态 PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式 PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态 - PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举 - - //===add by 20230530==== - // ========== MALL - ORDER 模块 ========== - TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态 - TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式 - TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型 - TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型 - TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态 - TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态 - - TERMINAL = 'terminal' + PROMOTION_CONDITION_TYPE = 'promotion_condition_type' // 营销的条件类型枚举 } diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue index 61b22856..cd051a2b 100644 --- a/src/views/mall/trade/order/index.vue +++ b/src/views/mall/trade/order/index.vue @@ -64,9 +64,8 @@ /> - - + 重置 - 导出TODO @@ -110,9 +109,9 @@ - + + -