From 86671de03596b2d32280f3f934a51161f3190dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E5=95=A6C=E6=A2=A6?= <15709267061@163.com> Date: Fri, 14 Mar 2025 19:03:13 +0800 Subject: [PATCH] update --- package.json | 1 + pnpm-lock.yaml | 9 ++ src/api/system.js | 8 +- src/components/FormTitle/index.vue | 28 ++++ src/components/MinutesHoursRadio/index.vue | 14 ++ src/components/XSelect/index.vue | 31 ++++ src/pages/layout/index.vue | 2 +- .../pages/task-center/components/Backfill.vue | 40 +++++ .../task-center/components/new-task-1.vue | 106 +++++++++++++ .../task-center/components/new-task-2.vue | 88 +++++++++++ .../task-center/components/new-task-3.vue | 70 +++++++++ .../task-center/components/new-task-4.vue | 108 ++++++++++++++ .../task-center/components/new-task-5.vue | 84 +++++++++++ .../task-center/components/new-task-6.vue | 111 ++++++++++++++ .../task-center/components/new-task-7.vue | 39 +++++ .../merchant/pages/task-center/index.vue | 13 +- .../merchant/pages/task-center/new-task.vue | 73 +++++++++ .../pages/task-center/reward-mission.vue | 140 +++++++++--------- src/pinia/SystemStore/mock.js | 22 +++ src/router/generateRouter.js | 2 + src/router/routes-map.js | 2 + src/scss/global.scss | 15 +- 22 files changed, 923 insertions(+), 83 deletions(-) create mode 100644 src/components/FormTitle/index.vue create mode 100644 src/components/MinutesHoursRadio/index.vue create mode 100644 src/components/XSelect/index.vue create mode 100644 src/pages/merchant/pages/task-center/components/Backfill.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-1.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-2.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-3.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-4.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-5.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-6.vue create mode 100644 src/pages/merchant/pages/task-center/components/new-task-7.vue create mode 100644 src/pages/merchant/pages/task-center/new-task.vue diff --git a/package.json b/package.json index 208580a..306296b 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "axios": "^1.8.2", "pinia": "^3.0.1", "pinia-plugin-persistedstate": "^4.2.0", + "uuid": "^11.1.0", "vite-plugin-vue-devtools": "^7.7.2", "vue": "^3.5.13", "vue-router": "^4.5.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff05f39..adea70b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: pinia-plugin-persistedstate: specifier: ^4.2.0 version: 4.2.0(pinia@3.0.1(vue@3.5.13)) + uuid: + specifier: ^11.1.0 + version: 11.1.0 vite-plugin-vue-devtools: specifier: ^7.7.2 version: 7.7.2(@nuxt/kit@3.15.4)(rollup@4.34.8)(vite@6.2.0(jiti@2.4.2)(sass@1.85.1)(yaml@2.7.0))(vue@3.5.13) @@ -1689,6 +1692,10 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + uuid@11.1.0: + resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==} + hasBin: true + vite-hot-client@0.2.4: resolution: {integrity: sha512-a1nzURqO7DDmnXqabFOliz908FRmIppkBKsJthS8rbe8hBEXwEwe4C3Pp33Z1JoFCYfVL4kTOMLKk0ZZxREIeA==} peerDependencies: @@ -3417,6 +3424,8 @@ snapshots: util-deprecate@1.0.2: {} + uuid@11.1.0: {} + vite-hot-client@0.2.4(vite@6.2.0(jiti@2.4.2)(sass@1.85.1)(yaml@2.7.0)): dependencies: vite: 6.2.0(jiti@2.4.2)(sass@1.85.1)(yaml@2.7.0) diff --git a/src/api/system.js b/src/api/system.js index edc655c..baec907 100644 --- a/src/api/system.js +++ b/src/api/system.js @@ -7,7 +7,13 @@ const system = { method: "POST", data: params }); - } + }, + getSelect: async () => { + return request({ + url: '/m1/5995958-5684445-default/getSelectList', + method: "GET", + }); + }, } export default system; diff --git a/src/components/FormTitle/index.vue b/src/components/FormTitle/index.vue new file mode 100644 index 0000000..55f29b5 --- /dev/null +++ b/src/components/FormTitle/index.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/MinutesHoursRadio/index.vue b/src/components/MinutesHoursRadio/index.vue new file mode 100644 index 0000000..7e642d8 --- /dev/null +++ b/src/components/MinutesHoursRadio/index.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/components/XSelect/index.vue b/src/components/XSelect/index.vue new file mode 100644 index 0000000..081439c --- /dev/null +++ b/src/components/XSelect/index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/pages/layout/index.vue b/src/pages/layout/index.vue index 7f217fd..13becfe 100644 --- a/src/pages/layout/index.vue +++ b/src/pages/layout/index.vue @@ -8,7 +8,7 @@ import LayoutSider from '../../components/LayoutSider/index.vue'; - + diff --git a/src/pages/merchant/pages/task-center/components/Backfill.vue b/src/pages/merchant/pages/task-center/components/Backfill.vue new file mode 100644 index 0000000..49ec635 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/Backfill.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-1.vue b/src/pages/merchant/pages/task-center/components/new-task-1.vue new file mode 100644 index 0000000..346d5bc --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-1.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-2.vue b/src/pages/merchant/pages/task-center/components/new-task-2.vue new file mode 100644 index 0000000..05e6b3f --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-2.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-3.vue b/src/pages/merchant/pages/task-center/components/new-task-3.vue new file mode 100644 index 0000000..12a22b5 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-3.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-4.vue b/src/pages/merchant/pages/task-center/components/new-task-4.vue new file mode 100644 index 0000000..5a3749a --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-4.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-5.vue b/src/pages/merchant/pages/task-center/components/new-task-5.vue new file mode 100644 index 0000000..58e182f --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-5.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-6.vue b/src/pages/merchant/pages/task-center/components/new-task-6.vue new file mode 100644 index 0000000..e2154e1 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-6.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/components/new-task-7.vue b/src/pages/merchant/pages/task-center/components/new-task-7.vue new file mode 100644 index 0000000..ae6ca14 --- /dev/null +++ b/src/pages/merchant/pages/task-center/components/new-task-7.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/index.vue b/src/pages/merchant/pages/task-center/index.vue index b1b6fab..05877ec 100644 --- a/src/pages/merchant/pages/task-center/index.vue +++ b/src/pages/merchant/pages/task-center/index.vue @@ -1,13 +1,18 @@ diff --git a/src/pages/merchant/pages/task-center/new-task.vue b/src/pages/merchant/pages/task-center/new-task.vue new file mode 100644 index 0000000..1d30ddd --- /dev/null +++ b/src/pages/merchant/pages/task-center/new-task.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/pages/merchant/pages/task-center/reward-mission.vue b/src/pages/merchant/pages/task-center/reward-mission.vue index 45660bd..997aebd 100644 --- a/src/pages/merchant/pages/task-center/reward-mission.vue +++ b/src/pages/merchant/pages/task-center/reward-mission.vue @@ -133,77 +133,79 @@ const {loading, pagination, initFetchData} = useTableQuery({