Merge remote-tracking branch 'origin/layout' into dev

src/components/UserManage/topBar.vue

@@ -119,10 +119,11 @@ export default Vue.extend({
       this.searchPageReqParams.endTime = endTime
     },
     query() {
+      if (this.type === addUser.superManager) {
       this.platformSave({
         page: 1,
       })
-      this.platformQuery()
+      this.platformQuery()}
     },
     reset() {
       this.searchPageReqParams.queryName = ''
@@ -130,10 +131,12 @@ export default Vue.extend({
       this.searchPageReqParams.startTime = undefined
       this.searchPageReqParams.endTime = undefined
       this.$nextTick(() => {
+        if (this.type === addUser.superManager) {
         this.platformSave({
           page: 1,
         })
         this.query()
+        }
       })
     },
     showModal() {

src/const/columns/userManagerCol.ts

@@ -154,7 +154,6 @@ const columns:Array<column> =
     align:'center',
     scopedSlots: { customRender: 'firstSubClientManager' },
     role:[
-      eRole.firstLevel_sub_branch
     ]
   },
   {

src/service/UserManagementService/index.ts

@@ -44,7 +44,7 @@ export default class UserService {
    */
   logout() {
     return baseAxios({
-      url: '/login',
+      url: '/logout',
       method: 'get',
     })
   }

src/views/Root/index.vue

 <template>
   <div>
     <a-layout id="components-layout-demo-fixed-sider">
-      <a-layout-sider width="256" style="background: white">
-        <div class="text-center text-lg my-3">中小企业协会综合服务平台</div>
-        <a-menu
-          style="width: 256px"
-          :open-keys.sync="openKeys"
-          mode="inline"
-          :selectedKeys="selectedKeys"
-        >
-          <component
-            v-for="menu in filteredMenuList"
-            :key="menu.routeName"
-            @click="handleClickMenu"
-            :is="hasChildren(menu) ? 'a-sub-menu' : 'a-menu-item'"
+      <a-layout-header>
+        <div class="flex justify-between items-center h-full">
+          <div class="text-center text-lg my-3">中小企业协会综合服务平台</div>
+          <div>
+            <!-- <a-popover> -->
+              <!-- <template slot="content">
+                <p>退出账户</p>
+              </template> -->
+              <div class="flex justify-between items-center">
+                <img class="w-5 h-7 mr-3" src="@/assets/images/avatar.png" alt="头像">
+                {{ phone }}
+                <span class="inline-block ml-3 cursor-pointer" @click="logout">退出</span>
+              </div>
+            <!-- </a-popover> -->
+          </div>
+        </div>
+      </a-layout-header>
+      <a-layout style="min-height: 100vh">
+        <a-layout-sider width="256" style="background: white">
+          <a-menu
+            style="width: 256px"
+            :open-keys.sync="openKeys"
+            mode="inline"
+            :selectedKeys="selectedKeys"
           >
-            {{ hasChildren(menu) ? "" : menu.getName() }}
-
-            <span slot="title" v-if="hasChildren(menu)"
-              ><span>{{ menu.getName() }}</span></span
-            >
-            <a-menu-item
-              v-for="subItem in getMenuChildren(menu)"
-              :key="subItem.routeName"
+            <component
+              v-for="menu in filteredMenuList"
+              :key="menu.routeName"
+              @click="handleClickMenu"
+              :is="hasChildren(menu) ? 'a-sub-menu' : 'a-menu-item'"
             >
-              {{ subItem.getName() }}
-            </a-menu-item>
-          </component>
-        </a-menu>
-      </a-layout-sider>
-      <a-layout style="min-height: 100vh">
+              {{ hasChildren(menu) ? "" : menu.getName() }}
+
+              <span slot="title" v-if="hasChildren(menu)"
+                ><span>{{ menu.getName() }}</span></span
+              >
+              <a-menu-item
+                v-for="subItem in getMenuChildren(menu)"
+                :key="subItem.routeName"
+              >
+                {{ subItem.getName() }}
+              </a-menu-item>
+            </component>
+          </a-menu>
+        </a-layout-sider>
         <a-layout-content
           :style="{ margin: '24px 16px 0', overflow: 'initial' }"
         >
@@ -59,11 +75,14 @@ import { iMenuItem, iMenuList } from "./types";
 import { Fragment } from "vue-fragment";
 import { getUserMsg } from "@/utils/userMsg/userMsg";
 import { getOldRoleFromUserMsg } from "@/utils/user";
+import UserService from '@/service/UserManagementService'
 
 Vue.use(Menu);
 Vue.use(Icon);
 Vue.use(Layout);
 
+const userService = new UserService()
+
 export default Vue.extend({
   components: {
     Fragment,
@@ -93,6 +112,9 @@ export default Vue.extend({
     selectedKeys(): Array<String> {
       return [(this.$route.meta as { selectedName: string }).selectedName];
     },
+    phone() {
+      return JSON.parse(window.localStorage.getItem('USER_MSG') as any).phone
+    }
   },
   methods: {
     getMenuChildren(menu: iMenuItem) {
@@ -121,6 +143,14 @@ export default Vue.extend({
     hasChildren(menu: iMenuItem) {
       return menu.children && menu.children.length !== 0;
     },
+    logout() {
+      userService.logout().then(res => {
+        if (res.code === 200) {
+          window.localStorage.clear()
+          this.$router.push('/login')
+        }
+      })
+    }
   },
 });
 </script>
@@ -129,4 +159,7 @@ export default Vue.extend({
 /deep/a {
   color: #3E4FAF;
 }
+/deep/ .ant-layout-header {
+  background: #fff;
+}
 </style> 
\ No newline at end of file