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

src/layout/personal/navBar.vue

@@ -40,8 +40,6 @@
             <a target="_blank" href="/mall/purchasePackage" class="cursor-pointer mr-5" style="color: #FB8C00;">{{ $t('vipPackage.purchasePackage') }}</a>
             <span class="cursor-pointer" @click="router.push({ path: '/recruit/personal/TaskCenter' })">{{ $t('sys.signIn') }}</span>
             <span class="cursor-pointer mx-5">{{ $t('sys.news') }}</span>
-            <span>账户余额：{{ userAccount?.balance || 0 }}元</span>
-            <span class="ml-5">剩余积分：{{ userAccount?.point || 0 }}点</span>
             <v-menu open-on-hover>
               <template v-slot:activator="{ props }">
                 <div class="d-flex ml-5 pl-2 align-center cursor-pointer" v-bind="props" @click="handleToPersonalCenter">
@@ -199,11 +197,9 @@ const items = ref([
 ])
 
 let baseInfo = ref(JSON.parse(localStorage.getItem('baseInfo')) || {}) // 人才信息
-let userAccount = ref(JSON.parse(localStorage.getItem('userAccount')) || {}) // 账户信息
 
 userStore.$subscribe((mutation, state) => {
   baseInfo.value = state.baseInfo
-  userAccount.value = state.userAccount
 })
 
 const handleLogin = () => {

src/styles/index.css

@@ -69,6 +69,10 @@
   color: #fe574a;
 }
 
+.color-primary {
+  color: #00897B;
+}
+
 .font-size-12 {
   font-size: 12px;
 }

src/styles/index.min.css

