v1.7.1

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

@@ -30,7 +30,7 @@
 					<text class="swiper-item-title" v-html="item.data.title"></text>
 
 					<view class="swiper-item-main uni-column">
-						<image mode="aspectFit" style="height: 237px; margin-top: 15px; margin-bottom: 25px;"
+						<image mode="aspectFit" :style="getImageStyle2(item.data.imgParam)"
 							:src="item.data.img">
 						</image>
 					</view>
@@ -267,11 +267,31 @@
 			},
 			getImageStyle(item) {
 				let styleStr = "";
-				const width = item.width ?? "90px";
-				const height = item.height ?? "90px";
+				let width = "90px";
+				let height = "90px";
+				
+				if (item != undefined && item.width != undefined) {
+					width = item.width;
+				}
+				if (item != undefined && item.height != undefined) {
+					height = item.height;
+				}
+				
+				// const width = item.width ?? "90px";
+				// const height = item.height ?? "90px";
 				styleStr = `width: ${width}; height: ${height};`;
 				return styleStr;
 			},
+			getImageStyle2(item) {
+				let styleStr = "";
+				let height = "237px";
+				
+				if (item != undefined && item.height != undefined) {
+					height = item.height;
+				}
+				styleStr = `height: ${height}; margin-top: 15px; margin-bottom: 25px;`;
+				return styleStr;
+			},
 			getSponsorsLogoStyle(bgurl) {
 				return `background-image: url("${bgurl}")`;
 			},

card/components/my-ranklist/my-ranklist.vue

@@ -13,6 +13,7 @@
 						</view>
 						<text v-else class="item-userName">{{ teamType >= 0 ? getTeamName(teamType, item.userName) : item.userName}}</text>
 						<image class="item-inGame" v-if="item.isInGame == 1" mode="aspectFit" src="/static/common/ingame.gif"></image>
+						<text v-if="item.isDispInGameUserNum == 1 && item.inGameUserNum > 0" class="item-inGameNum">x {{item.inGameUserNum}}</text>
 					</view>
 					<text class="item-totalTime" v-if="rankType == 'totalDistance'">{{fmtDistanct(item.inRankNum)}} km</text>
 					<text class="item-totalTime" v-else-if="rankType == 'fastPace'">{{fmtPace(item.inRankNum)}}</text>
@@ -319,9 +320,16 @@
 
 	.item-inGame {
 		width: 18px;
-		height: 30px;
+		height: 25px;
 		margin-left: 3px;
 	}
+	
+	.item-inGameNum {
+		margin-top: 8px;
+		font-size: 10px;
+		font-weight: 400;
+		color: #808080;
+	}
 
 	.item-totalTime {
 		font-size: 13px;

card/manifest.json

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

card/pages/bm/style1/index.vue

@@ -51,6 +51,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 				ecDesc: '', // 卡片简介
 				beginSecond: null, // 卡片开始时间戳，单位秒
 				endSecond: null, // 卡片结束时间戳，单位秒
+				secondCardName: '', // 跳转页面名称
 				
 				isJoin: null, // 是否报名
 				isFinished: false, // 赛事是否结束
@@ -201,6 +202,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 						this.ecDesc = data.ecDesc;
 						this.beginSecond = data.beginSecond;
 						this.endSecond = data.endSecond;
+						this.secondCardName = data.secondCardName;
 						
 						this.getCountdown();
 						
@@ -330,8 +332,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						const url = `${ossUrl}#/pages/bm/style1/signup?${this.queryString}&full=true`;
-						tools.appAction(url);
+						if (this.secondCardName == 'rankList') {
+							const url = `${ossUrl}#/pages/bm/style1/rankList?${this.queryString}&full=true`;
+							tools.appAction(url);
+						} else {
+							const url = `${ossUrl}#/pages/bm/style1/signup?${this.queryString}&full=true`;
+							tools.appAction(url);
+						}
 					}
 					else {	// 赛事已结束
 						const url = `${ossUrl}#/pages/bm/style1/rankList?${this.queryString}&full=true`;

card/pages/bm/style1/rankList.vue

@@ -51,7 +51,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 				</view>
 
 				<button class="btnStart btnStart-disable" v-if="mcState==0">活动尚未开始</button>
-				<button class="btnStart btnStart-enable" v-if="mcState==1" @click="btnStart">开始比赛</button>
+				<button class="btnStart btnStart-enable" v-if="mcState==1" @click="btnStartGame">{{btnStartGameText}}</button>
 				<button class="btnStart btnStart-disable" v-if="mcState==2">活动已结束</button>
 			</view>
 			
@@ -72,6 +72,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 		apiCardConfigQuery,
 		apiUserCurrentRankNumQuery,
 		apiIsAllowMcSignUp,
+		apiUserJoinCardQuery,
 		apiUnReadMessageQuery,
 		apiReadMessage,
 		checkResCode
@@ -98,6 +99,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 				coiName: "", // 已报名单位名称，可为空
 				ocaId: 0,	// 关联id，带入到App活动详情页面
 				teamNum: 0, // 已报名队伍编号，可为0
+				
+				isJoin: null, // 是否报名
+				btnStartGameText: "",
 
 				mcState: 0 ,	// 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				allowMcSignUp: false,	// 是否允许重新分组
@@ -151,6 +155,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 		onReady() {
 			// this.dealFirstEnter();
 		},
+		onShow() {
+			this.getUserJoinCardQuery();
+		},
 		onUnload() {
 			this.clear();
 		},
@@ -482,6 +489,36 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 					},
 				});
 			},
