Merge branch 'feature/12月迭代' into dev

src/api/operation.js

@@ -37,7 +37,7 @@ let marketingApi = {
 let authApi = {
   /**            登录信息              */
   getUserInfo: '/loginuser',
-  getLoginOut: '/gic-authcenter/logout',
+  getLoginOut: '/logout',
 };
 
 marketingApi = getFetch(marketingApi, '/marketing-operation');

src/components/header.vue

@@ -52,8 +52,8 @@
           <i class="iconfont icon-fenleishezhi" style="font-size:24px" @click="drawerVisible = true"></i>
           <span class="title">{{currentModule.menuName}}</span>
         </div>
-        <el-menu :default-active="currentModule.uri">
-          <el-menu-item v-for="item in moduleList" :key="item.code" :index="item.uri" @click="onSelectMenu(item)"><i style="width:20px;display:inline-block" :class="item.iconUrl"></i>{{item.menuName}}</el-menu-item>
+        <el-menu :default-active="currentModule.code">
+          <el-menu-item v-for="item in moduleList" :key="item.code" :index="item.code" @click="onSelectMenu(item)"><i style="width:20px;display:inline-block" :class="item.iconUrl"></i>{{item.menuName}}</el-menu-item>
         </el-menu>
         <div class="operation-log" @click="openLog">
           <span>操作日志</span>
@@ -134,7 +134,7 @@ export default {
       this.drawerVisible = false;
     },
     onSelectMenu(item) {
-      if(this.currentModule.uri === item.uri) return;
+      if(this.currentModule.code === item.code) return;
       window.location.href = window.location.origin + '/' + item.projectCode + '/#' + item.uri;
       this.drawerVisible = false;
     },