Merge branch 'dk-dev' of http://39.101.143.165:8090/dong_k/zhapp into dk-dev

App.vue

@@ -1,9 +1,6 @@
 <script>
 export default {
 	onLaunch: function () {
-
-	},
-	async onShow() {
 		const getMessageCount = async () => {
 			if(!this.$store.state.token) return
 			let res = await this.$http.get('/message/getMessageCount')
@@ -18,6 +15,8 @@ export default {
 			getMessageCount()
 		}, 30000);
 	},
+	async onShow() {
+	},
 	onHide: function () { }
 }
 </script>

pages/message/message.vue

@@ -95,6 +95,14 @@
 			</view>
 		</view>
 		<u-loadmore :status="status" />
+
+		
+		<u-popup :show="qrcodePopup" mode="center" round="20rpx" closeable mask-close-able @close="qrcodePopup = false">
+			<div class="popup-content">
+				<image :src="qrcode" style="width:400rpx;height:400rpx" mode=""></image>
+				<div class="text">请截图扫码后进行抽奖</div>
+			</div>
+		</u-popup>
 	</view>
 </template>
 
@@ -131,6 +139,9 @@ export default {
 			},
 			totalPages: 0, //数据总页数
 			datalist: [], //消息数据列表
+
+			qrcodePopup: false, //二维码弹窗
+			qrcode: '', //二维码
 		}
 	},
 	onShow() {
@@ -182,6 +193,10 @@ export default {
 						val.activityId = obj.eventId
 						val.localActivityTableId = obj.localActivityTableId
 					}
+					if (['template_14'].includes(val.tplCode)) {
+						val.content = obj.message
+						val.qrcode = obj.qrcode
+					}
 
 					return val;
 				})
@@ -191,12 +206,15 @@ export default {
 		},
 		// 
 		detailClick(item) {
-			console.log("🚀 ~ item:", item)
 			if (item.tplCode === 'template_13') {
 				uni.navigateTo({
 					url: '/pages/lottery/index?activityId=' + item.activityId + '&localActivityTableId=' + item.localActivityTableId,
 				})
 			}
+			if (item.tplCode === 'template_14') {
+				this.qrcodePopup = true
+				this.qrcode = item.qrcode
+			}
 		},
 		//设置已读
 		async markAsRead(type) {
@@ -356,4 +374,18 @@ page {
 		}
 	}
 }
+
+.popup-content {
+	width: 500rpx;
+	padding: 40rpx;
+	border-radius: 20rpx;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+
+	.text {
+		margin-top: 20rpx;
+	}
+}
 </style>