n20-common-lib 1.2.32 → 1.2.35

package/package.json

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

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

@@ -258,17 +258,16 @@ export default {
             null,
             { noMsg: true }
           )
-          .then(({ msg }) => {
-            this.readAllMsg(msg)
+          .then(({ msg = '' }) => {
+            this.$message({
+              message: '消息一键已读成功 ' + msg,
+              type: 'success'
+            })
+            this.getNNum()
+            this.getMsgList()
           })
       })
     },
-    readAllMsg(msg = '') {
-      this.$message({
-        message: '消息一键已读成功 ' + msg,
-        type: 'success'
-      })
-    },
     queryMore() {
       this.$router.push({ path: '/notice/list' })
     },
@@ -280,6 +279,7 @@ export default {
             message: '系统公告一键已读成功',
             type: 'success'
           })
+          this.getNNum()
           this.getAfficheList()
         })
     },

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()

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
   }
   /* 兼容旧门户 */