From 60d92c4cec50fde35dbbf412293620940542b5a1 Mon Sep 17 00:00:00 2001 From: Seven Date: Sun, 25 Jan 2026 18:27:21 +0700 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=92=8C=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=98=E6=AC=BE=E5=92=8C=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E8=B7=AF=E7=94=B1=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 2 +- package.json | 2 +- pnpm-lock.yaml | 12 +++++------ src/router/elegant/routes.ts | 42 ++++++++++++++++++------------------ src/views/deposit/index.vue | 4 +--- src/views/user/index.vue | 22 ++++++++++++++++++- 6 files changed, 51 insertions(+), 33 deletions(-) diff --git a/.env.test b/.env.test index 6ea8b66..8fbc8df 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ # backend service base url, test environment -VITE_SERVICE_BASE_URL=https://capp-api.riwsan.com +VITE_SERVICE_BASE_URL=http://192.168.1.2:9538 # other backend service base url, test environment VITE_OTHER_SERVICE_BASE_URL= `{}` diff --git a/package.json b/package.json index 3108d13..9eb0b8f 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@better-scroll/core": "2.5.1", "@elysiajs/eden": "^1.4.5", "@iconify/vue": "5.0.0", - "@riwa/api-types": "http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz", + "@riwa/api-types": "http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz", "@sa/axios": "workspace:*", "@sa/color": "workspace:*", "@sa/hooks": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9078fdf..269800c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: 5.0.0 version: 5.0.0(vue@3.5.25(typescript@5.9.3)) '@riwa/api-types': - specifier: http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz - version: '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))' + specifier: http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz + version: '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))' '@sa/axios': specifier: workspace:* version: link:packages/axios @@ -496,9 +496,9 @@ packages: '@borewit/text-codec@0.1.1': resolution: {integrity: sha512-5L/uBxmjaCIX5h8Z+uu+kA9BQLkc/Wl06UGR5ajNRxu+/XjonB5i8JpgFMrPj3LXTCPA0pv8yxUvbUi+QthGGA==} - '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz': - resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz} - version: 0.0.38 + '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz': + resolution: {tarball: http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz} + version: 0.0.40 peerDependencies: '@elysiajs/eden': ^1.4.6 @@ -4871,7 +4871,7 @@ snapshots: '@borewit/text-codec@0.1.1': {} - '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.38.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))': + '@capp/eden@http://192.168.1.2:9538/api/capp-eden-0.0.40.tgz(@elysiajs/eden@1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))': dependencies: '@elysiajs/eden': 1.4.5(elysia@1.4.19(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)) diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 87de41b..830331b 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -49,6 +49,16 @@ export const generatedRoutes: GeneratedRoute[] = [ order: 5 } }, + { + name: 'deposit', + path: '/deposit', + component: 'layout.base$view.deposit', + meta: { + title: 'deposit', + i18nKey: 'route.deposit', + order: 7 + } + }, { name: 'iframe-page', path: '/iframe-page/:url', @@ -104,6 +114,16 @@ export const generatedRoutes: GeneratedRoute[] = [ order: 3 } }, + { + name: 'referral', + path: '/referral', + component: 'layout.base$view.referral', + meta: { + title: 'referral', + i18nKey: 'route.referral', + order: 9 + } + }, { name: 'user', path: '/user', @@ -124,16 +144,6 @@ export const generatedRoutes: GeneratedRoute[] = [ order: 6 } }, - { - name: 'deposit', - path: '/deposit', - component: 'layout.base$view.deposit', - meta: { - title: 'deposit', - i18nKey: 'route.deposit', - order: 7 - } - }, { name: 'withdraw', path: '/withdraw', @@ -143,15 +153,5 @@ export const generatedRoutes: GeneratedRoute[] = [ i18nKey: 'route.withdraw', order: 8 } - }, - { - name: 'referral', - path: '/referral', - component: 'layout.base$view.referral', - meta: { - title: 'referral', - i18nKey: 'route.referral', - order: 9 - } - }, + } ]; diff --git a/src/views/deposit/index.vue b/src/views/deposit/index.vue index 02ff0a5..a85c14d 100644 --- a/src/views/deposit/index.vue +++ b/src/views/deposit/index.vue @@ -25,9 +25,7 @@ enum DepositStatus { const tableInst = useTemplateRef('tableInst'); const fetchData: TableFetchData = ({ pagination, filter }) => { - return safeClient(() => - client.api.admin.deposit.pending.get({ query: { userId: props.userId, ...pagination, ...filter } }) - ); + return safeClient(() => client.api.admin.deposit.get({ query: { userId: props.userId, ...pagination, ...filter } })); }; const columns: TableBaseColumns = [ diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 24b03bc..9c1fb21 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -113,7 +113,7 @@ const columns: TableBaseColumns = [ onClick: () => { dialog.warning({ title: '重置交易密码', - content: '确认重置该用户的交易密码为初始密码123456吗？', + content: '确认重置该用户的交易密码吗？', positiveText: '确认重置', negativeText: '取消', onPositiveClick: async () => { @@ -129,6 +129,26 @@ const columns: TableBaseColumns = [ }); } }, + { + contentText: '重置登录密码', + size: 'small', + onClick: () => { + dialog.warning({ + title: '重置登录密码', + content: '确认重置该用户的登录密码吗？', + positiveText: '确认重置', + negativeText: '取消', + onPositiveClick: async () => { + const { data } = await safeClient(() => client.api.admin.users({ userId: row.id }).password.reset.post()); + + dialog.success({ + title: '操作成功', + content: `该用户的登录密码已重置为初始密码 ${data.value?.password}，请妥善告知用户。` + }); + } + }); + } + }, { contentText: '查看团队', size: 'small',