+			// 用户是否已经报名卡片对应赛事查询
+			getUserJoinCardQuery() {
+				uni.request({
+					url: apiUserJoinCardQuery,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded",
+						"token": this.token
+					},
+					method: "POST",
+					data: {
+						ecId: this.ecId
+					},
+					success: (res) => {
+						// console.log("getUserJoinCardQuery", res)
+						const code = res.data.code;
+						const data = res.data.data;
+						if (code == 0) {
+							this.isJoin = data.isJoin;
+							if (this.isJoin) { // 已报名
+								this.btnStartGameText = "我要比赛";
+							} else {	// 未报名
+								this.btnStartGameText = "我要报名";
+							}
+						}
+					},
+					fail: (err) => {
+						console.log("getUserJoinCardQuery err", err)
+					},
+				});
+			},
 			// 未读消息列表查询
 			getUnReadMessageQuery() {
 				uni.request({
@@ -567,9 +604,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 				const url = '/pages/bm/style1/signup?' + this.queryString;
 				tools.appAction(url, "uni.navigateTo");
 			},
-			btnStart() {
-				const url = `action://to_detail/?id=${this.ocaId}&matchType=${this.mcType}`;
-				tools.appAction(url);
+			btnStartGame() {
+				if (this.isJoin) {	// 已报名
+					const url = `action://to_detail/?id=${this.ocaId}&matchType=${this.mcType}`;
+					tools.appAction(url);
+				} else {	// 未报名
+					const url = "/pages/bm/style1/signup?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				}
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);

card/pages/bm/style2/index.vue

@@ -54,6 +54,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 				ecDesc: '', // 卡片简介
 				beginSecond: null, // 卡片开始时间戳，单位秒
 				endSecond: null, // 卡片结束时间戳，单位秒
+				secondCardName: '', // 跳转页面名称
 				
 				isJoin: null, // 是否报名
 				isFinished: false, // 赛事是否结束
@@ -209,6 +210,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 						this.ecDesc = data.ecDesc;
 						this.beginSecond = data.beginSecond;
 						this.endSecond = data.endSecond;
+						this.secondCardName = data.secondCardName;
 						
 						this.getCountdown();
 						
@@ -363,8 +365,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						const url = `${ossUrl}#/pages/bm/style2/signup?${this.queryString}&full=true`;
-						tools.appAction(url);
+						if (this.secondCardName == 'rankList') {
+							const url = `${ossUrl}#/pages/bm/style2/rankList?${this.queryString}&full=true`;
+							tools.appAction(url);
+						} else {
+							const url = `${ossUrl}#/pages/bm/style2/signup?${this.queryString}&full=true`;
+							tools.appAction(url);
+						}
 					}
 					else {	// 赛事已结束
 						// const url = `${ossUrl}#/pages/bm/style2/rankOverview?${this.queryString}&full=true`;

card/pages/bm/style2/rankList.vue

@@ -31,7 +31,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 					<my-ranklist v-show="tabCurrent === 3" :rankRs="rankList.fastPaceRs" rank-type="fastPace"></my-ranklist>
 				</view>
 
-				<button class="btnBack" @click="btnStartGame">我要比赛</button>
+				<button class="btnBack" @click="btnStartGame">{{btnStartGameText}}</button>
 				<!-- <button class="btnBack" @click="btnBack">返回</button> -->
 			</view>
 			
@@ -52,6 +52,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 		apiCardConfigQuery,
 		apiUserCurrentRankNumQuery,
 		apiIsAllowMcSignUp,
+		apiUserJoinCardQuery,
 		apiUnReadMessageQuery,
 		apiReadMessage,
 		checkResCode
@@ -88,6 +89,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 				// fastPace: null, // 个人最快配速
 				// fastPaceRankNum: null, // 个人最快配速排名
 				// ocaRs: [], // 卡片对应活动集合
+				
+				isJoin: null, // 是否报名
+				btnStartGameText: "",
 
 				mcState: 0 ,	// 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				allowMcSignUp: false,	// 是否允许重新分组
@@ -142,6 +146,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 		onReady() {
 			// this.dealFirstEnter();
 		},
+		onShow() {
+			this.getUserJoinCardQuery();
+		},
 		onUnload() {
 			this.clear();
 		},
@@ -525,6 +532,36 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 					},
 				});
 			},
