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

src/assets/svg/huangguan1.svg

@@ -0,0 +1 @@
+<svg t="1729321662245" class="icon" viewBox="0 0 2048 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1365" width="200" height="200"><path d="M128 0h1792c76.8 0 128 51.2 128 128v768c0 76.8-51.2 128-128 128H128C51.2 1024 0 972.8 0 896V128C0 64 51.2 0 128 0z" fill="#FF6600" p-id="1366"></path><path d="M473.6 832c-25.6 0-51.2-25.6-64-76.8L192 179.2h166.4L512 576l243.2-396.8h179.2l-371.2 576c-38.4 64-64 76.8-89.6 76.8z m409.6-12.8L972.8 192h153.6l-89.6 627.2zM1856 422.4c-12.8 64-38.4 128-102.4 179.2-51.2 38.4-115.2 64-179.2 64h-268.8L1280 819.2h-153.6l51.2-320h435.2c25.6 0 38.4-12.8 51.2-25.6 12.8-12.8 25.6-38.4 25.6-51.2 0-25.6 0-38.4-12.8-51.2-12.8-12.8-38.4-25.6-51.2-25.6h-435.2l128-166.4h320c64 0 128 25.6 166.4 64 51.2 64 64 128 51.2 179.2z" fill="#FFFFFF" p-id="1367"></path></svg>

src/layout/personal/navBar.vue

@@ -50,11 +50,16 @@
 
             <v-menu open-on-hover>
               <template v-slot:activator="{ props }">
-                <div class="d-flex ml-3 align-center cursor-pointer" :class="{'active-route': routeActive === 5}" v-bind="props" @click="handleToPersonalCenter">
-                  <v-avatar>
-                    <v-img alt="John" :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)"></v-img>
-                  </v-avatar>
-                  <div class="ml-3 commonHover">
+                <div class="d-flex ml-3 align-center cursor-pointer" :class="{'active-route': routeActive === 5, 'vipBox': vip}" v-bind="props" @click="handleToPersonalCenter">
+                  <div style="position: relative;">
+                    <v-avatar class="avatar">
+                      <v-img alt="John" :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" ></v-img>
+                    </v-avatar>
+                    <div v-if="vip" style="position: absolute; left: -9px; bottom: -3px;">
+                      <svg-icon name="huangguan1" size="25"></svg-icon>
+                    </div>
+                  </div>
+                  <div class="ml-3 commonHover userName">
                     {{ baseInfo?.name || userInfo.phone }}
                     <v-icon :color="routeActive === 5 ? '#008979' : '#333'" size="30">mdi-menu-down</v-icon>
                   </div>
@@ -195,6 +200,10 @@ const routeActive = computed(() => {
   return index
 })
 
+const vip = computed(() => {
+  return new Date().getTime() < userStore.userInfo?.vipExpireDate
+})
+
 const show = ref(false)
 const radios = ref(null)
 const enterpriseList = ref([])

src/styles/personal/navBar.scss

@@ -7,6 +7,15 @@
   }
 }
 
+.vipBox {
+  .avatar {
+    border: 1px solid gold;
+  }
+  .userName {
+    color: #a18a0f;
+  }
+}
+
 .user-nav .nav-resume-tools {
   display: inline-block;
   vertical-align: middle;

src/views/login/components/passwordPage.vue

@@ -78,7 +78,8 @@ const loginData = reactive({
 
 // 设置默认账号密码便于开发快捷登录
 if (window.location.hostname === 'localhost' || window.location.hostname === '192.168.3.152') {
-  loginData.phone = props.validEmail ? '1687284007@qq.com' : '13229740092'
+  loginData.phone = props.validEmail ? 
+    '1687284007@qq.com' : '13229740092'
   loginData.password = 'Citu123456'
 }