调整

src/components/personalRecharge/index.vue

@@ -3,13 +3,6 @@
     <div class="resume-header" v-if="showTitle">
       <div class="resume-title">
         余额充值
-        <span
-          class="ml-2 text-decoration-underline cursor-pointer"
-          style="font-size: 13px;color: #666;"
-          @click="router.push('/recruit/personal/myWallet/myBalance')"
-        >
-          (充值记录)
-        </span>
       </div>
     </div>
     <div class="d-flex align-center mb-10 mt-5">
@@ -45,7 +38,6 @@
             <span v-if="!item.custom">￥{{ FenYuanTransform(item.payPrice) }}</span>
             <span v-else>{{ item.tip }}</span>
           </div>
-          <v-btn v-if="!item.custom" class="mt-5" size="small" color="error" variant="outlined" rounded >立即充值</v-btn>
           <div class="vip">
             <svg-icon v-if="current === (index+1)" name="diamond-active" size="50"></svg-icon>
             <svg-icon v-else name="diamond" size="50"></svg-icon>
@@ -77,7 +69,6 @@ defineProps({
 })
 
 import { useRoute } from 'vue-router'; const route = useRoute()
-import { useRouter } from 'vue-router'; const router = useRouter()
 const fullShow = ref(route.path === '/personalRecharge' ? true : false)
 
 const current = ref(0)

src/layout/company/navBar.vue

@@ -17,7 +17,7 @@
             <v-img @click="enterpriseClick(2)" rounded width="40" height="40" :src="baseInfo?.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" ></v-img>
             <span @click="enterpriseClick(1)" class="ml-3 commonHover">{{ baseInfo?.enterpriseAnotherName || baseInfo?.enterpriseName || '--' }}</span>
           </div>
-          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="handleLogout">我要求职</div>
+          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="router.push('/recruitHome')">我要求职</div>
           <div class="cursor-pointer border-right px-3 commonHover" @click="router.push('/recruit/enterprise/hirePosition')">全员猎聘</div>
           <div class="d-flex align-center px-3 border-right">
             <div>{{ $t('enterprise.account.remainingPoints') }}：{{ enterpriseUserAccount?.balance || 0 }}点</div>
