@hbisty/qj-common 5.1.1 → 5.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hbisty/qj-common",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/components/SiteMsg/index.vue

@@ -204,6 +204,11 @@ export default {
     currentSubCategories() {
       return this.subCategoryMap[this.activeType] || []
     },
+    // 当前二级菜单下所有三级菜单code拼接值
+    activeSubCodes() {
+      const subNode = this.currentSubCategories.find(c => c.key === this.activeSub)
+      return subNode ? subNode.codes : ''
+    },
     filteredMessages() {
       return this.messages
     },
@@ -287,7 +292,10 @@ export default {
     }
   },
   mounted() {
-    this.fetchTree()
+    const saasToken = localStorage.getItem('saasToken') || localStorage.getItem('saas-token');
+    if (saasToken) {
+      this.fetchTree()
+    }
   },
   methods: {
     // 1.查询顶部tab消息类型和左侧tab状态类型
@@ -295,22 +303,24 @@ export default {
       this.treeLoading = true
       try {
         const res = await queryMailMnsblistPageTree({ mnslistBustype: 'smail', stateExt: '0' })
-        const list = (res && res.mnsTabTreeNodeList) || []
+        const list = Array.isArray(res) ? res : (res && res.mnsTabTreeNodeList) || []
         this.messageTypes = list.map(n => ({
           key: n.code,
           name: n.message,
           badge: n.badge || 0,
-          children: (n.children || []).map(c => ({
-            key: c.code,
+          children: (n.children || []).map((c, idx) => ({
+            key: c.code || ('sub_' + idx),
             name: c.message,
-            badge: c.badge || 0
+            badge: c.badge || 0,
+            // 三级菜单所有code用逗号拼接，作为接口入参mnslistBustypeExt的值
+            codes: (c.children || []).filter(g => g.code).map(g => g.code).join(',')
           }))
         }))
         this.subCategoryMap = {}
         this.messageTypes.forEach(t => {
           this.subCategoryMap[t.key] = t.children
         })
-        this.totalUnread = (res && res.badge) || 0
+        this.totalUnread = Array.isArray(res) ? 0 : (res && res.badge) || 0
         this.treeLoaded = true
         // 设置默认选中项
         if (this.messageTypes.length > 0) {
@@ -344,12 +354,13 @@ export default {
         const params = {
           page: this.currentPage,
           rows: this.pageSize,
+          channel: true, //区分渠道
           mnslistBustype: 'smail',
           mnslistBustnameExt: this.activeType, // 一级菜单code
           // fuzzy: false
         }
-        if (this.activeSub) {
-          params.mnslistBustypeExt = this.activeSub // 二级菜单code
+        if (this.activeSubCodes) {
+          params.mnslistBustypeExt = this.activeSubCodes // 三级菜单code拼接
         }
         if (this.appliedKeyword) {
           params.mnslistContentLike = this.appliedKeyword // 模糊搜索关键词
@@ -473,7 +484,7 @@ export default {
         return
       }
       const params = {
-        mnslistBustypeExt: this.activeSub, // 二级菜单code
+        mnslistBustypeExt: this.activeSubCodes, // 三级菜单code拼接
       }
       const subNode = this.currentSubCategories.find(c => c.key === this.activeSub)
       const typeNode = this.messageTypes.find(t => t.key === this.activeType)