Merge branch 'dev-majunjie' into dev

components/header.vue

@@ -222,35 +222,11 @@
         </div>
 
         <template v-if="myInfo.nickname">
-          <!-- <el-dropdown class="nav-dropdown" style="padding-right:40px;">
-            <el-button type="text" @click="cnzz('导航栏目','工作台','')"  class="dashboard-title">
-              <a class="workstation" :href="baseUrl + '/wo/work_todo'">
-                工作台
-              </a>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <a class="workstation"  @click="cnzz('导航栏目','待办任务','')" :href="baseUrl + '/wo/work_todo'">
-                  <i class="el-icon-edit"></i>待办任务
-                </a>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <a class="workstation" @click="cnzz('导航栏目','整包项目','')" :href="baseUrl + '/wo/work_platform'">
-                  <i class="el-icon-date"></i>整包项目
-                </a>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <a class="workstation" @click="cnzz('导航栏目','按月雇佣','')" :href="baseUrl + '/wo/work_hire'">
-                  <i class="el-icon-news"></i>按月雇佣
-                </a>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <a class="workstation" :href="baseUrl + '/wo/work_cloud'">
-                  <i class="el-icon-service"></i>我的远程
-                </a>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
+          <el-button type="text" style="padding-right: 30px" @click="cnzz('导航栏目','工作台','')"  class="dashboard-title">
+            <a class="workstation" :href="baseUrl + '/wo/work_todo'">
+              工作台
+            </a>
+          </el-button>
 
 
           <el-dropdown class="nav-dropdown" style="">
@@ -888,7 +864,7 @@ export default {
   display: flex;
   justify-content: center;
   width: 100%;
-  height: 80px;
+  height: 83px;
   background: white;
   z-index: 10;
   border-bottom: 1px solid #eee;
@@ -1154,12 +1130,14 @@ span.other-icon {
   width: var(--imgWidth);
   height: var(--imgWidth);
   border-radius: 20px;
+  width: 30px !important;
+  max-width: 30px !important;
 }
 
 .header-vip-icon {
   position: absolute;
   top: 15px;
-  left: 15px;
+  left: 22px;
   width: 16px;
   height: 16px;
 }