+			// 用户是否已经报名卡片对应赛事查询
+			getUserJoinCardQuery() {
+				uni.request({
+					url: apiUserJoinCardQuery,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded",
+						"token": this.token
+					},
+					method: "POST",
+					data: {
+						ecId: this.ecId
+					},
+					success: (res) => {
+						// console.log("getUserJoinCardQuery", res)
+						const code = res.data.code;
+						const data = res.data.data;
+						if (code == 0) {
+							this.isJoin = data.isJoin;
+							if (this.isJoin) { // 已报名
+								this.btnStartGameText = "我要比赛";
+							} else {	// 未报名
+								this.btnStartGameText = "我要报名";
+							}
+						}
+					},
+					fail: (err) => {
+						console.log("getUserJoinCardQuery err", err)
+					},
+				});
+			},
 			// 未读消息列表查询
 			getUnReadMessageQuery() {
 				uni.request({
@@ -606,11 +643,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 				tools.appAction(url);
 			},
 			btnStartGame() {
-				// uni.navigateTo({
-				// 	url: "/pages/bm/style2/rankOverview?" + this.queryString
-				// });
-				const url = "/pages/bm/style2/rankOverview?" + this.queryString;
-				tools.appAction(url, "uni.navigateTo");
+				if (this.isJoin) {	// 已报名
+					const url = "/pages/bm/style2/rankOverview?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				} else {	// 未报名
+					const url = "/pages/bm/style2/signup?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				}
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);

card/pages/bm/style3/index.vue

@@ -54,6 +54,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 				ecDesc: '', // 卡片简介
 				beginSecond: null, // 卡片开始时间戳，单位秒
 				endSecond: null, // 卡片结束时间戳，单位秒
+				secondCardName: '', // 跳转页面名称
 				
 				isJoin: null, // 是否报名
 				isFinished: false, // 赛事是否结束
@@ -209,6 +210,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 						this.ecDesc = data.ecDesc;
 						this.beginSecond = data.beginSecond;
 						this.endSecond = data.endSecond;
+						this.secondCardName = data.secondCardName;
 						
 						this.getCountdown();
 						
@@ -363,8 +365,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						const url = `${ossUrl}#/pages/bm/style3/signup?${this.queryString}&full=true`;
-						tools.appAction(url);
+						if (this.secondCardName == 'rankList') {
+							const url = `${ossUrl}#/pages/bm/style3/rankList?${this.queryString}&full=true`;
+							tools.appAction(url);
+						} else {
+							const url = `${ossUrl}#/pages/bm/style3/signup?${this.queryString}&full=true`;
+							tools.appAction(url);
+						}
 					}
 					else {	// 赛事已结束
 						// const url = `${ossUrl}#/pages/bm/style3/rankOverview?${this.queryString}&full=true`;

card/pages/bm/style3/rankList.vue

@@ -45,7 +45,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 					<my-ranklist v-show="tabCurrent === 3" :rankRs="rankList.fastPaceRs" rank-type="fastPace"></my-ranklist>
 				</view>
 
-				<button class="btnBack" @click="btnStartGame">我要比赛</button>
+				<button class="btnBack" @click="btnStartGame">{{btnStartGameText}}</button>
 				<!-- <button class="btnBack" @click="btnBack">返回</button> -->
 			</view>
 			
@@ -68,6 +68,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 		apiUserCurrentRankNumQuery,
 		apiCompStatisticQuery,
 		apiIsAllowMcSignUp,
+		apiUserJoinCardQuery,
 		apiUnReadMessageQuery,
 		apiReadMessage,
 		checkResCode
@@ -105,6 +106,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 				fastPaceRankNum: null, // 个人最快配速排名
 				// ocaRs: [], // 卡片对应活动集合
 				
+				isJoin: null, // 是否报名
+				btnStartGameText: "",
+				
 				all_totalDistance: 0, // 赛事所有人累计里程，单位米
 				all_totalRightAnswerNum: 0, // 赛事所有人正确答题数（校园文化输出）
 				all_totalAnswerNum: 0, // 赛事所有人答题数（校园文化输出）
@@ -193,6 +197,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 			// this.dealFirstEnter();
 			this.$refs.mypopupMessage.popupOpen();
 		},
+		onShow() {
+			this.getUserJoinCardQuery();
+		},
 		onUnload() {
 			this.clear();
 		},
@@ -715,6 +722,36 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 					},
 				});
 			},
