解决了很多很多bug

src/components/commons/Footer2.0.vue

@@ -18,7 +18,7 @@
             电话：{{ footer_mobile }}  传真：{{ footer_fax }}1<br/>
             电子邮箱：{{ footer_email }}
           </div>
-          <div class="code-block pull-right">
+          <div class="code-block pull-right" v-if="footer_QRcode">
             <img :src="footer_QRcode" alt="QRcode" class="mooctest-code" style="width: 110px;height: 110px;display: block">
             <div style="width: 110px;text-align: center">官方微信公众号</div>
           </div>

src/components/commons/Header2.0.vue

@@ -55,13 +55,13 @@
               </router-link>
             </li>
 
-            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
+<!--            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>-->
 
-            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">
-              <router-link v-if="isLogin" to="/statistics">
-                <span>机构统计</span>
-              </router-link>
-            </li>
+<!--            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">-->
+<!--              <router-link v-if="isLogin" to="/statistics">-->
+<!--                <span>机构统计</span>-->
+<!--              </router-link>-->
+<!--            </li>-->
 
             <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
             <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">
@@ -85,7 +85,8 @@
     getRolesPermissions,
     logout,
     storageGet,
-    storageSave
+    storageSave,
+    storageRemove
   } from '@/js/index'
   import Http from '@/js/http.js'
   import Apis from '@/js/api.js'
@@ -161,7 +162,6 @@
               // storageSave('rolesPermissions', getRolesPermissions(torageGet('user')&&storageGet('user').roleList))
               // this.isLogin = true
               // this.fullScreenLoading = false
