From 9c9b219f3b36601a38fac07083af14e2502e60ff Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 5 Jan 2026 15:25:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=85=8D=E8=B4=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=94=B9=E4=B8=BA7=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/mainPage/signUp/index.vue | 36 +++++++++++++++---------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/component/mainPage/signUp/index.vue b/src/component/mainPage/signUp/index.vue index 88ee179b..2aa07809 100644 --- a/src/component/mainPage/signUp/index.vue +++ b/src/component/mainPage/signUp/index.vue @@ -32,14 +32,14 @@
{{ item?.info }}
-
+
{{ item?.price }}
{{ item?.detail }} @@ -111,7 +111,7 @@ export default defineComponent({ type: 'personal', info: '您的AI时尚设计助手', price: 'HK$0', - detail: '自注册之日起 5 天内 · 50 个积分', + detail: '自注册之日起 7 天内 · 50 个积分', highlight: '', discounts: '9折优惠', detailList: [ @@ -190,7 +190,7 @@ export default defineComponent({ type: 'personal', info: '您的AI时尚设计助手', price: 'HK$0', - detail: '自注册之日起 5 天内 · 50 个积分', + detail: '自注册之日起 7 天内 · 50 个积分', highlight: '', discounts: '9折优惠', detailList: [ @@ -255,7 +255,7 @@ export default defineComponent({ type: 'personal', info: 'Your AI Fashion Design Assistant', price: 'HK$0', - detail: '5 days from sign-up · 50 credits', + detail: '7 days from sign-up · 50 credits', highlight: '', discounts: '10% off', detailList: [ @@ -334,7 +334,7 @@ export default defineComponent({ type: 'personal', info: 'Your AI Fashion Design Assistant', price: 'HK$0', - detail: '5 days from sign-up · 50 credits', + detail: '7 days from sign-up · 50 credits', highlight: '', discounts: '10% off', detailList: [ @@ -541,6 +541,7 @@ export default defineComponent({ position: relative; --selectPadding: 0.58rem; padding: var(--selectPadding); + transform: scale(1.05); @media (max-width: 767px) { --selectPadding: 0.36rem; border-radius: 0.58rem; @@ -551,7 +552,7 @@ export default defineComponent({ left: var(--selectPadding); } > .leftText { - color: #000; + color: #fff; } } &.right { @@ -559,11 +560,12 @@ export default defineComponent({ left: calc(50% + var(--selectPadding)); } > .rightText { - color: #000; + color: #fff; } } > .bg { border: 0.7px solid #e7ebff; + border-radius: 0.5rem; box-shadow: 0px 4.35px 26.08px 0px #b5c2fb1a; background: #ffffff; width: calc(50% - var(--selectPadding) * 2); @@ -571,6 +573,12 @@ export default defineComponent({ position: absolute; transition: all 0.3s; } + &.left, + &.right { + .bg { + background-color: #000; + } + } > .leftText, > .rightText { cursor: pointer; @@ -634,7 +642,7 @@ export default defineComponent({ border-radius: 1.3rem; margin: 0; margin-bottom: 2.8rem; - padding: 2rem; + padding: 2rem; padding-bottom: 1.3rem; } .product_signUp_box { @@ -727,7 +735,7 @@ export default defineComponent({ } @media (max-width: 767px) { font-size: 1.2rem; - margin-top: 1rem; + margin-top: 1rem; // margin-left: 0.7rem; // margin-bottom: 1rem; } @@ -759,9 +767,9 @@ export default defineComponent({ border-top-right-radius: 1.1rem; border-bottom-left-radius: 0.4rem; font-size: 1rem; - line-height: 2.5rem; - font-weight: 500; - width: 9rem; + line-height: 2.5rem; + font-weight: 500; + width: 9rem; } } .product_detail { @@ -869,7 +877,7 @@ export default defineComponent({ padding-top: 2rem; justify-content: flex-end; margin-bottom: 0; - &.chinese{ + &.chinese { justify-content: space-evenly; } li { From ebd5ceac416adef809762d9a04c9edb9d95596d5 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 5 Jan 2026 15:48:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E6=95=99=E8=82=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E5=8F=AF=E5=88=87=E6=8D=A2=E5=AD=90?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E8=AE=A2=E9=98=85=E8=AE=A1=E5=88=92&Peding?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/SE/allUser/addAllUser.vue | 4 +- .../Administrator/SE/allUser/index.vue | 28 +++-- src/lang/cn.ts | 3 +- src/lang/en.ts | 102 ++++++++++-------- 4 files changed, 79 insertions(+), 58 deletions(-) diff --git a/src/component/Administrator/SE/allUser/addAllUser.vue b/src/component/Administrator/SE/allUser/addAllUser.vue index 91dce0ee..56ad4bfe 100644 --- a/src/component/Administrator/SE/allUser/addAllUser.vue +++ b/src/component/Administrator/SE/allUser/addAllUser.vue @@ -96,7 +96,7 @@ style="width: 250px" />
-
+
{{ $t('admin.Close') }}
diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue index d502f39a..bb064be9 100644 --- a/src/component/Administrator/SE/allUser/index.vue +++ b/src/component/Administrator/SE/allUser/index.vue @@ -85,17 +85,24 @@ v-for="plan in planFilterOptions" :key="plan.id" class="plan_item" - :class="{ + :class="{ active: subscriptionPlanId === plan.id, disabled: plan.status === 'PENDING' }" @click="plan.status !== 'PENDING' && selectPlanFilter(plan.id)" > - {{ plan.name }} - + + + {{ plan.name }} + + +
{ + res.forEach(plan => { + plan.startTime = formatTime(plan.currentPeriodStart, 'YYYY-MM-DD hh:mm:ss') + }) // 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个 const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId if (userSubscriptionPlanId && Array.isArray(res)) { @@ -451,6 +461,7 @@ export default defineComponent({ } else { planFilterOptions.value = res } + console.log(planFilterOptions.value) }) } // 监听组织ID，获取到值后再拉取订阅计划 @@ -459,7 +470,8 @@ export default defineComponent({ orgId => { if (orgId) { fetchSubscribePlanList() - const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId + const userSubscriptionPlanId = + store.state.UserHabit.userDetail.subscriptionPlanId if (userSubscriptionPlanId) { selectPlanFilter(userSubscriptionPlanId) } diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 1ac58d2d..d0db4f9d 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -1593,7 +1593,8 @@ export default { InputPlanName: '请输入计划名称', Cancel: '取消', SelectPlan: '选择计划', - AllPlan: '全部' + AllPlan: '全部', + PlanStart:'订阅计划生效时间:' }, Login: { Login: '登录', diff --git a/src/lang/en.ts b/src/lang/en.ts index 141f4d60..6109883d 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1192,9 +1192,10 @@ export default { createGroup: 'Create Group', slutionGroup: 'Slution Group', deleteLayer: 'Delete Layer', - cannotDeleteOnlyLayer: 'Cannot delete the last layer. At least one layer must remain.', + cannotDeleteOnlyLayer: + 'Cannot delete the last layer. At least one layer must remain.', fixedLayerCannotDelete: 'Fixed layer cannot be deleted', - backLayerCannotDelete: 'Background layer cannot be deleted', + backLayerCannotDelete: 'Background layer cannot be deleted', clearSelection: 'Clear Selection', AddPinnedLayer: 'Add a pinned layer', selectedLayers: 'The number of selected layers:', @@ -1216,7 +1217,7 @@ export default { color: 'Color', Print: 'Print', Elements: 'Elements', - PrintAndElementsGroup: 'Print and Elements Group', + PrintAndElementsGroup: 'Print and Elements Group', KeyboardShortcutsOperationGuide: 'Keyboard shortcuts & Operation guide', other: 'Other', touchDevice: 'Touch Device', @@ -1335,14 +1336,14 @@ export default { flipVertical: 'Vertical Flip', cropAndAdd: 'Crop and Add', cropImage: 'Crop Image', - noRepeat: 'no-repeat', - repeat: 'repeat', - repeatX: 'repeat-x', - repeatY: 'repeat-y', - repeatSetting: 'Repeat Setting', + noRepeat: 'no-repeat', + repeat: 'repeat', + repeatX: 'repeat-x', + repeatY: 'repeat-y', + repeatSetting: 'Repeat Setting', angle: 'Angle', scale: 'Scale', - offset: 'Offset', + offset: 'Offset', group: 'Group', //长毛笔 FurSettings: 'FurSettings', @@ -1506,41 +1507,47 @@ export default { DeleteTexture: 'Delete Texture', TextureSettings: 'Texture Settings', TextureSelector: 'Texture Selector', - // 混合模式 - CompositeNormal: 'Normal', - CompositeNormalTip: 'Normal: Default, new graphics cover original content', - CompositeDarken: 'Darken', - CompositeDarkenTip: 'Darken: Take the darkest color', - CompositeMultiply: 'Multiply', - CompositeMultiplyTip: 'Multiply: Darken the image', - CompositeColorBurn: 'Color Burn', - CompositeColorBurnTip: 'Color Burn: Increase contrast and darken the bottom color', - CompositeLighten: 'Lighten', - CompositeLightenTip: 'Lighten: Take the brightest color', - CompositeScreen: 'Screen', - CompositeScreenTip: 'Screen: Lighten the image', - CompositeColorDodge: 'Color Dodge', - CompositeColorDodgeTip: 'Color Dodge: Reduce contrast and lighten the bottom color', - CompositeLighter: 'Color Dodge (Add)', - CompositeLighterTip: 'Color Dodge (Add): Add the brightness of the overlapping parts', - CompositeOverlay: 'Overlay', - CompositeOverlayTip: 'Overlay: Highlight effect', - CompositeSoftLight: 'Soft Light', - CompositeSoftLightTip: 'Soft Light: Blend effect', - CompositeHardLight: 'Hard Light', - CompositeHardLightTip: 'Hard Light: Highlight effect', - CompositeDifference: 'Difference', - CompositeDifferenceTip: 'Difference: Take the color difference between the two images', - CompositeExclusion: 'Exclusion', - CompositeExclusionTip: 'Exclusion: Take the absolute value of the color difference between the two images', - CompositeHue: 'Hue', - CompositeHueTip: 'Hue: Preserve the original image color and change the hue of the new image', - CompositeSaturation: 'Saturation', - CompositeSaturationTip: 'Saturation: Preserve the original image hue and change the saturation of the new image', - CompositeColor: 'Color', - CompositeColorTip: 'Color: Preserve the original image saturation and change the color of the new image', - CompositeLuminosity: 'Luminosity', - CompositeLuminosityTip: 'Luminosity: Preserve the original image color and change the luminosity of the new image', + // 混合模式 + CompositeNormal: 'Normal', + CompositeNormalTip: 'Normal: Default, new graphics cover original content', + CompositeDarken: 'Darken', + CompositeDarkenTip: 'Darken: Take the darkest color', + CompositeMultiply: 'Multiply', + CompositeMultiplyTip: 'Multiply: Darken the image', + CompositeColorBurn: 'Color Burn', + CompositeColorBurnTip: 'Color Burn: Increase contrast and darken the bottom color', + CompositeLighten: 'Lighten', + CompositeLightenTip: 'Lighten: Take the brightest color', + CompositeScreen: 'Screen', + CompositeScreenTip: 'Screen: Lighten the image', + CompositeColorDodge: 'Color Dodge', + CompositeColorDodgeTip: 'Color Dodge: Reduce contrast and lighten the bottom color', + CompositeLighter: 'Color Dodge (Add)', + CompositeLighterTip: 'Color Dodge (Add): Add the brightness of the overlapping parts', + CompositeOverlay: 'Overlay', + CompositeOverlayTip: 'Overlay: Highlight effect', + CompositeSoftLight: 'Soft Light', + CompositeSoftLightTip: 'Soft Light: Blend effect', + CompositeHardLight: 'Hard Light', + CompositeHardLightTip: 'Hard Light: Highlight effect', + CompositeDifference: 'Difference', + CompositeDifferenceTip: + 'Difference: Take the color difference between the two images', + CompositeExclusion: 'Exclusion', + CompositeExclusionTip: + 'Exclusion: Take the absolute value of the color difference between the two images', + CompositeHue: 'Hue', + CompositeHueTip: + 'Hue: Preserve the original image color and change the hue of the new image', + CompositeSaturation: 'Saturation', + CompositeSaturationTip: + 'Saturation: Preserve the original image hue and change the saturation of the new image', + CompositeColor: 'Color', + CompositeColorTip: + 'Color: Preserve the original image saturation and change the color of the new image', + CompositeLuminosity: 'Luminosity', + CompositeLuminosityTip: + 'Luminosity: Preserve the original image color and change the luminosity of the new image' }, speedList: { High: 'High', @@ -1624,7 +1631,7 @@ export default { ChatRobot: 'ChatRobot', Yes: 'Yes', No: 'No', - SubscribePlan:'Subscribe Plan', + SubscribePlan: 'Subscribe Plan', SwitchPlanSuccess: 'Switch subscription plan successfully', SwitchPlanFailed: 'Failed to switch subscription plan', NoPlanSelected: 'Please select a subscription plan first', @@ -1637,7 +1644,8 @@ export default { InputPlanName: 'Please enter plan name', Cancel: 'Cancel', SelectPlan: 'Select Plan', - AllPlan:'All' + AllPlan: 'All', + PlanStart:'This plan will be actived from', }, Login: { Login: 'Login', @@ -1656,7 +1664,7 @@ export default { AgreePolicies: 'Please agree to all terms, privacy policy, and fees.', PasswordConditions: 'You must satisfy ALL password conditions to register.', LoginWithGoogle: 'Sign in with Google', - LoginWithWechat: 'Sign in with Wechat', + LoginWithWechat: 'Sign in with Wechat' }, LoginPersonal: { Email: 'Email', From fa3063b3b58a0869fc19cffbc18009cec774ae29 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 5 Jan 2026 16:03:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bugfix:=20Transaction=20Record=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2total=20amount=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/Transaction/TransactionTable.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index d8b09c93..fcc4b418 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -471,9 +471,9 @@ export default defineComponent({ filter.dataList = rv.content; filterData.total = rv.total; filter.tableLoading = false; - rv.content.forEach((item: any) => { - filterData.totalPayer += Number(item.payerTotal) - }) + filterData.totalPayer = rv.content.reduce((sum: number, item: any) => { + return sum + Number(item.payerTotal); + }, 0); // this.workspaceItem.position = this.singleTypeList[0].label } From c6b1efe71918411b1780eb2fa13cc85463f62a39 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 5 Jan 2026 16:07:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bugfix:=20=E5=8F=AA=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E6=88=90=E5=8A=9F=E7=9A=84=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=AE=B0=E5=BD=95=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Administrator/Transaction/TransactionTable.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index fcc4b418..8955fca3 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -471,8 +471,9 @@ export default defineComponent({ filter.dataList = rv.content; filterData.total = rv.total; filter.tableLoading = false; - filterData.totalPayer = rv.content.reduce((sum: number, item: any) => { - return sum + Number(item.payerTotal); + filterData.totalPayer = rv.content.reduce((total: number, item: any) => { + const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0; + return total + (isNaN(value) ? 0 : value); }, 0); // this.workspaceItem.position = this.singleTypeList[0].label From 6fa5ade5b10ee1cdaeb84412ddfb2733971d0c9a Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Mon, 5 Jan 2026 16:42:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?bugfix:=20=E5=9B=BD=E5=AE=B6=E5=92=8C?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Administrator/Transaction/TransactionTable.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 8955fca3..3d2c54e7 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -31,7 +31,7 @@ :filter-option="filterOption" placeholder="Select Item..." max-tag-count="responsive" - :options="countryList" + :options="allCountry" >
@@ -192,9 +192,6 @@ export default defineComponent({ cityList: computed(()=>{ return store.state.adminPage.city }), - countryList: computed(()=>{ - return store.state.adminPage.country - }), isAwayOrUnfold:false, }); let filterData: any = reactive({ From 38c0b88abf8d4574f3a74185b602356f68f67ea2 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Tue, 6 Jan 2026 17:33:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E6=96=87=E6=A1=88=E4=BF=AE?= =?UTF-8?q?=E6=94=B9&=E8=AE=A2=E9=98=85=E8=AE=A1=E5=88=92=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=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[