@hbisty/qj-common 5.0.8 → 5.0.9

package/package.json

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

package/src/components/SiteMsg/index.vue

@@ -213,7 +213,7 @@ export default {
         if (msg.content) {
           let content = msg.content;
           if (msg.mnslistExp && msg.mnslistExp.bizLinkData) {
-            const expData = msg.mnslistExp.bizLinkData
+            const expData = JSON.parse(msg.mnslistExp.bizLinkData)
             // 平台类型消息跳转处理
             // 订单号：contractBillcode
             // 订单批次号：contractBbillcode
@@ -249,7 +249,7 @@ export default {
               }
               if (expData.contractBillcode) { //订单号
                 if (msg.mnslistBustypeExt.includes('buy_service_after_sale')) { //售后列表
-                  const buyRefundPage = "/paas/bbc-cli-pc/index.html#/user?toPath=afterSalesSales&contractBillcode=" + expData.contractBillcode;
+                  const buyRefundPage = "/paas/bbc-cli-pc/index.html#/user?toPath=afterSales&contractBillcode=" + expData.contractBillcode;
                   content = content.replace(expData.contractBillcode, `<a href="${buyRefundPage}">${expData.contractBillcode}</a>`)
                 } else { //订单列表
                   const buyOrderPage = "/paas/bbc-cli-pc/index.html#/user?toPath=order&contractBillcode=" + expData.contractBillcode;
@@ -392,7 +392,7 @@ export default {
         content: row.mnslistContent || '',
         isRead: String(row.stateExt) === '1',
         raw: row,
-        mnslistExp: row.mnslistExp,
+        mnslistExp: mnslistExp,
         platform: platform || '',
         mnslistBustypeExt: row.mnslistBustypeExt || ''
       }
@@ -755,7 +755,7 @@ export default {
         color: #606266;
         line-height: 1.6;
 
-        .highlight-link {
+        a {
           color: #409eff;
           cursor: pointer;
           text-decoration: none;

package/src/views/layout/components/Sidebar/index.vue

@@ -34,6 +34,27 @@ export default {
   },
 
   methods: {
+    // 根据 $route.path（对应最深层的 menuAction）在 sessionStorage['menu'] 中反查所属一级菜单的 menuCode(key)
+    findMenuCodeBySession() {
+      try {
+        const raw = window.sessionStorage.getItem('menu');
+        if (!raw || raw === '{}') return null;
+        const menuData = JSON.parse(raw) || {};
+        const routePath = this.$route.path.replace('/', '');
+        if (!routePath) return null;
+        // 递归匹配节点自身及 children / routechildren 中的 menuAction
+        const hasMatch = (node) => {
+          if (!node) return false;
+          if (node.menuAction === routePath) return true;
+          return [].concat(node.children || [], node.routechildren || []).some(hasMatch);
+        };
+        const code = Object.keys(menuData).find((key) => (menuData[key] || []).some(hasMatch));
+        return code || null;
+      } catch (err) {
+        console.log('出错了' + err);
+        return null;
+      }
+    },
     getMenuList() {
       let menuList = window.sessionStorage.getItem('menuList') ? JSON.parse(window.sessionStorage.getItem('menuList')).menuList : null,
         code = window.sessionStorage.getItem('menuCode'),
@@ -132,6 +153,13 @@ export default {
           this.handleMenu(menuList.menuList);
         }
       }
+      // meta 和缓存都没有 menuCode 时，用当前路由在菜单树中反查一级菜单 key
+      if (!menuCode) {
+        menuCode = this.findMenuCodeBySession();
+        if (menuCode) {
+          window.sessionStorage.setItem('menuCode', menuCode);
+        }
+      }
       return window.sessionStorage.getItem('menu') ? JSON.parse(window.sessionStorage.getItem('menu'))[menuCode] : null;
     },
     isActive() {