Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/components/AreaSelect/index.vue

@@ -63,7 +63,6 @@ let idChecked = ref([])
 let currentSelect = ref([])
 // 回显
 if (props.currentData.length) currentSelect.value = props.currentData
-console.log(props.select, 'props')
 if (props.select.length) idChecked.value = props.select.map(e => e + '') // 数据中的id是字符串
 
 getDict('areaTreeData', null, 'areaTreeData').then(({ data }) => {

src/layout/company/navBar.vue

@@ -21,10 +21,10 @@
           <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/myAccount' })">
+            <!-- <div class="cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })">
               {{ $t('enterprise.account.accountBalances') }}：{{ enterpriseUserAccount?.balance && enterpriseUserAccount?.balance > 0 ? (enterpriseUserAccount?.balance / 100.0).toFixed(2) : 0 }}元
-            </div>
-            <div class="ml-5 cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })">
+            </div> -->
+            <div class="cursor-pointer" @click="router.push({ path: '/recruit/enterprise/memberCenter/myAccount' })">
               {{ $t('enterprise.account.remainingPoints') }}：{{ enterpriseUserAccount?.point || 0 }}点
             </div>
           </div>

src/layout/personal/navBar.vue

@@ -35,7 +35,7 @@
           <div class="d-flex align-center" v-if="getToken()">
             <span class="cursor-pointer mr-5" @click="changeLoginType">我要招聘</span>
             <span class="cursor-pointer" :class="{'routeActive': routeActive === 4}" @click="router.push({ path: paths[4] })">
-              {{t('resume.accountWithdrawal')}}：{{ userAccount?.balance && userAccount?.balance > 0 ? (userAccount?.balance / 100.0).toFixed(2) : 0 }}
+              {{t('enterprise.account.accountBalances')}}：{{ userAccount?.balance && userAccount?.balance > 0 ? (userAccount?.balance / 100.0).toFixed(2) : 0 }}
             </span>
             <span class="mr-3 ml-3 cursor-pointer" :class="{'routeActive': routeActive === 4}" @click="router.push({ path: paths[4] })">{{t('resume.goldCoins')}}：{{ userAccount?.point || 0 }}</span>
 

src/store/user.js

@@ -153,23 +153,22 @@ export const useUserStore = defineStore('user',
         const data = await getEnterpriseUserAccount()
         if (!data) return
         this.enterpriseUserAccount = data
-        this.getUserAccountBalance(false)
-        // localStorage.setItem('enterpriseUserAccount', JSON.stringify(data))
+        // this.getUserAccountBalance()
+        localStorage.setItem('enterpriseUserAccount', JSON.stringify(data))
       },
       // 获取用户账户信息
       async getUserAccountInfo () {
         const data = await getUserAccount()
         if (!data) return
         this.userAccount = data
-        this.getUserAccountBalance(true)
+        this.getUserAccountBalance()
         // localStorage.setItem('userAccount', JSON.stringify(data))
       },
       // 获取账户余额
-      async getUserAccountBalance (type) {
+      async getUserAccountBalance () {
         const data = await getAccountBalance()
-        const obj = !type ? Object.assign(this.enterpriseUserAccount, data) : Object.assign(this.userAccount, data)
-        const key = !type ? 'enterpriseUserAccount' : 'userAccount'
-        localStorage.setItem(key, JSON.stringify(obj))
+        const obj = Object.assign(this.userAccount, data)
+        localStorage.setItem('userAccount', JSON.stringify(obj))
       }
     }
   },

src/views/recruit/personal/PersonalCenter/dynamic/right.vue

@@ -83,7 +83,7 @@ const router = useRouter()
 const userStore = useUserStore()
 
 const accountList = [
-  { icon: 'mdi-currency-cny', title: t('resume.accountWithdrawal'), desc: t('unit.rmb'), key: 'balance' },
+  { icon: 'mdi-currency-cny', title: t('enterprise.account.accountBalances'), desc: t('unit.rmb'), key: 'balance' },
   { icon: 'mdi-octagram-outline', title: t('resume.goldCoins'), desc: t('unit.ge'), key: 'point' }
 ]
 let userAccount = ref(JSON.parse(localStorage.getItem('userAccount')) || {}) // 账户信息