+			// 用户是否已经报名卡片对应赛事查询
+			getUserJoinCardQuery() {
+				uni.request({
+					url: apiUserJoinCardQuery,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded",
+						"token": this.token
+					},
+					method: "POST",
+					data: {
+						ecId: this.ecId
+					},
+					success: (res) => {
+						// console.log("getUserJoinCardQuery", res)
+						const code = res.data.code;
+						const data = res.data.data;
+						if (code == 0) {
+							this.isJoin = data.isJoin;
+							if (this.isJoin) { // 已报名
+								this.btnStartGameText = "我要比赛";
+							} else {	// 未报名
+								this.btnStartGameText = "我要报名";
+							}
+						}
+					},
+					fail: (err) => {
+						console.log("getUserJoinCardQuery err", err)
+					},
+				});
+			},
 			// 未读消息列表查询
 			getUnReadMessageQuery() {
 				uni.request({
@@ -796,11 +833,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 				tools.appAction(url);
 			},
 			btnStartGame() {
-				// uni.navigateTo({
-				// 	url: "/pages/bm/style3/rankOverview?" + this.queryString
-				// });
-				const url = "/pages/bm/style3/rankOverview?" + this.queryString;
-				tools.appAction(url, "uni.navigateTo");
+				if (this.isJoin) {	// 已报名
+					const url = "/pages/bm/style3/rankOverview?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				} else {	// 未报名
+					const url = "/pages/bm/style3/signup?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				}
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);

card/pages/bm/style4/cardconfig.md

@@ -573,6 +573,21 @@ index卡片URL参数：type=团建活动&btnText=进入活动
 			}
 		}
 	],
+	"popupHelpConfig": {
+		"height": "539px"
+	},
+	"popupHelpList": [
+		{
+			"type": 2,
+			"data": {
+				"title": "帮助",
+				"img": "/static/common/qrcode_help.png",
+				"imgParam": {
+					"height": "370px"
+				}
+			}
+		}
+	],
 	"param": {
 		"subTitle": "山东大学123周年庆"
 	}

card/pages/bm/style4/index.vue

@@ -54,6 +54,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 				ecDesc: '', // 卡片简介
 				beginSecond: null, // 卡片开始时间戳，单位秒
 				endSecond: null, // 卡片结束时间戳，单位秒
+				secondCardName: '', // 跳转页面名称
 				
 				isJoin: null, // 是否报名
 				isFinished: false, // 赛事是否结束
