@hbisty/qj-common 5.0.5 → 5.0.7

package/package.json

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

package/src/components/SiteMsg/index.vue

@@ -6,7 +6,7 @@
       size="820px"
       :with-header="false"
       :before-close="handleClose"
-      custom-class="site-msg-drawer"
+      class="site-msg-drawer"
       append-to-body
     >
       <div class="site-msg-container">
@@ -164,6 +164,7 @@ import {
   updateStateExtRead, 
   updateAllRead 
 } from '#/api/siteMsg';
+import { parseTime } from '#/utils/index'
 
 export default {
   name: 'SiteMsg',
@@ -205,6 +206,73 @@ export default {
     },
     filteredMessages() {
       return this.messages
+    },
+    // 内容处理
+    renderContent() {
+      return (msg) => {
+        if (msg.content) {
+          let content = msg.content;
+          if (msg.mnslistExp && msg.mnslistExp.bizLinkData) {
+            const expData = msg.mnslistExp.bizLinkData
+            // 平台类型消息跳转处理
+            // 订单号：contractBillcode
+            // 订单批次号：contractBbillcode
+            // 商品Code：goodsCode
+            // 售后：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.contractBillcode) { //订单号
+                if (msg.mnslistBustypeExt === 'mer_service_after_sale_audit') { //退单列表
+                    const merReturnPage = "/paas/merchant-pc/index.html#/returnsList?orderNo=" + expData.contractBillcode;
+                    content = content.replace(expData.contractBillcode, `<a href="${merReturnPage}">${expData.contractBillcode}</a>`)
+                } else { //订单列表
+                  const merOrderPage = "/paas/welfare-bus-pc/index.html#/orderListAll?contractBillcode=" + expData.contractBillcode;
+                  content = content.replace(expData.contractBillcode, `<a href="${merOrderPage}">${expData.contractBillcode}</a>`)
+                }
+              }
+              if (expData.businessDes1) { //应收账单列表
+                const merReceivablePage = "/paas/bbc-bus-pc/index.html#/merchantReceivable?balancelistCode=" + expData.businessDes1;
+                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>`)
+              } 
+            } else if (msg.platform === 'buy') { //商城端
+              if (expData.businessDes1) { //应付账单列表
+                const buyPayablePage = "/paas/bbc-cli-pc/index.html#/user?toPath=payable&balancelistCode=" + expData.businessDes1;
+                content = content.replace(expData.businessDes1, `<a href="${buyPayablePage}">${expData.businessDes1}</a>`)
+              }
+              if (expData.contractBillcode) { //订单号
+                if (msg.mnslistBustypeExt.includes('buy_service_after_sale')) { //售后列表
+                  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;
+                  content = content.replace(expData.contractBillcode, `<a href="${buyOrderPage}">${expData.contractBillcode}</a>`)
+                }
+              }
+              if (expData.contractBbillcode) { //订单批次号查询
+                if (msg.mnslistBustypeExt === 'buy_order_purchase_audit') { //请购审批
+                  const buyBbillPage = "/paas/bbc-cli-pc/index.html#/user?toPath=apprOrderList&contractBbillcode=" + expData.contractBbillcode;
+                  content = content.replace(expData.contractBbillcode, `<a href="${buyBbillPage}">${expData.contractBbillcode}</a>`)
+                } else { //订单列表
+                  const buyOrderPage = "/paas/bbc-cli-pc/index.html#/user?toPath=order&contractBbillcode=" + expData.contractBbillcode;
+                  content = content.replace(expData.contractBbillcode, `<a href="${buyOrderPage}">${expData.contractBbillcode}</a>`)
+                }
+              }
+             
+            }
+          }
+          return content
+        } else {
+          return ''
+        }
+      }
     }
   },
   watch: {
@@ -306,25 +374,29 @@ export default {
     },
     // 行数据映射为组件所需结构
     mapMessage(row) {
+      let mnslistBustypeExt = row.mnslistBustypeExt
+      let platform = ''
+      if (mnslistBustypeExt) {
+        platform = mnslistBustypeExt.split('_')[0]
+      }
+      let mnslistExp = row.mnslistExp || ''
+      if (mnslistExp) {
+        mnslistExp = JSON.parse(mnslistExp)
+      }
       return {
         id: row.mnsblistId || row.id || '',
         typeId: this.activeType,
         subId: this.activeSub,
-        title: row.mnschannelName || row.mnslistName || '',
-        time: this.pickTime(row),
+        title: row.mnslistSubject || '',
+        time: parseTime(row.gmtCreate, '{y}-{m}-{d} {h}:{i}:{s}'),
         content: row.mnslistContent || '',
         isRead: String(row.stateExt) === '1',
-        raw: row
+        raw: row,
+        mnslistExp: row.mnslistExp,
+        platform: platform || '',
+        mnslistBustypeExt: row.mnslistBustypeExt || ''
       }
     },
-    // 兼容取消息时间字段
-    pickTime(row) {
-      const fields = ['gmtModified', 'gmtCreate', 'sendTime', 'createTime', 'mnsblistDate', 'mnsblistTime']
-      for (const f of fields) {
-        if (row[f]) return row[f]
-      }
-      return ''
-    },
     emitUnreadCount() {
       this.$emit('unread-count-change', this.totalUnread)
     },
@@ -396,6 +468,7 @@ export default {
       if (!val) return
       const unread = this.filteredMessages.filter(m => !m.isRead)
       if (unread.length === 0) {
+        this.$message.warning('当前没有未读消息')
         this.markAllChecked = false
         return
       }
@@ -425,9 +498,6 @@ export default {
         this.markAllChecked = false
       }
     },
-    renderContent(msg) {
-      return msg.content
-    },
     jumpToProduct(code) {
       this.$emit('jump-to-product', code)
       this.$message.info(`跳转至商品中心 - 商品管理 - 待审核商品列表，商品编号：${code}`)

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

@@ -141,11 +141,11 @@ export default {
       if (!current && this.current) {
         current = this.current;
       }
-      if (this.$route.path && this.$route.meta) {
-        if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
-          sessionStorage.setItem('commonShowMenuAction', this.$route.path)
-        }
-      }
+      // if (this.$route.path && this.$route.meta) {
+      //   if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
+      //     sessionStorage.setItem('commonShowMenuAction', this.$route.path)
+      //   }
+      // }
 
 
       console.log(current, 'current');
@@ -161,18 +161,18 @@ export default {
       console.log(current, 'path');
       console.log(path, 'path');
       console.log(sessionStorage.getItem('commonShowMenuAction'), this.$route, '当前路由信息');
-      if (this.$route.name !== '首页' && this.$route.path !== '/404') {
-        if (Object.keys(this.$route.meta) > 0) {
-          if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
-            path = path
-          } else {
-            path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
-          }
-        } else {
-          path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
-        }
+      // if (this.$route.name !== '首页' && this.$route.path !== '/404') {
+      //   if (Object.keys(this.$route.meta) > 0) {
+      //     if ('title' in this.$route.meta && 'icon' in this.$route.meta && 'menuCode' in this.$route.meta && 'params' in this.$route.meta) {
+      //       path = path
+      //     } else {
+      //       path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
+      //     }
+      //   } else {
+      //     path = sessionStorage.getItem('commonShowMenuAction') ? sessionStorage.getItem('commonShowMenuAction') : path
+      //   }
 
-      }
+      // }
 
       return path;
     },