merge

src/components/Mine.vue

@@ -109,6 +109,7 @@ export default {
   },
   data () {
     return {
+      loading:false,
       unFinishedTaskList: [],
       finishedTaskList: [],
       appliedProjectList: [],
@@ -154,6 +155,7 @@ export default {
     loadData () {
       this.showLoading()
       Http.get(Apis.PAGE.MY_CROWD_TEST_PAGE.replace('{userId}', this.user.userVO.id)).then((res) => {
+        this.hideLoading()
         if (res.unfinishedTasks != null && res.unfinishedTasks.length > 0) {
           this.unFinishedTaskList = res.unfinishedTasks
         }
@@ -169,7 +171,6 @@ export default {
         if (res.acceptableProjects != null && res.acceptableProjects.length > 0) {
           this.acceptableProjects = res.acceptableProjects
         }
-        this.hideLoading()
         // if (res.userVO != null && res.userVO.length > 0) {
         //   this.user = res.userVO
         // }

src/components/commons/Header.vue

@@ -21,7 +21,7 @@
       <!--<span class="navbar-toggler-icon"></span>-->
       <!--</button>-->
       <!--</div>-->
-      <div style="margin-left: -100px">
+      <div>
         <ul class="navbar-nav ml-auto">
           <li class="dropdown nav-item">
             <router-link to="/home">
@@ -61,8 +61,9 @@
 
         </ul>
       </div>
-      <div style="margin-left: -100px">
+      <div>
         <ul class="navbar-nav ml-auto">
+
           <li class="dropdown nav-item">
             <router-link v-if="isLogin" to="/mine">
               <a class="dropdown-toggle nav-link" data-toggle="dropdown">
@@ -91,36 +92,45 @@
               </a>
             </router-link>
           </li>
-          <li class="dropdown nav-item">
-            <router-link v-if="isLogin" to="/mine">
-              <a class="dropdown-toggle nav-link" data-toggle="dropdown">
-                <span>{{user.userVO.name}}</span>
-              </a>
-            </router-link>
-          </li>
-          <li class="dropdown nav-item">
-            <router-link v-if="isLogin" to="/mine">
-              <div style="margin-top: 5px;margin-right: 20px">
-                <el-tooltip class="item" effect="dark" content="认证成功" placement="bottom">
-                  <el-link type="info" disabled icon="el-icon-warning-outline">已认证</el-link>
-                </el-tooltip>
-              </div>
-            </router-link>
-          </li>
-          <li class="dropdown nav-item">
-            <router-link v-if="isLogin" to="/mine">
-              <div style="margin-top: 5px;margin-right: 20px">
-                <el-tooltip class="item" effect="dark" content="点击进行认证" placement="bottom">
-                  <el-link type="danger" icon="el-icon-warning-outline">未实名认证</el-link>
-                </el-tooltip>
-              </div>
-            </router-link>
-          </li>
-          <li>
-            <a v-if="isLogin" class="dropdown-toggle nav-link" data-toggle="dropdown" href="#" @click="userLogout()">
-              <span>登出</span>
-            </a>
-          </li>
+          <el-dropdown v-if="isLogin">
+            <span class="dropdown-toggle nav-link el-dropdown-link">{{user.userVO.name}}<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item><el-link type="danger" icon="el-icon-warning-outline">未实名认证</el-link></el-dropdown-item>
+              <el-dropdown-item disabled><el-link type="info" disabled icon="el-icon-warning-outline">已认证</el-link></el-dropdown-item>
+              <el-dropdown-item divided @click.native="userLogout()">登出</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <!--<li class="dropdown nav-item">-->
+            <!--<router-link v-if="isLogin" to="/mine">-->
+              <!--<a class="dropdown-toggle nav-link" data-toggle="dropdown">-->
+                <!--<span>{{user.userVO.name}}</span>-->
+              <!--</a>-->
+            <!--</router-link>-->
+          <!--</li>-->
+          <!--<li class="dropdown nav-item">-->
+            <!--<router-link v-if="isLogin" to="/mine">-->
+              <!--<div style="margin-top: 5px;margin-right: 20px">-->
+                <!--<el-tooltip class="item" effect="dark" content="认证成功" placement="bottom">-->
+                  <!--<el-link type="info" disabled icon="el-icon-warning-outline">已认证</el-link>-->
+                <!--</el-tooltip>-->
+              <!--</div>-->
+            <!--</router-link>-->
+          <!--</li>-->
+          <!--<li class="dropdown nav-item">-->
+            <!--<router-link v-if="isLogin" to="/mine">-->
+              <!--<div style="margin-top: 5px;margin-right: 20px">-->
+                <!--<el-tooltip class="item" effect="dark" content="点击进行认证" placement="bottom">-->
+                  <!--<el-link type="danger" icon="el-icon-warning-outline">未实名认证</el-link>-->
+                <!--</el-tooltip>-->
+              <!--</div>-->
+            <!--</router-link>-->
+          <!--</li>-->
+          <!--<li>-->
+            <!--<a v-if="isLogin" class="dropdown-toggle nav-link" data-toggle="dropdown" href="#" @click="userLogout()">-->
+              <!--<span>登出</span>-->
+            <!--</a>-->
+          <!--</li>-->
         </ul>
       </div>
     </div>
@@ -216,6 +226,7 @@ export default {
       }
     },
     userLogout () {
+      console.log('ee')
       this.isLogin = false
       logout().then((res) => {
         this.$router.push({

src/main.js

@@ -22,6 +22,9 @@ import {
   CollapseItem,
   DatePicker,
   Dialog,
+  Dropdown,
+  DropdownItem,
+  DropdownMenu,
   Form,
   FormItem,
   Input,
@@ -59,7 +62,7 @@ router.beforeEach((to, from, next) => {
   if (storageGet('user') == null) {
     getCurrentUser().then((res) => {
       storageSave('user', res)
-      storageSave('rolesPermissions',getRolesPermissions(res.roleList))
+      storageSave('rolesPermissions', getRolesPermissions(res.roleList))
       if (to.matched.some(record => record.meta.requireAuth)) { // 判断该路由是否需要登录权限
         if (sessionStorage.userName === '2' && urls.includes(to.matched[0].path)) { // 判断缓存里面是否有 userName  //在登录的时候设置它的值
           next()
@@ -154,6 +157,9 @@ Vue.use(Pagination)
 Vue.use(Link)
 Vue.use(Loading)
 Vue.use(Tooltip)
+Vue.use(Dropdown)
+Vue.use(DropdownItem)
+Vue.use(DropdownMenu)
 
 Vue.prototype.$msgbox = MessageBox
 Vue.prototype.$alert = MessageBox.alert