@@ -209,6 +210,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 						this.ecDesc = data.ecDesc;
 						this.beginSecond = data.beginSecond;
 						this.endSecond = data.endSecond;
+						this.secondCardName = data.secondCardName;
 						
 						this.getCountdown();
 						
@@ -356,8 +358,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 				}
 				else {	// 未报名
 					if (!this.isFinished) {	// 赛事未结束
-						const url = `${ossUrl}#/pages/bm/style4/signup?${this.queryString}&full=true`;
-						tools.appAction(url);
+						if (this.secondCardName == 'rankList') {
+							const url = `${ossUrl}#/pages/bm/style4/rankList?${this.queryString}&full=true`;
+							tools.appAction(url);
+						} else {
+							const url = `${ossUrl}#/pages/bm/style4/signup?${this.queryString}&full=true`;
+							tools.appAction(url);
+						}
 					}
 					else {	// 赛事已结束
 						// const url = `${ossUrl}#/pages/bm/style4/rankOverview?${this.queryString}&full=true`;

card/pages/bm/style4/rankList.vue

@@ -57,7 +57,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 					</template>
 				</view>
 
-				<button class="btnBack" @click="btnStartGame">我要比赛</button>
+				<button class="btnBack" @click="btnStartGame">{{btnStartGameText}}</button>
 				<!-- <button class="btnBack" @click="btnBack">返回</button> -->
 			</view>
 
@@ -82,6 +82,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 		apiCardConfigQuery,
 		apiUserCurrentRankNumQuery,
 		apiIsAllowMcSignUp,
+		apiUserJoinCardQuery,
 		apiMapListQuery,
 		apiCompStatisticQuery,
 		apiUnReadMessageQuery,
@@ -111,6 +112,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				endSecond: null, // 活动或赛事结束时间戳，单位秒
 				ocaId: 0, // 关联id，带入到App活动详情页面
 				nickName: "", // 昵称
+				
+				isJoin: null, // 是否报名
+				btnStartGameText: "",
 
 				mapList: [], // 卡片对应地图列表详情
 				all_totalDistance: 0, // 赛事所有人累计里程，单位米
@@ -210,6 +214,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 		onReady() {
 			// this.dealFirstEnter();
 		},
+		onShow() {
+			this.getUserJoinCardQuery();
+		},
 		onUnload() {
 			this.clear();
 		},
@@ -948,6 +955,36 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 					},
 				});
 			},
