n20-common-lib 1.2.31 → 1.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.31",
+  "version": "1.2.34",
   "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/SubContent/index.vue

@@ -25,10 +25,6 @@ const routerBaseRe = new RegExp('^' + routerBase)
 export default {
   name: 'SubContent',
   props: {
-    appNo: {
-      type: String,
-      default: process.env.VUE_APP_NAME
-    },
     isTest: {
       type: Boolean,
       default: false
@@ -49,7 +45,7 @@ export default {
     }
   },
   created() {
-    setRela(this.appNo)
+    setRela()
 
     window.addEventListener('message', this.watchMessage)
 

package/src/components/Layout/index.vue

@@ -59,10 +59,6 @@ export default {
     tabsNav
   },
   props: {
-    appNo: {
-      type: String,
-      default: process.env.VUE_APP_NAME
-    },
     menus: {
       type: Array,
       default: () => []
@@ -131,7 +127,7 @@ export default {
     window._tab_cache_route = undefined
     window._pending_update_cache = {}
 
-    setRela(this.appNo)
+    setRela()
 
     this.getCollapse()
     this.getTabList()
@@ -214,13 +210,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 +221,9 @@ export default {
       )
       if (tab) {
         this.activeNav = tab.uuid
-      } else {
+      } else if (this.keepTab) {
         this.$router.replace({
-          path: this.keepTab || '/'
+          path: this.keepTab
         })
       }
     },

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

@@ -11,7 +11,7 @@ export function getRela() {
   return relaObj
 }
 
-export function setRela(name) {
+export function setRela() {
   let relaNosStr = sessionStorage.getItem('relaNos')
   if (relaNosStr) {
     let relaNos = JSON.parse(relaNosStr)
@@ -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
   }
   /* 兼容旧门户 */