Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/getMenu.js

@@ -50,7 +50,8 @@ router.beforeEach(async (to, from, next) => {
         try {
           const treeData = await store.dispatch('user/getMenuInfo')
           if (Array.isArray(treeData) && treeData.length) {
-            const nd = treeData.filter(item => item.pageconfigurationid)
+            const ndOrder = _.orderBy(treeData,['displaynumber'])
+            const nd = ndOrder.filter(item => item.pageconfigurationid)
             store.dispatch('auth/changeAuthArrs', nd)
             // const typeData = setType(treeData, 'up_auth_id', 'auth_id')
             const menusArray = parseMenuItem(nd)
@@ -61,10 +62,11 @@ router.beforeEach(async (to, from, next) => {
             router.addRoutes(menus)
             next({ ...to, replace: true })
           } else {
-            await store.dispatch('user/resetToken')
-            Message.error(error || 'Has Error')
-            next(`/login?redirect=${to.path}`)
-            NProgress.done()
+            // await store.dispatch('user/resetToken')
+            // Message.error(error || 'Has Error')
+            // next(`/login?redirect=${to.path}`)
+            // NProgress.done()
+            next({ ...to, replace: true })
           }
         } catch (error) {
           // remove token and go to login page to re-login
@@ -103,7 +105,7 @@ function parseMenuItem (data) {
         meta: {
           title: item.pagename,
           elSvgIcon: item.pageicon || 'el-icon-s-order',
-          show_index: item.displayorder,
+          show_index: item.displaynumber,
           qid: item.serviceid,
         },
         component: Layout,
@@ -117,8 +119,8 @@ function parseMenuItem (data) {
         name: item.pagename,
         meta: {
           title: item.pagename,
-          elSvgIcon: item.pageicon || 'el-icon-s-order',
-          show_index: item.displayorder,
+          // elSvgIcon: item.pageicon || 'el-icon-s-order',
+          show_index: item.displaynumber,
           qid: item.serviceid,
           auth_id: item.pageconfigurationid,
           up_auth_id: item.superiorid,

src/layout/components/Sidebar/SidebarItem.vue

@@ -10,7 +10,7 @@
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template v-if="item.meta" slot="title">
-        <item :meta="item.meta" />
+        <item :meta="item.meta" :icon="item.meta.elSvgIcon||(item.meta&&item.meta.elSvgIcon)" />
         <span>{{ item.meta.title }}</span>
       </template>
       <SidebarItem v-for="child in item.children" :key="child.path" :is-nest="true" :item="child" :base-path="resolvePath(child.path)" />

src/store/modules/user.js

@@ -87,8 +87,9 @@ const actions = {
     return new Promise((resolve, reject) => {
       getPermissions()
         .then((res) => {
-          if (res.code == 0 && isValue(res.returnData)) {
+          if (res.code == 0 && res.returnData) {
             commit('SET_ROLES', ['admin'])
+            console.log(111)
             resolve(res.returnData)
           } else {
             resolve({ code: -1, type: 'error' })

src/views/login/index.vue

@@ -141,6 +141,9 @@ export default {
       this.$store
         .dispatch("user/login", params)
         .then(async (res) => {
+          this.loginForm.password = ""
+          this.loginForm.identify = ""
+          this.changeCode()
           if (res==1) {
             this.dialogOpen()
           } else {