v1.7.2

card/components/my-popup/my-popup.vue

@@ -124,9 +124,12 @@
 							v-html="item.data.message"></text>
 					</view>
 
-					<button v-if="index < dataList.length - 1" class="swiper-item-button" @click="swiperNext">继
+					<button v-if="index < dataList.length - 1" class="swiper-item-button" style="width: 50%;" @click="swiperNext">继
 						续</button>
-					<button v-else class="swiper-item-button" @click="popupClose">确 定</button>
+					<view v-else class="uni-row" style="width: 100%;">
+						<button class="swiper-item-button" style="width: 50%;" @click="popupClose">确 定</button>
+						<text class="swiper-item-noMoreReminders" @click="onNoMoreRemindersClick">不再提醒</text>
+					</view>
 				</view>
 
 				<!-- 标题 + HTML内容 + 图片(可为空) -->
@@ -211,6 +214,7 @@
 				})
 			}
 		},
+		emits: ['popup-close', 'noMoreRemindersClick'],
 		data() {
 			return {
 				swiperCurrent: 0, // swiper当前所在滑块的 index
@@ -295,6 +299,9 @@
 			getSponsorsLogoStyle(bgurl) {
 				return `background-image: url("${bgurl}")`;
 			},
+			onNoMoreRemindersClick() {
+				this.$emit('noMoreRemindersClick');
+			},
 			// getTeamName(teamType, teamIndex) {
 			// 	return teamName[teamType][teamIndex];
 			// },
@@ -462,7 +469,28 @@
 		background-color: #2e85ec;
 		border-radius: 27px;
 	}
-
+	
+	.swiper-item-button2 {
+		width: 50%;
+		height: 38px;
+		margin-bottom: 25px;
+		color: #ffffff;
+		/* font-weight: bold; */
+		line-height: 38px;
+		background-color: #2e85ec;
+		border-radius: 27px;
+	}
+	
+	.swiper-item-noMoreReminders {
+		position: absolute;
+		right: 10px;
+		width: 80px;
+		font-size: 12px;
+		margin-bottom: 25px;
+		text-align: center;
+		text-decoration: underline;
+	}
+	
 	.acttime {
 		font-weight: 550;
 		color: #333333;
@@ -501,7 +529,7 @@
 		background-size: contain;
 		// background-size: 100% auto;
 	}
-	
+		
 	::v-deep .uni-swiper-dots-horizontal {
 		bottom: 75px;
 	}

card/manifest.json

@@ -2,8 +2,8 @@
     "name" : "card",
     "appid" : "__UNI__A61F96B",
     "description" : "",
-    "versionName" : "1.7.1",
-    "versionCode" : 171,
+    "versionName" : "1.7.2",
+    "versionCode" : 172,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

card/pages/bm/style1/rankList.vue

@@ -56,7 +56,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 			</view>
 			
 			<my-popup ref="mypopup" :config="popupRuleConfig" :dataList="popupDataList" :acttime="acttime"></my-popup>
-			<my-popup ref="mypopupMessage" :dataList="popupMessageList"></my-popup>
+			<my-popup ref="mypopupMessage" :dataList="popupMessageList" @noMoreRemindersClick="onNoMoreRemindersClick"></my-popup>
 			
 		</view>
 	</view>
@@ -560,7 +560,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 								console.log("messageValue:", messageValue);
 								if (!messageValue) {
 									this.$refs.mypopupMessage.popupOpen();
-									uni.setStorageSync(this.messageKey, true);
+									// uni.setStorageSync(this.messageKey, true);
 								}
 							}
 						}
@@ -570,6 +570,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 					},
 				});
 			},
+			onNoMoreRemindersClick() {
+				this.$refs.mypopupMessage.popupClose();
+				uni.setStorageSync(this.messageKey, true);
+			},
 			// 标记消息已读
 			readMessage() {
 				uni.request({

card/pages/bm/style2/rankList.vue

@@ -36,7 +36,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 			</view>
 			
 			<my-popup ref="mypopup" :config="popupRuleConfig" :dataList="popupDataList" :acttime="acttime"></my-popup>
-			<my-popup ref="mypopupMessage" :dataList="popupMessageList"></my-popup>
+			<my-popup ref="mypopupMessage" :dataList="popupMessageList" @noMoreRemindersClick="onNoMoreRemindersClick"></my-popup>
 			
 		</view>
 	</view>
@@ -603,7 +603,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 								console.log("messageValue:", messageValue);
 								if (!messageValue) {
 									this.$refs.mypopupMessage.popupOpen();
-									uni.setStorageSync(this.messageKey, true);
+									// uni.setStorageSync(this.messageKey, true);
 								}
 							}
 						}
@@ -613,6 +613,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 					},
 				});
 			},
