From 87fe7bd5df117d99e6aba0d67bd7fba0ac5dd0ca Mon Sep 17 00:00:00 2001 From: zhongzm Date: Tue, 24 Dec 2024 18:36:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B4=A6=E5=8D=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/langs/en-us.ts | 10 +- src/locales/langs/zh-cn.ts | 8 ++ src/service/api/auth.ts | 16 ++- src/typings/api.d.ts | 15 +++ src/typings/auto-imports.d.ts | 2 + src/views/billing/billservice/index.vue | 129 ++++++++++++++++++++++++ 6 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 src/views/billing/billservice/index.vue diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 6e5130a..88d2eaf 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -7,11 +7,15 @@ const viewEn: any = { "view.billing_histories": "Historical", "view.billing_Rechargehistory":"Recharge history", "view.billing_Internetdetails":"Internet details", + "view.billing_billservice":"Bill service", "view.set-meal": "Package", "view.userInfo":"User Information", "view.userInfo_profile":"Change Information", "view.userInfo_resetpwd":"Reset Password", "view.userInfo_device":"Device management", + "view.userInfo_access":"Currently connected device", + "view.userInfo_records":"History device", + "view.cdrlrecords":"CDR records", }; const local: any = { @@ -542,6 +546,7 @@ const local: any = { Unpaid:'Unpaid', }, Internetdetails:{ + title:"Internet Details", month:"month", year:"year", starttime:"Start Time", @@ -580,7 +585,7 @@ const local: any = { devicename:"Device Name", mac:"Mac", speed:"Current Rate", - currentdevice:"The device is currently connected", + currentdevice:"Currently connected", refresh:"Refresh", }, usercard:{ @@ -588,6 +593,9 @@ const local: any = { resetpwd:"Reset password", KYC:"KYC Certification", deviceconsole:"Device management", + access:"Currently connected device", + records:"History connected", + cdrlrecords: "CDR records", }, device:{ title: "Device management", diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index d49dd9d..36c2e6c 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -4,6 +4,7 @@ const viewZh: any = { "view.endpoint_records": "历史设备", "view.endpoint_cdrlrecords":"cdr记录", "view.billing": "账单", + "view.billing_billservice":"账单服务", "view.billing_histories": "历史查询", "view.billing_Rechargehistory":"充值记录", "view.billing_Internetdetails":"上网详单", @@ -12,6 +13,9 @@ const viewZh: any = { "view.userInfo_profile":"修改信息", "view.userInfo_resetpwd":"修改密码", "view.userInfo_device":"设备管理", + "view.userInfo_accsee":"当前设备", + "view.userInfo_records":"历史设备", + "view.userInfo_cdrlrecords":"cdr记录", }; const local:any = { @@ -542,6 +546,7 @@ const local:any = { Unpaid:'未支付', }, Internetdetails:{ + title:"上网详单", month:"月", year:"年", starttime:"起始时间", @@ -588,6 +593,9 @@ const local:any = { resetpwd:"修改密码", KYC:"KYC认证", deviceconsole:"设备管理", + access:"当前设备", + records:"历史连接", + cdrlrecords: "CDR记录", }, device:{ title: "设备管理", diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index a074f1d..f9df2ae 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -121,4 +121,18 @@ export function fetchCDRHistory(params: Api.CDR.CDRQueryParams) { params }); } - +/** Get package list */ +export function fetchPackageList() { + return request({ + url: '/u/package/list', + method: 'get' + }); +} +/** Submit package order */ +export function submitPackageOrder(packageId: string) { + return request({ + url: '/u/order', + method: 'post', + data: { packageId } + }); +} diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index 7f44b20..da58c38 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -585,4 +585,19 @@ declare namespace Api { pageSize: number; } } + namespace Package { + interface PackageItem { + id: string; + amount: number; + price: number; + description?: string; + } + + interface PackageListResponse { + code: number; + msg: string; + data: PackageItem[]; + total?: number; + } + } } diff --git a/src/typings/auto-imports.d.ts b/src/typings/auto-imports.d.ts index 9c126be..135f262 100644 --- a/src/typings/auto-imports.d.ts +++ b/src/typings/auto-imports.d.ts @@ -102,6 +102,7 @@ declare global { const fetchHistoricalDevices: typeof import('../service/api/auth')['fetchHistoricalDevices'] const fetchIsRouteExist: typeof import('../service/api/route')['fetchIsRouteExist'] const fetchLogin: typeof import('../service/api/auth')['fetchLogin'] + const fetchPackageList: typeof import('../service/api/auth')['fetchPackageList'] const fetchRefreshToken: typeof import('../service/api/auth')['fetchRefreshToken'] const fetchRegister: typeof import('../service/api/auth')['fetchRegister'] const filterAuthRoutesByRoles: typeof import('../store/modules/route/shared')['filterAuthRoutesByRoles'] @@ -200,6 +201,7 @@ declare global { const shallowRef: typeof import('vue')['shallowRef'] const sortRoutesByOrder: typeof import('../store/modules/route/shared')['sortRoutesByOrder'] const storeToRefs: typeof import('pinia')['storeToRefs'] + const submitPackageOrder: typeof import('../service/api/auth')['submitPackageOrder'] const suite: typeof import('vitest')['suite'] const syncRef: typeof import('@vueuse/core')['syncRef'] const syncRefs: typeof import('@vueuse/core')['syncRefs'] diff --git a/src/views/billing/billservice/index.vue b/src/views/billing/billservice/index.vue new file mode 100644 index 0000000..8322739 --- /dev/null +++ b/src/views/billing/billservice/index.vue @@ -0,0 +1,129 @@ + + + + +