@@ -129,9 +129,9 @@ const handleLogout = async () => {
 const enterpriseList = ref([])
 
 const menuList = ref([
-  { 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('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 },
   // { title: t('enterprise.registeringNewEnterprise'), icon: 'mdi-home-plus-outline', change: () => handleRegisteringNewEnterprise },
   // { title: t('setting.switchToJobSeeker'), icon: 'mdi-swap-horizontal', change: handleLogout },

src/layout/personal/navBar.vue

@@ -24,7 +24,7 @@
                 <defineListPage v-bind="$attrs" :title="val.title" :list="val.children" @emitClick="handleClick" :closeOnContentClick="true"></defineListPage>
               </template>
               <template v-else>
-                <span class="cursor-pointer menuList-first-title" @click="handleClick(val, true)">{{ val.title }}</span>
+                <span class="cursor-pointer menuList-first-title" :class="{'active-route' : route.path === val.path}" @click="handleClick(val, true)">{{ val.title }}</span>
               </template>
             </div>
           </div>
@@ -39,9 +39,9 @@
           <div class="d-flex align-center color-333" v-if="getToken()">
             <span class="cursor-pointer mr-5 commonHover" @click="handleSwitch">我要招聘</span>
             <span class="cursor-pointer commonHover" :class="{'active-route': routeActive === 6}" @click="router.push({ path: paths[6] })">
-              {{t('enterprise.account.accountBalances')}}：{{ userAccount?.balance && userAccount?.balance > 0 ? (userAccount?.balance / 100.0).toFixed(2) : 0 }}
+              现金：{{ userAccount?.balance && userAccount?.balance > 0 ? (userAccount?.balance / 100.0).toFixed(2) : 0 }}
             </span>
-            <span class="mr-3 ml-3 cursor-pointer commonHover" :class="{'active-route': routeActive === 7}" @click="router.push({ path: paths[7] })">{{t('resume.goldCoins')}}：{{ userAccount?.point || 0 }}</span>
+            <span class="mr-3 ml-3 cursor-pointer commonHover" :class="{'active-route': routeActive === 7}" @click="router.push({ path: paths[7] })">积分：{{ userAccount?.point || 0 }}</span>
 
             <v-menu open-on-hover>
               <template v-slot:activator="{ props }">
@@ -170,10 +170,10 @@ const navList = [
   },
   { title: '甄选', path: '/mall' },
   { title: '猎寻', path: '/headhunting' },
-  { title: '数据' },
   { title: '火苗儿' },
   { title: '联合会' },
-  { title: '了解门墩儿' },
+  { title: '数据' },
+  { title: '了解门墩儿' }
 ]
 
 const handleClick = (e, status) => {

src/router/modules/common.js

@@ -18,18 +18,6 @@ const common = [
       }
     ]
   },
-  {
-    path: '/mall',
-    children: [
-      {
-        path: '/mall',
-        component: () => import('@/views/mall/index'),
-        meta: {
-          title: '臻选商城'
-        }
-      }
-    ]
-  },
   {
     path: '/shareJob',
     name: 'shareJob',

src/router/modules/recruit.js

@@ -31,6 +31,20 @@ const recruit = [
       }
     ]
   },
+  {
+    path: '/mall',
+    component: Layout,
+    children: [
+      {
+        path: '/mall',
+        component: () => import('@/views/mall/index'),
+        name: 'mall',
+        meta: {
+          title: '甄选商城'
+        }
+      }
+    ]
+  },
   {
     path: '/recruit/personal/position',
     component: Layout,

src/views/integral/pointsManagement/components/integralShow.vue

@@ -5,7 +5,10 @@
       <div v-for="(val, i) in list" :key="i" :style="{'margin-left': val.showRules ? '0' : '200px'}">
         <div>
           <span class="ml-10 item-title">{{ val.title }}</span>
-          <span v-if="val.showRules" class="ml-2 rules cursor-pointer" @click="integralRulesClick">{{ $t('points.integralRules') }}</span>
+          <span v-if="val.showRules" class="ml-5 rules cursor-pointer" @click="integralRulesClick">
+            <v-icon>mdi-help-circle-outline</v-icon>
+            {{ $t('points.integralRules') }}
+          </span>
         </div>
         <div>
           <span v-if="val.value === 'balance'" class="ml-10 item-value">{{ accountData[val.value] && accountData[val.value] > 0 ? (accountData[val.value]) : 0 }}</span>

src/views/recruit/personal/taskCenter/components/daily.vue

@@ -9,13 +9,7 @@
           <svg-icon class="mx-1" name="integral" size="24"></svg-icon>
           <span style="color: #10897bad;">{{ item.奖励积分数 }}</span>
         </div>
-        <v-btn
-          class="half-button"
-          :disabled="item.状态"
-          :color="item.状态 ? '' : 'primary'"
-        >
-          {{ item.状态 ? '已完成' : '未完成' }}
-        </v-btn>
+        <v-chip label :color="item.状态 ? 'success' : 'error'">{{ item.状态 ? '已完成' : '未完成' }}</v-chip>
       </div>
     </div>
   </div>

src/views/recruit/personal/taskCenter/components/signIn.vue

@@ -2,11 +2,7 @@
 <template>
   <div>
     <integralShow ref="integralRef"></integralShow>
-    <div class="text-end signInRecord mt-3" @click="handleRecord">
-      {{ $t('taskCenter.signInRecord') }}
-      <v-icon>mdi-chevron-right</v-icon>
-    </div>
-    <div class="d-flex justify-center mt-3">
+    <div class="d-flex justify-center mt-10">
       <div v-for="(item, index) in configList" :key="'signInKey' + index" >
         <div
           class="borderRadius-5 mx-5 py-3 px-4"
@@ -90,11 +86,6 @@ const handleSignIn = async () => {
     await userStore.getUserAccountInfo()
   }, 1000)
 }
-
-const handleRecord = () => {
-  window.open('/recruit/personal/myWallet')
-}
-
 </script>
 
 <style lang="scss" scoped>

src/views/recruit/personal/taskCenter/components/suggest.vue

@@ -9,13 +9,7 @@
           <svg-icon class="mx-1" name="integral" size="24"></svg-icon>
           <span style="color: #10897bad;">{{ item.奖励积分数 }}</span>
         </div>
-        <v-btn
-          class="half-button"
-          :disabled="item.状态"
-          :color="item.状态 ? '' : 'primary'"
-        >
-          {{ item.状态 ? '已完成' : '未完成' }}
-        </v-btn>
+        <v-chip label :color="item.状态 ? 'success' : 'error'">{{ item.状态 ? '已完成' : '未完成' }}</v-chip>
       </div>
     </div>
   </div>