站内消息推送修复

src/main/resources/static/js/user-center/mixins/noticeMixin.js

@@ -9,6 +9,7 @@ var noticeMixin = function () {// 通知消息
         },
         mounted() {
             var _this = this;
+            window.handleOrderClick  = this.handleOrderClick;
         },
         methods: {
             hanldeNoticeText(cell){ // 根据tab计算返回显示文案
@@ -22,12 +23,12 @@ var noticeMixin = function () {// 通知消息
             },
             noticeOrderText(cell) { // 交易物流通知文案
                 const linkMap = {
-                        1:`<span class="link">去支付</span>`,
-                        2:`<span class="link">查看订单</span>`,
-                        3:`<span class="link">查看订单</span>`,
-                        4:`<span class="link">查看订单</span>`,
-                        5:`<span class="link">查看物流</span>`,
-                        6:`<span class="link">查看订单</span>`
+                        1:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))">立即支付</span>`,
+                        2:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))" >查看订单</span>`,
+                        3:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))">查看订单</span>`,
+                        4:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))">查看订单</span>`,
+                        5:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))">查看物流</span>`,
+                        6:`<span :data-type="${cell.orderMessageType}" :data-orderId="${cell.orderId}" :data-status="${cell.status}" :data-onlinePayFlag="${cell.onlinePayFlag}" class="link" onclick="handleOrderClick($(this))">查看订单</span>`
                 }
                 const map = {
                     1: `您已成功下单"${cell.productName}"等${cell.productCount}件商品，订单等待支付，点击${linkMap[cell.orderMessageType]}进行付款，支付完成后采美将尽快安排发货。`,
@@ -85,7 +86,7 @@ var noticeMixin = function () {// 通知消息
                 let _self = this;
                 switch (cell.messageType) {
                     case 1:
-                        _self.handleOrderClick(cell);
+                        return
                         break
                     case 2:
                         _self.handleUsersClick(cell);
@@ -98,22 +99,43 @@ var noticeMixin = function () {// 通知消息
                         break
                 }
             },
-            handleOrderClick(cell){
-                console.log('cell',cell)
-                const payLinkMap = {
-                    0:'/pay/caimei-paylist.html?orderId='+cell.orderId,
-                    1:'/pay/caimei-payunder.html?orderId='+cell.orderId,
+            handleOrderClick($event){// 订单点击事件
+                let orderMessageType  = Number($event[0].attributes[0].value);
+                let orderId  = Number($event[0].attributes[1].value);
+                let status  = Number($event[0].attributes[2].value);
+                let onlinePayFlag  = Number($event[0].attributes[3].value);
+                let statusVal = [ { val: [11, 12, 13, 21, 22, 23, 111], status: true }];
+                let isOnliyPay = false;
+                statusVal.forEach(el => {
+                    el.val.forEach(value => {
+                        if (status === value) {
+                            isOnliyPay = el.status
+                        }
+                    })
+                })
+                if(orderMessageType === 1 && isOnliyPay){
+                    if(isOnliyPay){
+                        CAIMEI.dialog('订单已完成支付',false);
+                    }else{
+                        let payLinkMap = {
+                            0:'/pay/caimei-paylist.html?orderId='+orderId,
+                            1:'/pay/caimei-payunder.html?orderId='+orderId,
+                        }
+                        let linkJumpMap = {
+                            1:payLinkMap[onlinePayFlag]
+                        }
+                        window.open(linkJumpMap[orderMessageType]);
+                    }
+                }else{
+                    let linkJumpMap = {
+                        2:'/user/order/detail.html?orderId='+orderId,
+                        3:'/user/order/detail.html?orderId='+orderId,
+                        4:'/user/order/detail.html?orderId='+orderId,
+                        5:'/user/order/logistics.html?orderId='+orderId,
+                        6:'/user/order/detail.html?orderId='+orderId
+                    }
+                    window.open(linkJumpMap[orderMessageType]);
                 }
-                const linkJumpMap = {
-                    1:payLinkMap[cell.onlinePayFlag],
-                    2:'/user/order/detail.html?orderId='+cell.orderId,
-                    3:'/user/order/detail.html?orderId='+cell.orderId,
-                    4:'/user/order/detail.html?orderId='+cell.orderId,
-                    5:'/user/order/logistics.html?orderId='+cell.orderId,
-                    6:'/user/order/detail.html?orderId='+cell.orderId
-                }
-                console.log('url',linkJumpMap[cell.orderMessageType])
-                window.open(linkJumpMap[cell.orderMessageType]);
             },
             handleUsersClick(cell){
                 console.log('账户通知跳转');