-
                 getCurrentUser().then((res) => {
                     storageSave('user', res)
                     this.setUser(res);
@@ -191,7 +191,6 @@
             storageSave('rolesPermissions', getRolesPermissions(res.roleList))
             this.rolesPermissions = storageGet('rolesPermissions')
             console.log('用户信息加载成功')
-
             this.isLogin = true
             this.fullScreenLoading = false
         },
@@ -201,9 +200,9 @@
         },
         userLogout () {
             this.isLogin = false
+            storageRemove('user')
             logout().then((res) => {
                 // location.reload();
-              console.log(this.$route.fullPath);
                 if(this.$route.fullPath.includes("/home")){
                   location.reload();
                 }else{

src/components/task/Task.vue

@@ -6,7 +6,7 @@
       <el-row :gutter="20">
         <el-col :span="15">
           <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task"
-                   style="margin:0 80px;">
+                   style="margin:0 0 0 80px;">
             <el-form-item label="任务名称" prop="title" style="width: 700px;">
               <el-input size="small" v-if="isModifyMode" v-model="task.title"></el-input>
               <span v-if="!isModifyMode">{{task.title}}</span>

src/js/generalService.js

@@ -5,6 +5,10 @@ import ProvinceJson from '../constants/provinceCity'
 export const storageSave = (key, value) => {
   sessionStorage.setItem(key, JSON.stringify(value))
 }
+//移除session
+export const storageRemove = (key, value) => {
+  return sessionStorage.removeItem(key)
+}
 
 //取session
 export const storageGet = (key) => {

src/js/index.js

@@ -69,7 +69,8 @@ import {
   getProvinceNameByProvinceCode,
   getUserIdentity,
   storageGet,
-  storageSave
+  storageSave,
+  storageRemove
 } from './generalService'
 
 export {
@@ -225,6 +226,7 @@ export {
   storageGet,
   //保存数据到本地
   storageSave,
+  storageRemove,
   getFormalTimeFromDate,
   getIndexStatisticsInfo
 }

src/pages/Homepage/Homepage.vue

@@ -4,7 +4,7 @@
       <!--搜索框-->
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
-          <div class="pull-left">
+          <div class="pull-left" @click="handleLogoClick">
             <img class="logo-img" :src="logo_transparent" :to="'/home'"/>
             <span class="logo-title">{{ logoTitle }}</span>
           </div>
@@ -178,6 +178,9 @@ export default {
     checkLogin() {
       this.checkCreateProjectAuth();
     },
+    handleLogoClick(){
+      location.reload();
+    },
     checkCreateProjectAuth() {
       if (!this.isLogin) {
         notify('warning', '请登录后访问');

src/pages/Homepage/LoginCard.vue

@@ -5,10 +5,10 @@
            class="pull-left welcome-img">
       <div style="margin-left: 46px">
         <div class="welcome-title">
-          hi，欢迎使用{{logoTitle}}
+          hi，欢迎使用{{ logoTitle }}
         </div>
         <div class="welcome-content">
-          众测群智，不一样的深度测试
+          {{ login_description }}
         </div>
       </div>
       <div class="welcome-btn">
@@ -24,94 +24,98 @@
 </template>
 
 <script>
-  import Http from '@/js/http.js'
-  import {logout, storageGet} from '@/js/index.js'
-  import {mapActions,mapGetters} from 'vuex'
-  import {CONFIG,login_url} from "../../config";
+import Http from '@/js/http.js'
+import {logout, storageGet} from '@/js/index.js'
+import {mapActions, mapGetters} from 'vuex'
+import {CONFIG, login_url} from "../../config";
+import {storageRemove} from "../../js/index";
 
-  export default {
-    name: "LoginCard",
-    data() {
-      return {
-        logoTitle:CONFIG.logoTitle,
-        logo_background:CONFIG.logo_background,
-        isLogin: false,
-        user: {},
-        loginUrl: login_url,
-        userImg: ''
+export default {
+  name: "LoginCard",
+  data() {
+    return {
+      logoTitle: CONFIG.logoTitle,
+      logo_background: CONFIG.logo_background,
+      isLogin: false,
+      user: {},
+      loginUrl: login_url,
+      userImg: '',
+      login_description: CONFIG.login_description
+    }
+  },
+  computed: {
+    ...mapGetters(['getUserInfo'])
+  },
+  methods: {
+    loadData() {
+      if (storageGet('user') || this.getUserInfo.id) {
+        this.isLogin = true;
+        this.user = storageGet('user') || this.getUserInfo;
       }
     },
-    computed: {
-      ...mapGetters(['getUserInfo'])
+    userLogout() {
+      this.isLogin = false
+      logout().then((res) => {
+        console.log('logout');
+        storageRemove('user');
+        location.reload();
+      })
     },
-    methods: {
-      loadData() {
-        if (storageGet('user') || this.getUserInfo) {
-          this.isLogin = true;
-          this.user = storageGet('user') || this.getUserInfo;
-        }
-      },
-      userLogout() {
-        this.isLogin = false
-        logout().then((res) => {
-          this.$router.go(0)
+    getUserImg() {
+      if (this.user && this.user.userVO && this.user.userVO.id) {
+        Http.get(`/api/user/image/${this.user.userVO.id}`).then((res) => {
+          if (res.data) {
+            this.userImg = res.data;
+          }
         })
-      },
-      getUserImg() {
-        if (this.user&&this.user.userVO&&this.user.userVO.id) {
-          Http.get(`/api/user/image/${this.user.userVO.id}`).then((res) => {
-            if (res.data) {
-              this.userImg = res.data;
-            }
-          })
-        }
-
       }
-    },
-    mounted() {
+
+    }
+  },
+  mounted() {
+    this.loadData();
+    this.getUserImg();
+  },
+  watch: {
+    getUserInfo(val) {
       this.loadData();
       this.getUserImg();
-    },
-    watch:{
-      getUserInfo(val){
-        this.loadData();
-        this.getUserImg();
-      }
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  @import "../../style/main";
+@import "../../style/main";
 
-  .login-card {
-    margin-bottom: 13px;
+.login-card {
+  margin-bottom: 13px;
 
-    .welcome-img {
-      width: 40px;
-      height: 40px;
-      display: inline-block;
-      margin: 2px 0;
-    }
+  .welcome-img {
+    width: 40px;
+    height: 40px;
+    display: inline-block;
+    margin: 2px 0;
+  }
 
-    .welcome-title {
-      font-size: 14px;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: rgba(0, 0, 0, 1);
-    }
+  .welcome-title {
+    font-size: 14px;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
+    color: rgba(0, 0, 0, 1);
+  }
 
-    .welcome-content {
-      font-size: 13px;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: rgba(0, 0, 0, 1);
-    }
+  .welcome-content {
+    font-size: 13px;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+  }
 
-    .welcome-btn {
-      width: 100%;
-      height: 28px;
-      margin-top: 20px;
-    }
+  .welcome-btn {
+    width: 100%;
+    height: 28px;
+    margin-top: 20px;
   }
+}
 </style>

src/pages/UserCenter/EnterpriseAuth.vue

@@ -410,6 +410,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
   .avatar-uploader {
     border-radius: 6px;
     cursor: pointer;
@@ -441,7 +442,7 @@
   }
 
   .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
+    border-color: $__color-primary;
   }
 
   .avatar-uploader-icon {
@@ -521,7 +522,7 @@
 
           li:before {
             content: "\2022";
-            color: #148AE0;
+            color: $__color-primary;
             font-size: 22px;
             margin-right: 5px;
           }
@@ -536,16 +537,16 @@
       justify-content: center;
 
       .enterprise-btn {
-        border: 1px solid rgba(0, 118, 203, 1);
+        border: 1px solid $__color-primary;
         width: 150px;
         background-color: white;
-        color: rgba(0, 118, 203, 1);
+        color: $__color-primary;
         padding: 10px;
         margin: 0 30px;
       }
 
       .nextBtn {
-        background-color: rgba(0, 118, 203, 1);
+        background-color: $__color-primary;
         color: white;
       }
     }

src/pages/UserCenter/Mine.vue

@@ -137,7 +137,7 @@
             Http.put(`/api/personal/update/${this.user.id}`, params).then(res => {
               this.isModifyMode = false;
               notify('success', '修改成功 ');
-              this.loadData();
+              location.reload();
             })
           }
         })

src/pages/UserCenter/ModifyPsw.vue

@@ -4,9 +4,9 @@
       <div class="right-modifyPsw-title">
         <span style="font-size: 18px;font-weight: bold">修改密码</span>
       </div>
-      <div style="background-color: rgba(233,239,249,1);padding: 10px">
-        <i class="el-icon-warning" style="color: rgba(0, 117, 203, 1);font-size: 18px"></i>
-        <span style="font-size: 16px">安全提醒：请妥善保管密码，众测服务平台人员不会以任何理由向您索取密码。</span>
+      <div class="modify-psw-warning">
+        <i class="el-icon-warning"></i>
+        <span style="font-size: 16px">安全提醒：请妥善保管密码，切记向他人随意泄漏您的密码。</span>
       </div>
       <el-form ref="modifyForm" :rules="rules" :model="modifyForm" label-width="80px" style="margin-top: 20px; width: 40%;">
         <el-form-item label="当前密码" prop="oldPassword">
@@ -96,6 +96,7 @@
 </script>
 
 <style scoped lang="scss">
+  @import "../../style/main";
   .right-modifyPsw {
     padding: 20px;
     background: rgba(255, 255, 255, 1);
@@ -106,5 +107,13 @@
       border-bottom: 1px solid #ccc;
       margin-bottom: 20px;
     }
+    .modify-psw-warning {
+      background-color: $__color-primary-background;
+      padding: 10px;
+      .el-icon-warning {
+        font-size: 18px;
+        color: $__color-primary;
+      }
+    }
   }
 </style>

src/style/main.scss

@@ -1275,7 +1275,7 @@ a {
 }
 
 .router-link-exact-active {
-  color: rgba(0, 118, 203, 1);
+  color: $--color-primary;
 }
 
 .rg-select {