Merge branch 'dev-shuju' into dev-jichu

src/views/main-navbar.vue

@@ -8,10 +8,10 @@
       <div class="aui-navbar__header">
         <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
           <a class="aui-navbar__brand-lg" href="javascript:;">{{
-            userType === 'work' ? customerName : $t('brand.lg')
+            customerName
           }}</a>
           <a class="aui-navbar__brand-mini" href="javascript:;">{{
-            $t('brand.mini')
+            customerName.slice(0, 2)
           }}</a>
         </h1>
       </div>

src/views/main-shuju/main-navbar.vue

@@ -10,7 +10,7 @@
             userType === 'work' ? customerName : $t('brand.lg')
           }}</a>
           <a class="navbar__brand-mini" href="javascript:;">{{
-            $t('brand.mini')
+            customerName.slice(0, 2)
           }}</a>
         </h1>
       </div>
@@ -94,11 +94,7 @@
           <el-menu-item index="4" class="navbar__avatar">
             <el-dropdown placement="bottom" :show-timeout="0">
               <span class="el-dropdown-link">
-                <img
+                <img src="~@/assets/img/staff-default-avatar.png" />
-                  v-if="$store.state.user.gender === '2'"
-                  src="~@/assets/img/staff-default-avatar-girl.png"
-                />
-                <img v-else src="~@/assets/img/staff-default-avatar-boy.png" />
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>

src/views/modules/visual/basicinfo/people.vue

@@ -353,6 +353,7 @@ export default {
     },
     userId() {
       this.getApiData();
+      window.scrollTo(0, 0);
     },
   },