@hbisty/qj-common 5.0.8 → 5.1.0

package/package.json

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

package/src/components/SiteMsg/index.vue

@@ -128,7 +128,7 @@
                     />
                   </el-tooltip>
                 </div>
-                <div class="msg-content-text" v-html="renderContent(msg)"></div>
+                <div class="msg-content-text" v-html="renderContent(msg)" @click="handleLinkClick"></div>
               </div>
 
               <el-empty
@@ -213,16 +213,16 @@ 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
-            // 商品Code：goodsCode
+            // 商品编号：goodsNo
             // 售后：refundCode
             if (msg.platform === 'mer') { //商家端
-              if (expData.goodsCode) { //商品列表
-                const merGoodsPage = "/paas/merchant-pc/index.html#/goodsList?goodsNo=" + expData.goodsCode;
-                content = content.replace(expData.goodsCode, `<a href="${merGoodsPage}">${expData.goodsCode}</a>`)
+              if (expData.goodsNo) { //商品列表
+                const merGoodsPage = "/paas/merchant-pc/index.html#/goodsList?goodsNo=" + expData.goodsNo;
+                content = content.replace(expData.goodsNo, `<a href="${merGoodsPage}">${expData.goodsNo}</a>`)
               } 
               if (expData.contractBillcode) { //订单号
                 if (msg.mnslistBustypeExt === 'mer_service_after_sale_audit') { //退单列表
@@ -238,9 +238,9 @@ export default {
                 content = content.replace(expData.businessDes1, `<a href="${merReceivablePage}">${expData.businessDes1}</a>`)
               }
             } else if (msg.platform === 'op') { //运营端
-              if (expData.goodsCode) { //商品列表
-                const opGoodsPage = "/paas/bbc-bus-pc/index.html#/auCommoditylist?goodsNo=" + expData.goodsCode;
-                content = content.replace(expData.goodsCode, `<a href="${opGoodsPage}">${expData.goodsCode}</a>`)
+              if (expData.goodsNo) { //商品列表
+                const opGoodsPage = "/paas/bbc-bus-pc/index.html#/auCommoditylist?goodsNo=" + expData.goodsNo;
+                content = content.replace(expData.goodsNo, `<a href="${opGoodsPage}">${expData.goodsNo}</a>`)
               } 
             } else if (msg.platform === 'buy') { //商城端
               if (expData.businessDes1) { //应付账单列表
@@ -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 || ''
       }
@@ -498,9 +498,14 @@ export default {
         this.markAllChecked = false
       }
     },
-    jumpToProduct(code) {
-      this.$emit('jump-to-product', code)
-      this.$message.info(`跳转至商品中心 - 商品管理 - 待审核商品列表，商品编号：${code}`)
+    handleLinkClick(e) {
+      const link = e.target.closest('a')
+      if (!link) return
+      e.preventDefault()
+      const href = link.getAttribute('href')
+      window.location.href = href
+      window.location.reload()
+      
     },
     closeDrawer() {
       this.drawerVisible = false
@@ -755,7 +760,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() {