Xiao_123 il y a 9 mois
Parent
commit
fcaa270b40

+ 4 - 4
src/layout/company/navBar.vue

@@ -21,8 +21,8 @@
           <div class="ml-3 cursor-pointer" @click="handleLogout">我要求职</div>
           <div class="line"></div>
           <div class="d-flex align-center ml-6">
-            <div class="cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myPoints' })">{{ $t('enterprise.account.accountBalances') }}:{{ enterpriseUserAccount?.balance || 0 }}元</div>
-            <div class="ml-5 cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myPoints' })">{{ $t('enterprise.account.remainingPoints') }}:{{ enterpriseUserAccount?.point || 0 }}点</div>
+            <div class="cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })">{{ $t('enterprise.account.accountBalances') }}:{{ enterpriseUserAccount?.balance || 0 }}元</div>
+            <div class="ml-5 cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })">{{ $t('enterprise.account.remainingPoints') }}:{{ enterpriseUserAccount?.point || 0 }}点</div>
           </div>
           <div class="line mr-5"></div>
           <svg-icon @click="handleToVip" name="vip" size="30" class="cursor-pointer"></svg-icon>
@@ -119,7 +119,7 @@ onMounted(() => {
 })
 
 const handleToVip = () => {
-  router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })
+  router.push({ path: '/recruit/enterprise/memberCenter/myMembers' })
 }
 
 // const handleLogoClick = () => { router.push({ path: '/recruit/enterprise'}) }
@@ -138,7 +138,7 @@ const handleLogout = async () => {
 const enterpriseList = ref([])
 
 const menuList = ref([
-  { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/recruit/enterprise/memberCenter/myPoints' }) },
+  { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/recruit/enterprise/memberCenter/myAccount' }) },
   { title: t('vipPackage.purchasePackage'), icon: 'mdi-gift-outline', change: () => window.open('/recruit/enterprise/purchasePackage') },
   { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/recruit/enterprise/informationSettings' }) },
   { title: t('setting.switchToOtherCompany'), icon: 'mdi-home-switch', hidden: enterpriseList.value?.length < 2, change: () => handleSwitchToAnotherEnterprise },

+ 5 - 5
src/router/modules/components/recruit/enterprise.js

@@ -299,7 +299,7 @@ const enterprise = [
   {
     path: '/recruit/enterprise/memberCenter',
     component: Layout,
-    redirect: '/recruit/enterprise/memberCenter/myAccount',
+    redirect: '/recruit/enterprise/memberCenter/myMembers',
     name: 'enterpriseMemberCenter',
     meta: {
       title: '会员中心',
@@ -309,20 +309,20 @@ const enterprise = [
     },
     children: [
       {
-        path: '/recruit/enterprise/memberCenter/myAccount',
+        path: '/recruit/enterprise/memberCenter/myMembers',
         meta: {
           title: '我的会员',
           enName: 'My Members'
         },
-        component: () => import('@/views/recruit/enterprise/memberCenter/myAccount/index.vue')
+        component: () => import('@/views/recruit/enterprise/memberCenter/myMembers/index.vue')
       },
       {
-        path: '/recruit/enterprise/memberCenter/myPoints',
+        path: '/recruit/enterprise/memberCenter/myAccount',
         meta: {
           title: '我的账户',
           enName: 'Account '
         },
-        component: () => import('@/views/recruit/enterprise/memberCenter/myPoints/index.vue')
+        component: () => import('@/views/recruit/enterprise/memberCenter/myAccount/index.vue')
       }
     ]
   },

+ 1 - 1
src/views/mall/index.vue

@@ -43,7 +43,7 @@ const loginType = localStorage.getItem('loginType')
 
 const toPointsDetails = () => {
   router.push({ 
-    path: loginType === 'personal' ? '/recruit/personal/myWallet' : '/recruit/enterprise/memberCenter/myPoints'
+    path: loginType === 'personal' ? '/recruit/personal/myWallet' : '/recruit/enterprise/memberCenter/myAccount'
   })
 }
 

+ 12 - 15
src/views/recruit/enterprise/memberCenter/myAccount/index.vue

@@ -1,23 +1,20 @@
-<!-- 购买套餐 -->
 <template>
-  <v-card class="card-box pa-3">
-    <v-tabs v-model="tab" align-tabs="center" color="primary" bg-color="#f7f8fa">
-      <v-tab :value="0">套餐购买</v-tab>
-      <v-tab :value="1">余额充值</v-tab>
-    </v-tabs>
-    <Package v-if="tab === 0"></Package>
-    <PointsAndBalance v-else></PointsAndBalance>
-  </v-card>
+  <IntegralPage :type="1"></IntegralPage>
 </template>
 
 <script setup>
-defineOptions({name: 'enterprise-memberCenter-myAccount'})
-import { ref } from 'vue'
-import Package from './components/package.vue'
-import PointsAndBalance from './components/pointsAndBalance.vue'
+defineOptions({ name: 'myWallet'})
+import IntegralPage from '@/views/integral/pointsManagement'
+import { useUserStore } from '@/store/user'
+
+const store = useUserStore()
+const updateAccountInfo = async () => {
+  await store.getEnterpriseUserAccountInfo()
+}
+updateAccountInfo()
 
-const tab = ref(0)
 </script>
 
-<style lang="scss" scoped>
+<style scoped lang="scss">
+
 </style>

+ 0 - 0
src/views/recruit/enterprise/memberCenter/myAccount/components/package.vue → src/views/recruit/enterprise/memberCenter/myMembers/components/package.vue


+ 0 - 0
src/views/recruit/enterprise/memberCenter/myAccount/components/pointsAndBalance.vue → src/views/recruit/enterprise/memberCenter/myMembers/components/pointsAndBalance.vue


+ 0 - 0
src/views/recruit/enterprise/memberCenter/myAccount/components/public.vue → src/views/recruit/enterprise/memberCenter/myMembers/components/public.vue


+ 23 - 0
src/views/recruit/enterprise/memberCenter/myMembers/index.vue

@@ -0,0 +1,23 @@
+<!-- 购买套餐 -->
+<template>
+  <v-card class="card-box pa-3">
+    <v-tabs v-model="tab" align-tabs="center" color="primary" bg-color="#f7f8fa">
+      <v-tab :value="0">套餐购买</v-tab>
+      <v-tab :value="1">余额充值</v-tab>
+    </v-tabs>
+    <Package v-if="tab === 0"></Package>
+    <PointsAndBalance v-else></PointsAndBalance>
+  </v-card>
+</template>
+
+<script setup>
+defineOptions({name: 'enterprise-memberCenter-myAccount'})
+import { ref } from 'vue'
+import Package from './components/package.vue'
+import PointsAndBalance from './components/pointsAndBalance.vue'
+
+const tab = ref(0)
+</script>
+
+<style lang="scss" scoped>
+</style>

+ 0 - 20
src/views/recruit/enterprise/memberCenter/myPoints/index.vue

@@ -1,20 +0,0 @@
-<template>
-  <IntegralPage :type="1"></IntegralPage>
-</template>
-
-<script setup>
-defineOptions({ name: 'myWallet'})
-import IntegralPage from '@/views/integral/pointsManagement'
-import { useUserStore } from '@/store/user'
-
-const store = useUserStore()
-const updateAccountInfo = async () => {
-  await store.getEnterpriseUserAccountInfo()
-}
-updateAccountInfo()
-
-</script>
-
-<style scoped lang="scss">
-
-</style>