+			onNoMoreRemindersClick() {
+				this.$refs.mypopupMessage.popupClose();
+				uni.setStorageSync(this.messageKey, true);
+			},
 			// 标记消息已读
 			readMessage() {
 				uni.request({

card/pages/bm/style3/rankList.vue

@@ -51,7 +51,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 			
 			<my-popup ref="mypopup" :config="popupRuleConfig" :dataList="popupDataList" :acttime="acttime"></my-popup>
 			<my-popup ref="mypopupExchg" :config="popupExchgConfig" :dataList="popupExchgList"></my-popup>
-			<my-popup ref="mypopupMessage" :dataList="popupMessageList"></my-popup>
+			<my-popup ref="mypopupMessage" :dataList="popupMessageList" @noMoreRemindersClick="onNoMoreRemindersClick"></my-popup>
 			
 		</view>
 	</view>
@@ -195,7 +195,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 		// 页面初次渲染完成，此时组件已挂载完成，DOM 树($el)已可用
 		onReady() {
 			// this.dealFirstEnter();
-			this.$refs.mypopupMessage.popupOpen();
+			// this.$refs.mypopupMessage.popupOpen();
 		},
 		onShow() {
 			this.getUserJoinCardQuery();
@@ -793,7 +793,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 								console.log("messageValue:", messageValue);
 								if (!messageValue) {
 									this.$refs.mypopupMessage.popupOpen();
-									uni.setStorageSync(this.messageKey, true);
+									// uni.setStorageSync(this.messageKey, true);
 								}
 							}
 						}
@@ -803,6 +803,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 					},
 				});
 			},
+			onNoMoreRemindersClick() {
+				this.$refs.mypopupMessage.popupClose();
+				uni.setStorageSync(this.messageKey, true);
+			},
 			// 标记消息已读
 			readMessage() {
 				uni.request({

card/pages/bm/style4/rankList.vue

@@ -63,7 +63,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 
 			<my-popup ref="mypopup" :config="popupRuleConfig" :dataList="popupDataList" :acttime="acttime"></my-popup>
 			<my-popup ref="mypopupExchg" :config="popupExchgConfig" :dataList="popupExchgList"></my-popup>
-			<my-popup ref="mypopupMessage" :dataList="popupMessageList"></my-popup>
+			<my-popup ref="mypopupMessage" :dataList="popupMessageList" @noMoreRemindersClick="onNoMoreRemindersClick"></my-popup>
 
 		</view>
 	</view>
@@ -504,7 +504,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 											"height": "30px"
 										},
 										"title": "赛事规则",
-										"content": "<p style='margin-bottom:12px;'>① 选择所在校区，参赛时间自由、路线随机</p> <p style='margin-bottom:12px;'>② 准确填报院系，共筑个人与院系荣耀</p> <p style='margin-bottom:12px;'>③ 打点1次1积分，途经点正确答题1积分，多次完赛，点数累加</p> <p style='margin-bottom:12px;'>④ 正常完赛累计积分，未完赛积分不计入</p>",
+										"content": "<p style='margin-bottom:12px;'>① 选择所在校区，参赛时间自由、路线随机</p> <p style='margin-bottom:12px;'>② 准确填报院系，共筑个人与院系荣耀</p> <p style='margin-bottom:12px;'>③ 打点1次1积分，途经点正确答题1积分，多次完赛，点数累加</p> <p style='margin-bottom:12px;'>④ 正常完赛累计积分，未完赛积分不计入</p>⑤ 请勿借助骑行工具参赛",
 										"imageList": []
 									}
 								},
@@ -703,6 +703,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 									}
 								},
 							],
+							
 							"param": {
 								"labelRightAnswerNum": "文化输出"
 							}
@@ -1014,19 +1015,34 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 								popupData.data.title = unReadMessageRs[i].mqTitle;
 								popupData.data.message = unReadMessageRs[i].mqMessage;
 								this.popupMessageList.push(popupData);
-
+								
 								// this.mqIdListStr += this.unReadMessageRs[i].mqId;
 								// if (i < this.unReadMessageRs.length - 1) {
 								// 	this.mqIdListStr += ",";
 								// }
 							}
+							
+							// this.popupMessageList.push(
+							// 	{
+							// 		type: 6,	// 6: 通知
+							// 		data: {
+							// 			mqType: 3,
+							// 			title: "特别提醒",
+							// 			message: `本次比赛的目的为体验校园文化，提升身体素质，让大家感受和熟悉定向运动魅力及技巧。<br>
+							// 			在此特别提醒：<br>
+							// 			无论是驰骋校园，还是漫步秋色，<b>“勿以轮带步，唯愿步量途”。让我们用脚步来丈量这片共同热爱的家园</b>，见证山大123周年的辉煌时刻！<br>
+							// 			<div style='text-align: right;'>山东大学体育委员会</div>`
+							// 			}
+							// 	}
+							// );
+							// console.log("popupMessageList", this.popupMessageList);
 
 							if (this.popupMessageList.length > 0) {
 								const messageValue = uni.getStorageSync(this.messageKey);
 								console.log("messageValue:", messageValue);
 								if (!messageValue) {
 									this.$refs.mypopupMessage.popupOpen();
-									uni.setStorageSync(this.messageKey, true);
+									// uni.setStorageSync(this.messageKey, true);
 								}
 							}
 						}
@@ -1036,6 +1052,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 					},
 				});
 			},
+			onNoMoreRemindersClick() {
+				this.$refs.mypopupMessage.popupClose();
+				uni.setStorageSync(this.messageKey, true);
+			},
 			// 标记消息已读
 			readMessage() {
 				uni.request({