+			// 用户是否已经报名卡片对应赛事查询
+			getUserJoinCardQuery() {
+				uni.request({
+					url: apiUserJoinCardQuery,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded",
+						"token": this.token
+					},
+					method: "POST",
+					data: {
+						ecId: this.ecId
+					},
+					success: (res) => {
+						// console.log("getUserJoinCardQuery", res)
+						const code = res.data.code;
+						const data = res.data.data;
+						if (code == 0) {
+							this.isJoin = data.isJoin;
+							if (this.isJoin) { // 已报名
+								this.btnStartGameText = "我要比赛";
+							} else {	// 未报名
+								this.btnStartGameText = "我要报名";
+							}
+						}
+					},
+					fail: (err) => {
+						console.log("getUserJoinCardQuery err", err)
+					},
+				});
+			},
 			// 未读消息列表查询
 			getUnReadMessageQuery() {
 				uni.request({
@@ -1032,8 +1069,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				// uni.navigateTo({
 				// 	url: "/pages/bm/style4/rankOverview?" + this.queryString
 				// });
-				const url = "/pages/bm/style4/rankOverview?" + this.queryString;
-				tools.appAction(url, "uni.navigateTo");
+				if (this.isJoin) {	// 已报名
+					const url = "/pages/bm/style4/rankOverview?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				} else {	// 未报名
+					const url = "/pages/bm/style4/signup?" + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
+				}
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);

card/pages/bm/style4/rankOverview.vue

@@ -18,9 +18,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 			</view>
 
 			<view class="mid uni-column">
-				<view class="mid-0 uni-row uni-jcsb">
-					<e-select class="" v-model="ocaId" :options="mapList" :search="false" :inputClick="true"
-						maxHeight="300px" :clearable="false" @change="eSelectChange"></e-select>
+				<view class="mid-0 uni-row uni-jcc">
+					<view class="mid-0-select">
+						<e-select v-model="ocaId" :options="mapList" :search="false" :inputClick="true"
+							maxHeight="300px" :clearable="false" @change="eSelectChange"></e-select>
+					</view>
+					<text v-if="popupHelpList.length > 0" class="mid-0-help" @click="btnHelp">帮助</text>
 				</view>
 				<view class="mid-1 uni-row uni-jcsa">
 					<text class="mid-1-text">{{nickName}}</text>
@@ -61,6 +64,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 			</view>
 			
 			<my-popup ref="mypopup" :config="popupRuleConfig" :dataList="popupDataList" :acttime="acttime"></my-popup>
+			<my-popup ref="mypopupHelp" :config="popupHelpConfig" :dataList="popupHelpList"></my-popup>
 			<!-- <my-popup-map ref="mypopupmap" :point="navPoint"></my-popup-map> -->
 		</view>
 	</view>
@@ -129,7 +133,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				pathList: {},
 				pathListStyle: {},
 				popupRuleConfig: {}, // 规则弹窗配置
+				popupHelpConfig: {}, // 帮助弹窗配置
 				popupDataList: [],
+				popupHelpList: [],
 				navPoint: {},
 				configParam: {
 					subTitle: ""
@@ -310,6 +316,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				}
 				// console.log("[loadConfig] popupRuleConfig:", this.popupRuleConfig);
 				
+				// 加载帮助弹窗配置
+				const popupHelpConfig = config.popupHelpConfig;
+				if (popupHelpConfig != undefined) {
+					this.popupHelpConfig = popupHelpConfig;
+				}
+				// console.log("[loadConfig] popupHelpConfig:", this.popupHelpConfig);
+				
 				// 加载弹窗数据
 				const popupDataList = config.popupDataList;
 				// console.log("[loadConfig] popupDataList:", popupDataList);
@@ -330,6 +343,16 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				}
 				// console.log("[loadConfig] popupDataList:", this.popupDataList);
 				
+				// 加载弹窗(帮助)数据
+				const popupHelpList = config.popupHelpList;
+				if (popupHelpList != undefined && popupHelpList.length > 0) {
+					for (var i = 0; i < popupHelpList.length; i++) {
+						// console.log("[loadConfig] popupHelpList", i, popupHelpList[i]);
+						this.popupHelpList.push(popupHelpList[i]);
+					}
+				}
+				// console.log("[loadConfig] popupHelpList:", this.popupHelpList);
+				
 				// 加载页面参数
 				const param = config.param;
 				if (param != undefined) {
@@ -717,6 +740,21 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 									}
 								}
 							],
+							"popupHelpConfig": {
+								"height": "539px"
+							},
+							"popupHelpList": [
+								{
+									"type": 2,
+									"data": {
+										"title": "帮助",
+										"img": "/static/common/qrcode_help.png",
+										"imgParam": {
+											"height": "370px"
+										}
+									}
+								}
+							],
 							"param": {
 								"subTitle": "山东大学123周年庆"
 							}
@@ -862,6 +900,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				// console.log(this.$refs.mypopup);
 				this.$refs.mypopup.popupOpen();
 			},
+			btnHelp() {
+				this.$refs.mypopupHelp.popupOpen();
+			},
 			btnReGroup() {
 				this.queryObj.from = "rankOverview";
 				this.queryString = tools.objectToQueryString(this.queryObj);
@@ -1002,17 +1043,28 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 	}
 
 	.mid-0 {
-		width: 56%;
+		width: 90%;
 		margin: 12px;
+	}
+	
+	.mid-0-select {
+		width: 60%;
 		font-weight: 500;
 		color: #8e8e8e;
 		font-size: 14px;
 	}
+	
+	.mid-0-help {
+		position: absolute;
+		right: 30px;
+		font-size: 12px;
+		font-weight: 500;
+		color: #992900;
+	}
 
 	.mid-1 {
 		width: 90%;
 		margin-bottom: 12px;
-
 	}
 
 	.mid-1-text {