消息通知

pages/notice/club/notice-order.vue

@@ -28,7 +28,7 @@
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id, index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -77,33 +77,25 @@ export default {
 	},
 	methods: {
 		async initData(option) {
-		    const userInfo = await this.$api.getStorage()
-		    this.listQuery.messageType = option.messageType
-		    this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
-		    this.getUserAuthClubMessageList()
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.messageType = option.messageType
+			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
+			this.getUserAuthClubMessageList()
 		},
 		handleOrderClick(cell) {
-			const isOnliyPay = false;
-			const statusVal = [ { val: [11, 12, 13, 21, 22, 23, 111], status: true }];
-			statusVal.forEach(el => {
-				el.val.forEach(value => {
-					if (status === value) {
-						isOnliyPay = el.status
-					}
-				})
-			})
-			if(orderMessageType === 1){
-				if(isOnliyPay){
-					const payLinkMap = {
+			if (cell.orderMessageType === 1) {
+				if (this.isOnliyPay(cell)) {
+					let payLinkMap = {
 						0: `/pages/user/order/order-pay-list?orderId=${cell.orderId}`,
 						1: `/pages/user/order/order-payunder?orderId=${cell.orderId}`
 					}
-					 this.$api.navigateTo(linkJumpMap[cell.orderMessageType])
-				}else{
+					let linkJumpMap = { 1: payLinkMap[cell.onlinePayFlag] }
+					this.$api.navigateTo(linkJumpMap[cell.orderMessageType])
+				} else {
 					this.$util.msg('订单已完成支付', 2000)
 				}
-			}else{
-				const linkJumpMap = {
+			} else {
+				let linkJumpMap = {
 					2: `/pages/user/order/order-details?orderId=${cell.orderId}`,
 					3: `/pages/user/order/order-details?orderId=${cell.orderId}`,
 					4: `/pages/user/order/order-details?orderId=${cell.orderId}`,
@@ -112,6 +104,16 @@ export default {
 				}
 				this.$api.navigateTo(linkJumpMap[cell.orderMessageType])
 			}
+		},
+		isOnliyPay(cell){
+			let onliyPay = false
+			let statusVal = [11, 12, 13, 21, 22, 23, 111]
+			statusVal.forEach(value => {
+				if (cell.status === value) {
+					onliyPay = true
+				}
+			})
+			return onliyPay
 		}
 	},
 	onReachBottom() {

pages/notice/shop/mixins/notice.mixins.js

@@ -101,10 +101,10 @@ const noticeMixins = {
         noticeUsersText(cell) { // 账户通知文案
             const map = {
                 1: '您的注册信息已审核通过，恭喜您成为采美平台供应商用户。您可以上架商品到采美商城进行出售了',
-                2: `恭喜您（微信昵称：${cell.content}）成功成为【采美信息技术有限公司】的运营人员。`,
+                2: `恭喜您（微信昵称：${cell.content}）成功成为【${cell.shopName}】的运营人员。`,
                 3: '该商品上架审核未通过，暂时不能上架采美商城。请登录采美网站修改商品资料重新提交。',
                 4: '该商品新品展示审核未通过，未能展示在采美商城新品橱窗。',
-                5: `该商品的资质证书将于${cell.content}后失效，请及时登录采美网站上传新证书。`
+                5: `该商品的资质证书将于${cell.content}后失效，请及时登录采美网站上传新证书。` 
             }
             return map[cell.shopMessType]
         },