From 38c0b88abf8d4574f3a74185b602356f68f67ea2 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Tue, 6 Jan 2026 17:33:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9&?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E8=AE=A1=E5=88=92=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/allUserPoerations.vue | 706 +++++++++--------- .../Administrator/subscriptionPlan.vue | 48 +- src/component/common/SelectUser.vue | 135 ++++ src/tool/adminRouter.js | 386 +++++----- 4 files changed, 747 insertions(+), 528 deletions(-) create mode 100644 src/component/common/SelectUser.vue diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue index 4ed3b1e0..ce59efeb 100644 --- a/src/component/Administrator/allUserPoerations.vue +++ b/src/component/Administrator/allUserPoerations.vue @@ -1,352 +1,392 @@ \ No newline at end of file + diff --git a/src/component/Administrator/subscriptionPlan.vue b/src/component/Administrator/subscriptionPlan.vue index e0bf2077..bc87ef96 100644 --- a/src/component/Administrator/subscriptionPlan.vue +++ b/src/component/Administrator/subscriptionPlan.vue @@ -48,7 +48,7 @@ - + > --> + + + + Search @@ -279,7 +292,7 @@
- Account Num: + Sub-Account Num: * { return current && current < dayjs().subtract(1, 'days').endOf('day') } +const countryList = ref([]) + const searchForm = reactive({ name: '', startTime: '', @@ -498,17 +516,19 @@ const columns = [ }, { title: 'Admin Account', - dataIndex: 'adminAccId', - key: 'adminAccId', + dataIndex: 'adminAccEmail', + key: 'adminAccEmail', align: 'center', - width: 180 + width: 180, + ellipsis: true }, { - title: 'Account Num', + title: 'Sub-Account Num', dataIndex: 'accountNum', key: 'accountNum', align: 'center', - width: 120 + width: 120, + ellipsis: true }, { title: 'Start Time', @@ -558,6 +578,8 @@ onMounted(async () => { await handleSearch() calculateTableHeight() window.addEventListener('resize', handleResize) + const list = sessionStorage.getItem('allCountry') + countryList.value = list ? JSON.parse(list) : [] }) onBeforeUnmount(() => { @@ -949,9 +971,15 @@ const filterOption = (input: string, option: any) => { } .subscriptionPlan_modal { - > .admin_state_item { + .form_content{ + width: 100%; + display: flex; + flex-wrap: wrap; + row-gap: 2rem; + } + .admin_state_item { > span { - width: 15rem; + width: 17rem !important; } } .modal_title_text { diff --git a/src/component/common/SelectUser.vue b/src/component/common/SelectUser.vue new file mode 100644 index 00000000..013a402b --- /dev/null +++ b/src/component/common/SelectUser.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/tool/adminRouter.js b/src/tool/adminRouter.js index dcea9b8c..ce48181c 100644 --- a/src/tool/adminRouter.js +++ b/src/tool/adminRouter.js @@ -1,189 +1,205 @@ const all = (t)=>{ - return[{ - name:'All User', - route:'/administrator/allUser', - icon:'yonghu', - expandIcon:'icon-xiala', - key:'sub1', - isShow:true, - // children: [ - // { - // name:'User Management', - // route:'/home/excil1', - // icon:'', - // key:'/home/excil22', - // isShow:true, - // }, - // { - // code:'ROLE_MANAGER', - // name:'Access Permission', - // route:'/home/excil2', - // icon:'', - // key:'/home/excil33', - // isShow:true, - // }, - // ], - },{ - name:'Design Frequency', - route:'/administrator/testClickData', - icon:'shenpi', - expandIcon:'icon-xiala', - key:'sub2', - isShow:true, - },{ - name:'Trial User', - icon:'usetime', - expandIcon:'icon-xiala', - key:'sub3', - isShow:true, - children:[ - { - name:'All Trial User', - route:'/administrator/trialAllUser', - icon:'usetime', - key:'sub3-1', - isShow:true, - },{ - name:'Trial User Approval', - route:'/administrator/trialApproval', - icon:'usetime', - key:'sub3-2', - isShow:true, - },{ - name:'Trial User CHART', - route:'/administrator/trialUserCountry', - icon:'', - key:'sub3-3', - isShow:true, - },{ - name:'Conversion Rate', - route:'/administrator/trialUserConversionRateChart', - icon:'', - key:'sub3-4', - isShow:true, - }, - ] - },{ - name:'Function Use CHART', - route:'/administrator/recentActiveChart', - icon:'usetime', - key:'sub4', - isShow:true, - },{ - name:'Active User', - icon:'usetime', - route:'/administrator/recentActiveUser', - key:'sub5', - isShow:true, - },{ - name:'New User', - icon:'usetime', - expandIcon:'icon-xiala', - key:'sub6', - isShow:true, - children:[ - { - name:'New User List', - route:'/administrator/recentNewUser', - icon:'', - key:'sub6-1', - isShow:true, - },{ - name:'New User CHART', - route:'/administrator/recentNewUserChart', - icon:'', - key:'sub6-2', - isShow:true, - }, - ] - },{ - name:'Events', - icon:'usetime', - key:'sub9', - expandIcon:'icon-xiala', - isShow:true, - children: [ - { - name:'Questionnaire Survey', - route:'/administrator/questionnaire', - icon:'', - key:'sub9-1', - isShow:true, - }, - // { - // code:'ROLE_MANAGER', - // name:'Access Permission', - // route:'/home/excil2', - // icon:'', - // key:'/home/excil33', - // isShow:true, - // }, - ], - },{ - name:'Affiliate', - icon:'usetime', - expandIcon:'icon-xiala', - key:'sub10', - isShow:true, - children: [ - { - name:'Approval Affiliate', - route:'/administrator/affiliateAudit', - icon:'', - key:'sub10-1', - isShow:true, - }, - { - name:'Affiliate Referral', - route:'/administrator/affiliateReferral', - icon:'', - key:'sub10-2', - isShow:true, - }, - ], - },{ - name:'Transaction', - icon:'usetime', - expandIcon:'icon-xiala', - key:'sub11', - isShow:true, - children: [ - { - name:'Transaction Record', - route:'/administrator/TransactionTable', - icon:'', - key:'sub11-1', - isShow:true, - }, - // { - // code:'ROLE_MANAGER', - // name:'Access Permission', - // route:'/home/excil2', - // icon:'', - // key:'/home/excil33', - // isShow:true, - // }, - ], - },{ - name:'Promotion Code', - icon:'usetime', - route:'/administrator/coupons', - key:'sub12', - isShow:true, - },{ - - name:'Organization', - icon:'usetime', - route:'/administrator/organization', - key:'sub13', - isShow:true, - },{ - name:'Subscription Plan', - icon:'usetime', - route:'/administrator/subscriptionPlan', - key:'sub14', - isShow:true, - }] + return [ + { + name: 'All User', + route: '/administrator/allUser', + icon: 'yonghu', + expandIcon: 'icon-xiala', + key: 'sub1', + isShow: true + // children: [ + // { + // name:'User Management', + // route:'/home/excil1', + // icon:'', + // key:'/home/excil22', + // isShow:true, + // }, + // { + // code:'ROLE_MANAGER', + // name:'Access Permission', + // route:'/home/excil2', + // icon:'', + // key:'/home/excil33', + // isShow:true, + // }, + // ], + }, + { + name: 'Design Frequency', + route: '/administrator/testClickData', + icon: 'shenpi', + expandIcon: 'icon-xiala', + key: 'sub2', + isShow: true + }, + { + name: 'Trial User', + icon: 'usetime', + expandIcon: 'icon-xiala', + key: 'sub3', + isShow: true, + children: [ + { + name: 'All Trial User', + route: '/administrator/trialAllUser', + icon: 'usetime', + key: 'sub3-1', + isShow: true + }, + { + name: 'Trial User Approval', + route: '/administrator/trialApproval', + icon: 'usetime', + key: 'sub3-2', + isShow: true + }, + { + name: 'Trial User CHART', + route: '/administrator/trialUserCountry', + icon: '', + key: 'sub3-3', + isShow: true + }, + { + name: 'Conversion Rate', + route: '/administrator/trialUserConversionRateChart', + icon: '', + key: 'sub3-4', + isShow: true + } + ] + }, + { + name: 'Function Use CHART', + route: '/administrator/recentActiveChart', + icon: 'usetime', + key: 'sub4', + isShow: true + }, + { + name: 'Active User', + icon: 'usetime', + route: '/administrator/recentActiveUser', + key: 'sub5', + isShow: true + }, + { + name: 'New User', + icon: 'usetime', + expandIcon: 'icon-xiala', + key: 'sub6', + isShow: true, + children: [ + { + name: 'New User List', + route: '/administrator/recentNewUser', + icon: '', + key: 'sub6-1', + isShow: true + }, + { + name: 'New User CHART', + route: '/administrator/recentNewUserChart', + icon: '', + key: 'sub6-2', + isShow: true + } + ] + }, + { + name: 'Events', + icon: 'usetime', + key: 'sub9', + expandIcon: 'icon-xiala', + isShow: true, + children: [ + { + name: 'Questionnaire Survey', + route: '/administrator/questionnaire', + icon: '', + key: 'sub9-1', + isShow: true + } + // { + // code:'ROLE_MANAGER', + // name:'Access Permission', + // route:'/home/excil2', + // icon:'', + // key:'/home/excil33', + // isShow:true, + // }, + ] + }, + { + name: 'Affiliate', + icon: 'usetime', + expandIcon: 'icon-xiala', + key: 'sub10', + isShow: true, + children: [ + { + name: 'Approval Affiliate', + route: '/administrator/affiliateAudit', + icon: '', + key: 'sub10-1', + isShow: true + }, + { + name: 'Affiliate Referral', + route: '/administrator/affiliateReferral', + icon: '', + key: 'sub10-2', + isShow: true + } + ] + }, + { + name: 'Transaction', + icon: 'usetime', + expandIcon: 'icon-xiala', + key: 'sub11', + isShow: true, + children: [ + { + name: 'Transaction Record', + route: '/administrator/TransactionTable', + icon: '', + key: 'sub11-1', + isShow: true + } + // { + // code:'ROLE_MANAGER', + // name:'Access Permission', + // route:'/home/excil2', + // icon:'', + // key:'/home/excil33', + // isShow:true, + // }, + ] + }, + { + name: 'Promotion Code', + icon: 'usetime', + route: '/administrator/coupons', + key: 'sub12', + isShow: true + }, + { + name: 'Organization', + icon: 'usetime', + route: '/administrator/organization', + key: 'sub13', + isShow: true + }, + { + name: 'Organization Plan', + icon: 'usetime', + route: '/administrator/subscriptionPlan', + key: 'sub14', + isShow: true + } + ] } const schoolOrEnterprise = (t) =>{ return[