@@ -1 +1 @@
-:root{--zIndex-dialog:999;--default-bgc:#f2f4f7;--v-primary-base:#00897B;--v-error-base:#fe574a;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--color-222:#222;--color-333:#333;--color-666:#666;--color-777:#777;--color-999:#999;--color-ccc:#ccc;--color-f3:#f3f3f3;--color-f2f4f742:#f2f4f742;--color-f8:#f8f8f8;--color-f2f4f7:#f2f4f7;--color-d5e6e8:#d5e6e8;--zIndex-breadcrumbs:999}.color-222{color:#222}.color-333{color:#333}.color-666{color:#666}.color-777{color:#777}.color-999{color:#999}.color-ccc{color:#ccc}.color-f3f3f3{color:#f3f3f3}.color-f2f4f742{color:#f2f4f742}.color-f8f8f8{color:#f8f8f8}.color-f2f4f7{color:#f2f4f7}.color-d5e6e8{color:#d5e6e8}.color-error{color:#fe574a}.font-size-12{font-size:12px}.font-size-13{font-size:13px}.font-size-14{font-size:14px}.font-size-15{font-size:15px}.font-size-16{font-size:16px}.font-size-17{font-size:17px}.font-size-18{font-size:18px}.font-size-19{font-size:19px}.font-size-20{font-size:20px}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto}.defaultLink{color:#008978;cursor:pointer}.default-active{color:var(--v-primary-base) !important}.border-bottom-dashed{border-bottom:1px dashed var(--color-ccc)}.white-bgc{background-color:#fff}.ellipsis{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.septal-line{display:inline-block;width:1px;height:10px;vertical-align:middle;background-color:#e0e0e0;margin:0 10px}.resume-box{border-radius:5px;padding:20px 30px;background-color:#fff}.resume-header{display:flex;justify-content:space-between;align-items:center;height:36px}.resume-title{font-weight:700;font-size:18px;border-left:5px solid #00897B;padding-left:12px;line-height:17px}.resumeNoDataText{color:var(--color-666);font-size:14px}.card-box{width:100%;height:100%}
+:root{--zIndex-dialog:999;--default-bgc:#f2f4f7;--v-primary-base:#00897B;--v-error-base:#fe574a;--v-primary-lighten1:#26A69A;--v-primary-lighten2:#4DB6AC;--v-primary-lighten3:#80CBC4;--v-primary-lighten4:#B2DFDB;--color-222:#222;--color-333:#333;--color-666:#666;--color-777:#777;--color-999:#999;--color-ccc:#ccc;--color-f3:#f3f3f3;--color-f2f4f742:#f2f4f742;--color-f8:#f8f8f8;--color-f2f4f7:#f2f4f7;--color-d5e6e8:#d5e6e8;--zIndex-breadcrumbs:999}.color-222{color:#222}.color-333{color:#333}.color-666{color:#666}.color-777{color:#777}.color-999{color:#999}.color-ccc{color:#ccc}.color-f3f3f3{color:#f3f3f3}.color-f2f4f742{color:#f2f4f742}.color-f8f8f8{color:#f8f8f8}.color-f2f4f7{color:#f2f4f7}.color-d5e6e8{color:#d5e6e8}.color-error{color:#fe574a}.color-primary{color:#00897B}.font-size-12{font-size:12px}.font-size-13{font-size:13px}.font-size-14{font-size:14px}.font-size-15{font-size:15px}.font-size-16{font-size:16px}.font-size-17{font-size:17px}.font-size-18{font-size:18px}.font-size-19{font-size:19px}.font-size-20{font-size:20px}.buttons{height:36px;width:224px}.half-button{height:36px;width:88px}.default-width{width:1184px;min-width:1184px;max-width:1184px;margin:0 auto}.defaultLink{color:#008978;cursor:pointer}.default-active{color:var(--v-primary-base) !important}.border-bottom-dashed{border-bottom:1px dashed var(--color-ccc)}.white-bgc{background-color:#fff}.ellipsis{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.septal-line{display:inline-block;width:1px;height:10px;vertical-align:middle;background-color:#e0e0e0;margin:0 10px}.resume-box{border-radius:5px;padding:20px 30px;background-color:#fff}.resume-header{display:flex;justify-content:space-between;align-items:center;height:36px}.resume-title{font-weight:700;font-size:18px;border-left:5px solid #00897B;padding-left:12px;line-height:17px}.resumeNoDataText{color:var(--color-666);font-size:14px}.card-box{width:100%;height:100%}

src/styles/index.scss

@@ -32,7 +32,8 @@
 .color-f8f8f8 { color: #f8f8f8; }
 .color-f2f4f7 { color: #f2f4f7; }
 .color-d5e6e8 { color: #d5e6e8; }
-.color-error { color: #fe574a }
+.color-error { color: #fe574a; }
+.color-primary { color: #00897B; }
 
 .font-size-12 { font-size: 12px; }
 .font-size-13 { font-size: 13px; }

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

@@ -1,13 +1,21 @@
 <template>
   <div>
-    <div class="accountBox d-flex mb-3 radius white-bgc">
-      <div v-for="val in accountList" :key="val.title" class="accountItem">
-        <!-- <v-icon color="primary">{{ val.icon }}</v-icon> -->
-        <div class="ml-1">
-          <div class="title-text">{{ val.title }}</div>
-          <div class="tip-text">{{ (userAccount[val.key] || 0) + val.desc }}</div>
+    <div class="accountBox d-flex mb-3 radius white-bgc flex-column">
+      <div class="resume-header ml-3 mt-2">
+        <div class="resume-title">我的钱包</div>
+      </div>
+      <div class="d-flex" v-if="userAccount && Object.keys(userAccount).length">
+        <div v-for="val in accountList" :key="val.title" class="accountItem">
+          <v-icon color="primary">{{ val.icon }}</v-icon>
+          <div class="ml-1">
+            <div class="title-text">{{ (userAccount[val.key] || 0) + val.desc }}</div>
+            <div class="tip-text">{{ val.title }}</div>
+          </div>
         </div>
       </div>
+      <div v-else class="text-center font-size-14 mb-3">
+        请先登录
+      </div>
     </div>
 
     <div class="resume d-flex">
@@ -63,8 +71,8 @@ const { t } = useI18n()
 const userStore = useUserStore()
 
 const accountList = [
-  { icon: 'mdi-upload', title: '账户余额', desc: '元', key: 'balance' },
-  { icon: 'mdi-refresh', title: '剩余积分', desc: '点', key: 'point' }
+  { icon: 'mdi-currency-cny', title: '账户余额', desc: '元', key: 'balance' },
+  { icon: 'mdi-octagram-outline', title: '剩余积分', desc: '点', key: 'point' }
 ]
 let userAccount = ref(JSON.parse(localStorage.getItem('userAccount')) || {}) // 账户信息
 userStore.$subscribe((mutation, state) => {
@@ -169,22 +177,18 @@ const handleDownload = (k) => {
     align-items: center;
     justify-content: center;
     width: 50%;
-    height: 90px;
-    padding: 12px;
-    // margin-right: 12px;
-    // cursor: pointer;
-    // &:nth-child(2n) {
-    //   margin-right: 0;
-    // }
+    height: 80px;
+    padding: 0 12px;
     .tip-text {
-      font-size: 12px;
+      font-size: 13px;
       color: var(--color-666);
     }
     .title-text {
       font-weight: 600;
-      // &:hover {
-      //   color: var(--v-primary-base);
-      // }
+      font-size: 18px;
+      &:hover {
+        color: var(--v-primary-base);
+      }
     }
   }
 }