n20-common-lib 1.2.30 → 1.2.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.30",
+  "version": "1.2.33",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Layout/HeaderWrap/index.vue

@@ -13,13 +13,8 @@
     <el-divider direction="vertical" />
     <!-- eslint-disable-next-line vue/no-v-html -->
     <h3 class="header-title" v-html="headerTitle"></h3>
-    <el-tooltip
-      class="set-user-btn"
-      effect="dark"
-      content="帮助文档"
-      placement="top-start"
-    >
-      <i class="el-icon-info" @click="openHelp"></i>
+    <el-tooltip content="帮助文档">
+      <span class="set-user-btn el-icon-info" @click="openHelp"></span>
     </el-tooltip>
 
     <el-dropdown
@@ -94,9 +89,12 @@
         <el-dropdown-item command="changePassword" divided>{{
           '修改密码' | $l(i18n)
         }}</el-dropdown-item>
-        <el-dropdown-item command="myDeal" divided>{{
-          '我的交易' | $l(i18n)
-        }}</el-dropdown-item>
+        <el-dropdown-item
+          v-if="customOpt.mydeal !== false"
+          command="myDeal"
+          divided
+          >{{ '我的交易' | $l(i18n) }}</el-dropdown-item
+        >
         <el-dropdown-item
           v-if="customOpt.agency && customOpt.agency.show"
           command="myAgency"

package/src/components/Layout/index.vue

@@ -214,13 +214,6 @@ export default {
     },
     getTabList() {
       let tabList = JSON.parse(window.sessionStorage.getItem('tab-list')) || []
-      if (!tabList.some((tab) => tab.route === this.keepTab)) {
-        let menu = this.menuList.find((m) => m.route === this.keepTab)
-        if (menu) {
-          let keepMenu = Object.assign({}, menu, { keep: true })
-          tabList.unshift(keepMenu)
-        }
-      }
       this.tabList = tabList
     },
     setTabList() {
@@ -232,9 +225,9 @@ export default {
       )
       if (tab) {
         this.activeNav = tab.uuid
-      } else {
+      } else if (this.keepTab) {
         this.$router.replace({
-          path: this.keepTab || '/'
+          path: this.keepTab
         })
       }
     },
@@ -365,9 +358,9 @@ export default {
           }
         }
 
-        this.$nextTick(() => {
+        setTimeout(() => {
           this.removeOcache({ path: path })
-        })
+        }, 100)
       } else {
         console.warn('请求关闭的Tab页签不存在')
       }
@@ -385,12 +378,12 @@ export default {
         })
       }
 
-      this.$nextTick(() => {
+      setTimeout(() => {
         nextTabs.forEach((t) => {
           this.removeOcache({ path: t.route })
         })
         nextTabs = undefined
-      })
+      }, 100)
     },
     tabCloseOthers(uuid) {
       let tab = this.tabList.find((t) => t.uuid === uuid)
@@ -416,12 +409,12 @@ export default {
         })
       }
 
-      this.$nextTick(() => {
+      setTimeout(() => {
         otherTabs.forEach((t) => {
           this.removeOcache({ path: t.route })
         })
         otherTabs = undefined
-      })
+      }, 100)
     },
     tabRefresh({ uuid, path }) {
       let tab = undefined

package/src/components/LoginTemporary/form.vue

@@ -281,9 +281,18 @@ export default {
           this.outTime(60)
 
           axios
-            .get(
-              `/bems/prod_1.0/uas/api/authorization/captcha/${this.form[type]}/1`,
-              null,
+            // .get(
+            //   `/bems/prod_1.0/uas/api/authorization/captcha/${this.form[type]}/1`,
+            //   null,
+            //   { loading: false, noMsg: true }
+            // )
+            .post(
+              '/bems/prod_1.0/uas/api/authorization/captcha',
+              {
+                handleType: 1,
+                mobile: type === 'phone' ? this.form[type] : '',
+                username: type !== 'phone' ? this.form[type] : ''
+              },
               { loading: false, noMsg: true }
             )
             .then(() => {

package/src/utils/relaNo.js

@@ -21,11 +21,7 @@ export function setRela(name) {
     )
     console.log(relaObj, 'has权限列表')
 
-    let relaNosGlobal = []
-    relaNos.forEach((item) => {
-      relaNosGlobal.push.apply(relaNosGlobal, item.relaNos)
-    })
-    relaObj.relaNosGlobal = relaNosGlobal
+    relaObj.relaNosGlobal = relaNos.map((item) => item.relaNos).flat()
     return
   }
   /* 兼容旧门户 */