v1.5.3

card/common/api.js

@@ -3,8 +3,9 @@ export const apiServer = process.env.API_BASE_URL;
 // console.log("ossUrl", ossUrl);
 // console.log("apiServer", apiServer);
 
-// export const token = '';
-export const token = '96ba3c924394934f7d30fa869a94ce0d';
+export const token = '';
+// export const token = '96ba3c924394934f7d30fa869a94ce0d';
+// export const token = 'c50350b7be4c2a49221c29944de13443';
 
 // 卡片基本信息查询
 export const apiCardBaseQuery = apiServer + 'CardBaseQuery';

card/common/tools.js

@@ -1,12 +1,48 @@
 var tools = {
 	
+	// 对url追加项目版本号，用于页面更新后用户端的强制刷新
+	// 每次页面变更必须更新项目版本号
+	urlAddVer(url) {
+		let newUrl = url;
+		
+		// 获取当前app的版本
+		const systemInfo = uni.getSystemInfoSync();
+		
+		// #ifdef H5
+		const version_number = systemInfo.appVersion;
+		// console.log('版本号：', version_number);
+		
+		if (newUrl.indexOf('_v=') !== -1) {
+			return newUrl;
+		}
+		
+		if (newUrl.indexOf('?') !== -1) {
+			newUrl += "&_v=" + version_number;
+		} else {
+			newUrl += "?_v=" + version_number;
+		}
+		// #endif
+		
+		console.log("[urlAddVer] newUrl", newUrl);
+		return newUrl;
+	},
+	
 	// 导航到彩图奔跑APP内的某个页面或执行APP内部的某些功能
-	appAction(url) {
+	appAction(url, actType="") {
 		console.log("appAction", url);
 		// console.log("getApp", getApp());
 		// getApp().$audio.destroy();
 		// getApp().$audio.pause();
-		window.location.href = url;
+		
+		if (url.indexOf('http') !== -1) {	// http 或 https 开头的网址
+			window.location.href = this.urlAddVer(url);
+		} else if (actType == "uni.navigateTo") {
+			uni.navigateTo({
+				url: this.urlAddVer(url)
+			});
+		} else {
+			window.location.href = url;
+		}
 	},
 	
 	// 格式化赛事时间 09-09 16:48

card/components/my-pathList/my-pathList.vue

@@ -78,7 +78,6 @@
 						this.$refs.alertDialog.open();
 					} else {
 						const url = `action://to_detail/?id=${item.path.ocaId}&matchType=${item.path.mcType}`;
-						// window.location.href = url;
 						tools.appAction(url);
 						this.$emit('onPathClick', item);
 					}
@@ -102,13 +101,11 @@
 
 				const url =
 					`action://to_map_app?title=${this.navPoint.name}&latitude=${this.navPoint.latitude}&longitude=${this.navPoint.longitude}`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			dialogConfirm() {
 				const item = this.alertDialog.data;
 				const url = `action://to_detail/?id=${item.path.ocaId}&matchType=${item.path.mcType}`;
-				// window.location.href = url;
 				tools.appAction(url);
 				this.$emit('onPathClick', item);
 			},

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

@@ -109,7 +109,10 @@
 			},
 			// 格式化 配速
 			fmtPace(val) {
-				return tools.convertSecondsToHMS(val, 2);
+				if (val > 0)
+					return tools.convertSecondsToHMS(val, 2);
+				else
+					return '--';
 			},
 			// 排名上升
 			moveRankUp(i, animation = false) {

card/manifest.json

@@ -2,8 +2,8 @@
     "name" : "card",
     "appid" : "__UNI__A61F96B",
     "description" : "",
-    "versionName" : "1.5.1",
-    "versionCode" : 151,
+    "versionName" : "1.5.3",
+    "versionCode" : 153,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

card/pages/achievement/index.vue

@@ -277,7 +277,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index
 			test() {
 				// this.$refs.mypopupmap.popupOpen();
 				const url = `action://to_map_app?title=${this.point.name}&latitude=${this.point.latitude}&longitude=${this.point.longitude}`;
-				// window.location.href = url;
 				tools.appAction(url);
 			}
 		}

card/pages/achievement/index2.vue

@@ -8,9 +8,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 		<view class="content uni-column">
 			<view class="topbar uni-row">
 				<uni-icons v-if="showBack" type="left" class="topbar-back" @click="btnBack"></uni-icons>
-				<text v-else></text>
+				<text class="topbar-back" v-else></text>
 				<text>成就</text>
-				<text style="color: rgba(46, 133, 236, 1);"></text>
+				<text class="topbar-back"></text>
 			</view>
 			
 			<my-tab ref="tab1" :initActIndex="tabCurrent" :tabItems="tabItems" :type="1" @onTabClick="onTabClick"></my-tab>
@@ -21,7 +21,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 					<view class="norecord" v-if="challengeRs == null || challengeRs.length == 0">暂无记录</view>
 					<view class="uni-column" v-for="(item, index) in challengeRs" :key="index">
 						<text class="year">{{item.year}}</text>
-						<view class="list uni-row">
+						<view class="norecord2" v-if="item.monthRs == null || item.monthRs.length == 0">暂无记录</view>
+						<view class="list uni-row" v-else>
 							<view class="item uni-column" v-for="(item2, index2) in item.monthRs" :key="index2">
 								<view class="item-cup" :style="getCupStyle('cup', item2.month)">
 									<view class="item-cup-gray"
@@ -43,7 +44,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 					<view class="norecord" v-if="activityRs == null || activityRs.length == 0">暂无记录</view>
 					<view class="uni-column" v-for="(item, index) in activityRs" :key="index">
 						<text class="year">{{item.year}}</text>
-						<view class="list uni-row">
+						<view class="norecord2" v-if="item.aiRs == null || item.aiRs.length == 0">暂无记录</view>
+						<view class="list uni-row" v-else>
 							<view class="item item-bg uni-column" v-for="(item2, index2) in item.aiRs" :key="index2"
 								@click="showAchDetail(item2)">
 								<view class="item-medal" :style="getMedalStyle(item2.iconUrl)"></view>
@@ -61,7 +63,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 					<view class="norecord" v-if="exchangeRs == null || exchangeRs.length == 0">暂无记录</view>
 					<view class="uni-column" v-for="(item, index) in exchangeRs" :key="index">
 						<text class="year">{{item.year}}</text>
-						<view class="list uni-row">
+						<view class="norecord2" v-if="item.aiRs == null || item.aiRs.length == 0">暂无记录</view>
+						<view class="list uni-row" v-else>
 							<view class="item uni-column"
 								:class="item2.exState==1 ? 'item-convertible' : 'item-converted'"
 								v-for="(item2, index2) in item.aiRs" :key="index2" @click="showAchDetail(item2)">
@@ -438,7 +441,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 				// this.$refs.mypopupmap.popupOpen();
 				const url =
 					`action://to_map_app?title=${this.point.name}&latitude=${this.point.latitude}&longitude=${this.point.longitude}`;
-				// window.location.href = url;
 				tools.appAction(url);
 			}
 		}
@@ -455,7 +457,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 
 	.topbar {
 		width: 90%;
-		margin-top: 72rpx;
+		margin-top: 80rpx;
 		justify-content: space-between;
 		font-weight: 550;
 		color: #333333;
@@ -484,6 +486,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/index2
 		line-height: 80vh;
 	}
 
+	.norecord2 {
+		font-weight: 500;
+		color: #818181;
+		font-size: 14px;
+		text-align: center;
+		line-height: 36px;
+	}
+	
 	.year {
 		width: 100%;
 		margin-left: 20rpx;

card/pages/bm/style1/index.vue

@@ -170,14 +170,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 					const dif = this.endSecond - now;
 					// const dif = 3600*24 - 60;
 					if (dif > 0) {
-						this.countdown = tools.convertSecondsToDHM(dif);
+						this.countdown = "距结束 " + tools.convertSecondsToDHM(dif);
 					} else {
 						this.countdown = "已结束";
 						this.isFinished = true;
 					}
 					// this.countdown = tools.convertSecondsToHMS(dif);
 				} else {
-					this.countdown = "--天--小时";
+					this.countdown = "距结束 --天--小时";
 				}
 			},
 			// 卡片基本信息查询
@@ -322,17 +322,20 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/rankList?full=true&' + this.queryString
 					// });
-					window.location.href = `${ossUrl}#/pages/bm/style1/rankList?${this.queryString}&full=true`;
+					const url = `${ossUrl}#/pages/bm/style1/rankList?${this.queryString}&full=true`;
+					tools.appAction(url);
 				}
 				else {	// 未报名
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						window.location.href = `${ossUrl}#/pages/bm/style1/signup?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style1/signup?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 					else {	// 赛事已结束
-						window.location.href = `${ossUrl}#/pages/bm/style1/rankOverview?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style1/rankList?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 				}
 				

card/pages/bm/style1/rankList.vue

@@ -471,19 +471,19 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/rankList
 			btnBack() {
 				// window.history.back();
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnReGroup() {
 				this.queryObj.from = "rankList";
 				this.queryString = tools.objectToQueryString(this.queryObj);
-				uni.navigateTo({
-					url: '/pages/bm/style1/signup?' + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: '/pages/bm/style1/signup?' + this.queryString
+				// });
+				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}`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnInfo() {

card/pages/bm/style1/signup.vue

@@ -469,9 +469,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/signup
 								duration: 3000
 							});
 
-							uni.navigateTo({
-								url: '/pages/bm/style1/rankList?' + this.queryString
-							});
+							// uni.navigateTo({
+							// 	url: '/pages/bm/style1/rankList?' + this.queryString
+							// });
+							const url = '/pages/bm/style1/rankList?' + this.queryString;
+							tools.appAction(url, "uni.navigateTo");
 						}
 					},
 					fail: (err) => {
@@ -488,12 +490,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/signup
 				// console.log("from:", this.from)
 				if (this.from != '') {
 					// window.history.back();
-					uni.navigateTo({
-						url: '/pages/bm/style1/rankList?' + this.queryString
-					});
+					// uni.navigateTo({
+					// 	url: '/pages/bm/style1/rankList?' + this.queryString
+					// });
+					const url = '/pages/bm/style1/rankList?' + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
 				} else {
 					const url = `action://to_home/`;
-					// window.location.href = url;
 					tools.appAction(url);
 				}
 			},
@@ -609,9 +612,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/signup
 	}
 
 	.toptime {
+		/* width: 90%; */
 		height: 65rpx;
 		margin-top: 20rpx;
-		padding: 0 50rpx;
+		padding: 0 36rpx;
 		justify-content: space-evenly;
 		background-color: white;
 		border-radius: 40rpx;

card/pages/bm/style2/index.vue

@@ -178,14 +178,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 					const dif = this.endSecond - now;
 					// const dif = 3600*24 - 60;
 					if (dif > 0) {
-						this.countdown = tools.convertSecondsToDHM(dif);
+						this.countdown = "距结束 " + tools.convertSecondsToDHM(dif);
 					} else {
 						this.countdown = "已结束";
 						this.isFinished = true;
 					}
 					// this.countdown = tools.convertSecondsToHMS(dif);
 				} else {
-					this.countdown = "--天--小时";
+					this.countdown = "距结束 --天--小时";
 				}
 			},
 			// 卡片基本信息查询
@@ -357,19 +357,22 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/rankList?full=true&' + this.queryString
 					// });
-					// window.location.href = `${ossUrl}#/pages/bm/style2/rankOverview?${this.queryString}&full=true`;
-					window.location.href = `${ossUrl}#/pages/bm/style2/rankList?${this.queryString}&full=true`;
+					// const url = `${ossUrl}#/pages/bm/style2/rankOverview?${this.queryString}&full=true`;
+					const url = `${ossUrl}#/pages/bm/style2/rankList?${this.queryString}&full=true`;
+					tools.appAction(url);
 				}
 				else {	// 未报名
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						window.location.href = `${ossUrl}#/pages/bm/style2/signup?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style2/signup?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 					else {	// 赛事已结束
-						// window.location.href = `${ossUrl}#/pages/bm/style2/rankOverview?${this.queryString}&full=true`;
-						window.location.href = `${ossUrl}#/pages/bm/style2/rankList?${this.queryString}&full=true`;
+						// const url = `${ossUrl}#/pages/bm/style2/rankOverview?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style2/rankList?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 				}
 			}

card/pages/bm/style2/rankList.vue

@@ -518,13 +518,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 				// });
 				
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnStartGame() {
-				uni.navigateTo({
-					url: "/pages/bm/style2/rankOverview?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style2/rankOverview?" + this.queryString
+				// });
+				const url = "/pages/bm/style2/rankOverview?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);

card/pages/bm/style2/rankOverview.vue

@@ -490,12 +490,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankOverview
 			btnBack() {
 				// window.history.back();
 				// const url = `action://to_home/`;
-				// window.location.href = url;
 				// tools.appAction(url);
 
-				uni.navigateTo({
-					url: "/pages/bm/style2/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style2/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style2/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);
@@ -504,9 +505,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankOverview
 			onOverviewClick(ovtype) {
 				this.queryObj.ovtype = ovtype;
 				this.queryString = tools.objectToQueryString(this.queryObj);
-				uni.navigateTo({
-					url: "/pages/bm/style2/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style2/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style2/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 		}
 	}

card/pages/bm/style2/signup.vue

@@ -468,10 +468,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/signup
 								duration: 3000
 							});
 
-							uni.navigateTo({
-								// url: '/pages/bm/style2/rankOverview?' + this.queryString
-								url: '/pages/bm/style2/rankList?' + this.queryString
-							});
+							// uni.navigateTo({
+							// 	// url: '/pages/bm/style2/rankOverview?' + this.queryString
+							// 	url: '/pages/bm/style2/rankList?' + this.queryString
+							// });
+							const url = '/pages/bm/style2/rankList?' + this.queryString;
+							tools.appAction(url, "uni.navigateTo");
 						}
 					},
 					fail: (err) => {
@@ -488,12 +490,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/signup
 				// console.log("from:", this.from)
 				if (this.from != '') {
 					// window.history.back();
-					uni.navigateTo({
-						url: '/pages/bm/style2/rankList?' + this.queryString
-					});
+					// uni.navigateTo({
+					// 	url: '/pages/bm/style2/rankList?' + this.queryString
+					// });
+					const url = '/pages/bm/style2/rankList?' + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
 				} else {
 					const url = `action://to_home/`;
-					// window.location.href = url;
 					tools.appAction(url);
 				}
 			},
@@ -576,10 +579,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/signup
 	}
 
 	.timebar {
-		width: 80%;
+		width: 90%;
 		height: 65rpx;
 		margin-top: 20rpx;
-		padding: 0 50rpx;
+		padding: 0 30rpx;
 		justify-content: space-evenly;
 		background: #ffffff;
 		border: 0.5px solid;

card/pages/bm/style3/index.vue

@@ -178,14 +178,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 					const dif = this.endSecond - now;
 					// const dif = 3600*24 - 60;
 					if (dif > 0) {
-						this.countdown = tools.convertSecondsToDHM(dif);
+						this.countdown = "距结束 " + tools.convertSecondsToDHM(dif);
 					} else {
 						this.countdown = "已结束";
 						this.isFinished = true;
 					}
 					// this.countdown = tools.convertSecondsToHMS(dif);
 				} else {
-					this.countdown = "--天--小时";
+					this.countdown = "距结束 --天--小时";
 				}
 			},
 			// 卡片基本信息查询
@@ -357,19 +357,22 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/rankList?full=true&' + this.queryString
 					// });
-					// window.location.href = `${ossUrl}#/pages/bm/style3/rankOverview?${this.queryString}&full=true`;
-					window.location.href = `${ossUrl}#/pages/bm/style3/rankList?${this.queryString}&full=true`;
+					// const url = `${ossUrl}#/pages/bm/style3/rankOverview?${this.queryString}&full=true`;
+					const url = `${ossUrl}#/pages/bm/style3/rankList?${this.queryString}&full=true`;
+					tools.appAction(url);
 				}
 				else {	// 未报名
 					// uni.reLaunch({
 					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
 					// });
 					if (!this.isFinished) {	// 赛事未结束
-						window.location.href = `${ossUrl}#/pages/bm/style3/signup?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style3/signup?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 					else {	// 赛事已结束
-						// window.location.href = `${ossUrl}#/pages/bm/style3/rankOverview?${this.queryString}&full=true`;
-						window.location.href = `${ossUrl}#/pages/bm/style3/rankList?${this.queryString}&full=true`;
+						// const url = `${ossUrl}#/pages/bm/style3/rankOverview?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style3/rankList?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 				}
 			}

card/pages/bm/style3/rankList.vue

@@ -23,9 +23,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 			</view>
 			<view class="main uni-column">
 				<view class="main-bar uni-row uni-jcse">
-					<text>总距离：{{fmtDistanct(totalDistanct)}}km</text>
-					<text>总打点数：{{totalCp}}个</text>
-					<text>总百味豆数：{{totalSysPoint}}个</text>
+					<text>总距离：{{fmtDistanct(all_totalDistance)}}km</text>
+					<text>总打点数：{{all_totalCp}}个</text>
+					<text>总百味豆数：{{all_totalSysPoint}}个</text>
 				</view>
 				
 				<uni-segmented-control class="main-tab" :current="tabCurrent" :values="tabItems"
@@ -64,6 +64,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 		apiCardRankDetailQuery,
 		apiCardConfigQuery,
 		apiUserCurrentRankNumQuery,
+		apiCompStatisticQuery,
 		apiIsAllowMcSignUp,
 		checkResCode
 	} from '/common/api';
@@ -98,6 +99,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 				fastPace: null, // 个人最快配速
 				fastPaceRankNum: null, // 个人最快配速排名
 				// ocaRs: [], // 卡片对应活动集合
+				
+				all_totalDistance: 0, // 赛事所有人累计里程，单位米
+				all_totalRightAnswerNum: 0, // 赛事所有人正确答题数（校园文化输出）
+				all_totalCp: 0, // 赛事中所有人打点数
+				all_totalSysPoint: 0, // 赛事中所有人百味豆
+				
 
 				mcState: 0 ,	// 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				allowMcSignUp: false,	// 是否允许重新分组
@@ -490,6 +497,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 				
 							this.getCountdown();
 							this.getActtime();
+							this.compStatisticQuery();
 							this.getCardRankDetailQuery();
 				
 							this.clear();
@@ -528,6 +536,33 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 					},
 				});
 			},
+			// 赛事总成绩统计查询
+			compStatisticQuery() {
+				uni.request({
+					url: apiCompStatisticQuery,
+					header: {
+						"Content-Type": "application/x-www-form-urlencoded",
+						"token": this.token,
+					},
+					method: "POST",
+					data: {
+						mcId: this.mcId
+					},
+					success: (res) => {
+						console.log("compStatisticQuery", res);
+						if (res.data.code == 0) {
+							const data = res.data.data;
+							this.all_totalDistance = data.totalDistance;
+							this.all_totalRightAnswerNum = data.totalRightAnswerNum;
+							this.all_totalCp = data.totalCp;
+							this.all_totalSysPoint = data.totalSysPoint;
+						}
+					},
+					fail: (err) => {
+						console.log("compStatisticQuery err", err);
+					},
+				});
+			},
 			// 卡片用户当前排名查询
 			// getUserCurrentRankNumQuery() {
 			// 	uni.request({
@@ -584,22 +619,25 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 				}); */
 				
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnStartGame() {
-				uni.navigateTo({
-					url: "/pages/bm/style3/rankOverview?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style3/rankOverview?" + this.queryString
+				// });
+				const url = "/pages/bm/style3/rankOverview?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);
 				this.$refs.mypopup.popupOpen();
 			},
 			btnMyEgg() {
-				uni.navigateTo({
-					url: "/pages/achievement/index2?tabCurrent=2&" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/achievement/index2?tabCurrent=2&" + this.queryString
+				// });
+				const url = "/pages/achievement/index2?tabCurrent=2&" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnExchg() {
 				this.$refs.mypopupExchg.popupOpen();

card/pages/bm/style3/rankOverview.vue

@@ -525,12 +525,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankOverview
 			},
 			btnBack() {
 				// const url = `action://to_home/`;
-				// window.location.href = url;
 				// tools.appAction(url);
 
-				uni.navigateTo({
-					url: "/pages/bm/style3/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style3/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style3/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);
@@ -539,9 +540,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankOverview
 			onOverviewClick(ovtype) {
 				this.queryObj.ovtype = ovtype;
 				this.queryString = tools.objectToQueryString(this.queryObj);
-				uni.navigateTo({
-					url: "/pages/bm/style3/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style3/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style3/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 		}
 	}

card/pages/bm/style3/signup.vue

@@ -471,10 +471,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/signup
 								duration: 3000
 							});
 
-							uni.navigateTo({
-								// url: '/pages/bm/style3/rankOverview?' + this.queryString
-								url: '/pages/bm/style3/rankList?' + this.queryString
-							});
+							// uni.navigateTo({
+							// 	// url: '/pages/bm/style3/rankOverview?' + this.queryString
+							// 	url: '/pages/bm/style3/rankList?' + this.queryString
+							// });
+							const url = '/pages/bm/style3/rankList?' + this.queryString;
+							tools.appAction(url, "uni.navigateTo");
 						}
 					},
 					fail: (err) => {
@@ -491,12 +493,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/signup
 				// console.log("from:", this.from)
 				if (this.from != '') {
 					// window.history.back();
-					uni.navigateTo({
-						url: '/pages/bm/style3/rankList?' + this.queryString
-					});
+					// uni.navigateTo({
+					// 	url: '/pages/bm/style3/rankList?' + this.queryString
+					// });
+					const url = '/pages/bm/style3/rankList?' + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
 				} else {
 					const url = `action://to_home/`;
-					// window.location.href = url;
 					tools.appAction(url);
 				}
 			},
@@ -579,10 +582,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/signup
 	}
 
 	.timebar {
-		width: 80%;
+		width: 90%;
 		height: 65rpx;
 		margin-top: 20rpx;
-		padding: 0 50rpx;
+		padding: 0 30rpx;
 		justify-content: space-evenly;
 		background: #ffffff;
 		border: 0.5px solid;

card/pages/bm/style4/index.vue

@@ -178,14 +178,14 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 					const dif = this.endSecond - now;
 					// const dif = 3600*24 - 60;
 					if (dif > 0) {
-						this.countdown = tools.convertSecondsToDHM(dif);
+						this.countdown = "距结束 " + tools.convertSecondsToDHM(dif);
 					} else {
 						this.countdown = "已结束";
 						this.isFinished = true;
 					}
 					// this.countdown = tools.convertSecondsToHMS(dif);
 				} else {
-					this.countdown = "--天--小时";
+					this.countdown = "距结束 --天--小时";
 				}
 			},
 			// 卡片基本信息查询
@@ -351,22 +351,18 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 				// this.playMusic();
 				
 				if (this.isJoin) {	// 已报名
-					// uni.reLaunch({
-					// 	url: '/pages/bm/style1/rankList?full=true&' + this.queryString
-					// });
-					// window.location.href = `${ossUrl}#/pages/bm/style4/rankOverview?${this.queryString}&full=true`;
-					window.location.href = `${ossUrl}#/pages/bm/style4/rankList?${this.queryString}&full=true`;
+					const url = `${ossUrl}#/pages/bm/style4/rankList?${this.queryString}&full=true`;
+					tools.appAction(url);
 				}
 				else {	// 未报名
-					// uni.reLaunch({
-					// 	url: '/pages/bm/style1/signup?full=true&' + this.queryString
-					// });
 					if (!this.isFinished) {	// 赛事未结束
-						window.location.href = `${ossUrl}#/pages/bm/style4/signup?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style4/signup?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 					else {	// 赛事已结束
-						// window.location.href = `${ossUrl}#/pages/bm/style4/rankOverview?${this.queryString}&full=true`;
-						window.location.href = `${ossUrl}#/pages/bm/style4/rankList?${this.queryString}&full=true`;
+						// const url = `${ossUrl}#/pages/bm/style4/rankOverview?${this.queryString}&full=true`;
+						const url = `${ossUrl}#/pages/bm/style4/rankList?${this.queryString}&full=true`;
+						tools.appAction(url);
 					}
 				}
 			}

card/pages/bm/style4/rankList.vue

@@ -17,8 +17,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				<view class="topcontent uni-column uni-jcsa">
 					<view class="logo"></view>
 					<view class="tcbar uni-row uni-jcsb">
-						<text class="tcbar-text">赛事总里程：{{fmtDistanct(totalDistance)}} 千米</text>
-						<text class="tcbar-text">{{configParam.labelRightAnswerNum}}：{{totalRightAnswerNum}} 次</text>
+						<text class="tcbar-text">赛事总里程：{{fmtDistanct(all_totalDistance)}} 千米</text>
+						<text class="tcbar-text">{{configParam.labelRightAnswerNum}}：{{all_totalRightAnswerNum}} 次</text>
 					</view>
 				</view>
 
@@ -100,8 +100,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				nickName: "", // 昵称
 
 				mapList: [], // 卡片对应地图列表详情
-				totalDistance: 0, // 赛事所有人累计里程，单位米
-				totalRightAnswerNum: 0, // 赛事所有人正确答题数（校园文化输出）
+				all_totalDistance: 0, // 赛事所有人累计里程，单位米
+				all_totalRightAnswerNum: 0, // 赛事所有人正确答题数（校园文化输出）
+				all_totalCp: 0, // 赛事中所有人打点数
+				all_totalSysPoint: 0, // 赛事中所有人百味豆
 
 				mcState: 0, // 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				allowMcSignUp: false, // 是否允许重新分组
@@ -137,7 +139,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				tabActiveColor: "#81cd00",
 
 				// 成绩类型列表
-				rankTypeList: ["totalDistance", "totalCp", "rightAnswerPer", "fastPace", "speed"],
+				rankTypeList: ["totalDistance", "totalCp", "rightAnswerPer", "fastPace", "fastPace"],
 				// 团体成绩列表
 				rank1List: ["teamDistanceRs", "teamCpRs", "teamRightAnswerPerRs", "teamPaceRs", "teamSpeedRs"],
 				// 个人成绩列表
@@ -148,7 +150,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				configParam: {
 					labelRightAnswerNum: "文化输出"
 				},
-				selectedMapId: 0, // 用户选择的地图ID
+				// selectedMapId: 0, // 用户选择的地图ID
 				popupDataList: [],
 				popupExchgList: []
 			}
@@ -177,7 +179,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 			const mapValue = uni.getStorageSync(this.mapKey);
 			if (mapValue) {
 				console.log("mapValue:", mapValue);
-				this.selectedMapId = mapValue;
+				// this.selectedMapId = mapValue;
+				this.ocaId = mapValue;
 			}
 
 			this.getCardConfigQuery();
@@ -528,7 +531,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 							this.getActtime();
 							this.mapListQuery();
 							this.compStatisticQuery();
-							this.getCardRankDetailQuery();
+							// this.getCardRankDetailQuery();
 
 							this.clear();
 							this.interval = setInterval(this.getCountdown, 60000);
@@ -558,12 +561,15 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 							this.mapList = data;
 
 							let mapItems = {
-								selectValue: this.selectedMapId,
+								// selectValue: this.selectedMapId,
+								selectValue: this.ocaId,
 								data: []
 							};
 							for (var i = 0; i < data.length; i++) {
 								if (mapItems.selectValue == 0 && i == 0) {
 									mapItems.selectValue = data[i].ocaId;
+									// this.selectedMapId = data[i].ocaId;
+									this.ocaId = data[i].ocaId;
 								}
 								let map = {};
 								map.text = "个人(" + data[i].mapName + ")";
@@ -571,6 +577,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 								mapItems.data.push(map);
 							}
 							this.tab1Items.push(mapItems);
+							this.getCardRankDetailQuery();
 						}
 					},
 					fail: (err) => {
@@ -591,11 +598,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 						mcId: this.mcId
 					},
 					success: (res) => {
-						console.log("compStatisticQuery", res);
+						// console.log("compStatisticQuery", res);
 						if (res.data.code == 0) {
 							const data = res.data.data;
-							this.totalDistance = data.totalDistance;
-							this.totalRightAnswerNum = data.totalRightAnswerNum;
+							this.all_totalDistance = data.totalDistance;
+							this.all_totalRightAnswerNum = data.totalRightAnswerNum;
+							this.all_totalCp = data.totalCp;
+							this.all_totalSysPoint = data.totalSysPoint;
 						}
 					},
 					fail: (err) => {
@@ -619,7 +628,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 						dispArrStr: this.dispArrStr
 					},
 					success: (res) => {
-						console.log("getCardRankDetailQuery", res);
+						// console.log("getCardRankDetailQuery", res);
 						const rankdata = res.data.data;
 						// this.rankList.totalDistanceRs = rankdata.totalDistanceRs;
 						// this.rankList.totalCpRs = rankdata.totalCpRs;
@@ -688,22 +697,25 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				}); */
 
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnStartGame() {
-				uni.navigateTo({
-					url: "/pages/bm/style4/rankOverview?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style4/rankOverview?" + this.queryString
+				// });
+				const url = "/pages/bm/style4/rankOverview?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);
 				this.$refs.mypopup.popupOpen();
 			},
 			btnMyEgg() {
-				uni.navigateTo({
-					url: "/pages/achievement/index2?tabCurrent=2&" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/achievement/index2?tabCurrent=2&" + this.queryString
+				// });
+				const url = "/pages/achievement/index2?tabCurrent=2&" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnExchg() {
 				this.$refs.mypopupExchg.popupOpen();
@@ -720,6 +732,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				console.log("onSelectChange: ", val);
 				this.ocaId = val.value;
 				this.getCardRankDetailQuery();
+				
 				uni.setStorageSync(this.mapKey, this.ocaId);
 			},
 		}

card/pages/bm/style4/rankOverview.vue

@@ -53,11 +53,15 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 
 			<view class="main uni-column">
 				<text class="main-title">选择比赛路线</text>
-				<my-pathList :style="pathListStyle.style" :pathList="pathList" :selectedPath="ocaId"
-					:mcState="mcState" :showLine="pathListStyle.showLine" @onPathClick="onPathClick"></my-pathList>
+				<my-pathList :style="pathListStyle.style" :pathList="pathList"
+					:selectedPath="ocaId" :mcState="mcState" :showLine="pathListStyle.showLine"
+					@onPathClick="onPathClick"></my-pathList>
+			</view>
+			
+			<view class="bottom uni-column">
 				<button class="btnStartGame" @click="btnStartGame">开始比赛</button>
 			</view>
-
+			
 			<my-popup ref="mypopup" :dataList="popupDataList" :acttime="acttime"></my-popup>
 			<!-- <my-popup-map ref="mypopupmap" :point="navPoint"></my-popup-map> -->
 		</view>
@@ -659,12 +663,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 			},
 			btnBack() {
 				// const url = `action://to_home/`;
-				// window.location.href = url;
 				// tools.appAction(url);
 
-				uni.navigateTo({
-					url: "/pages/bm/style4/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style4/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style4/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			btnInfo() {
 				// console.log(this.$refs.mypopup);
@@ -673,16 +678,20 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 			btnReGroup() {
 				this.queryObj.from = "rankOverview";
 				this.queryString = tools.objectToQueryString(this.queryObj);
-				uni.navigateTo({
-					url: '/pages/bm/style4/signup?' + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: '/pages/bm/style4/signup?' + this.queryString
+				// });
+				const url = '/pages/bm/style4/signup?' + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			onOverviewClick(ovtype) {
 				this.queryObj.ovtype = ovtype;
 				this.queryString = tools.objectToQueryString(this.queryObj);
-				uni.navigateTo({
-					url: "/pages/bm/style4/rankList?" + this.queryString
-				});
+				// uni.navigateTo({
+				// 	url: "/pages/bm/style4/rankList?" + this.queryString
+				// });
+				const url = "/pages/bm/style4/rankList?" + this.queryString;
+				tools.appAction(url, "uni.navigateTo");
 			},
 			eSelectChange(data) {
 				console.log("eSelectChange:", data);
@@ -702,7 +711,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				// 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				if (this.mcState == 1) {
 					const url = `action://to_detail/?id=${this.ocaId}&matchType=${this.mcType}`;
-					// window.location.href = url;
 					tools.appAction(url);
 				} else if (this.mcState == 0) {
 					uni.showToast({
@@ -725,7 +733,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 <style scoped>
 	.content {
 		width: 100vw;
-		/* height: 100vh; */
+		min-height: 100vh;
 		overflow-x: scroll;
 	}
 
@@ -946,11 +954,18 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 		color: #333333;
 		font-size: 16px;
 	}
-	
+
+	.bottom {
+		width: 100%;
+		flex-grow: 1;
+		justify-content: flex-end;
+	}
+
 	.btnStartGame {
 		width: 70%;
 		height: 80rpx;
-		margin-top: 50rpx;
+		/* margin-top: 50rpx; */
+		margin-bottom: 20rpx;
 		/* font-weight: bold; */
 		color: white;
 		font-size: 32rpx;
@@ -958,7 +973,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 		border-radius: 27px;
 		background-color: #2e85ec;
 	}
-
+	
 	/deep/ .e-select {
 		/* width: 60%; */
 		height: 60rpx;

card/pages/bm/style4/signup.vue

@@ -31,6 +31,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 					<text class="introduce-title">{{introduce.title}}</text>
 					<text class="introduce-content">{{introduce.content}}</text>
 				</view>
+				
 				<button class="btnSignup btnSignup-enable" v-if="mcState<=1" @click="btnSignup">报 名</button>
 				<button class="btnSignup btnSignup-disable" v-if="mcState==2">活动已结束</button>
 			</view>
@@ -120,12 +121,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 					labelName: "昵称",
 					labelOrg: "组织",
 				},
-
+				
 				eSelectionProps: {
 					text: 'coiName',
 					value: 'coiId',
 					// disabled: 'noallowed'
-				}
+				},
 			}
 		},
 		computed: {},
@@ -143,7 +144,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 
 			this.rankKey += "-" + this.ecId;
 			console.log("rankKey:", this.rankKey);
-
+			
 			tools.removeCssCode();
 
 			this.getCardConfigQuery();
@@ -398,7 +399,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 						ecId: this.ecId
 					},
 					success: (res) => {
-						console.log("getCardDetailQuery", res);
+						// console.log("getCardDetailQuery", res);
 						const data = res.data.data;
 						this.mcType = data.mcType;
 						this.mcId = data.mcId;
@@ -486,7 +487,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 						mcId: this.mcId,
 					},
 					success: (res) => {
-						console.log("getOnlineMcSignUpDetail", res);
+						// console.log("getOnlineMcSignUpDetail", res);
 						this.coiRs = res.data.data.coiRs;
 						if (this.nickName == undefined || this.nickName == '') {
 							this.nickName = res.data.data.name;
@@ -534,10 +535,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 								duration: 3000
 							});
 
-							uni.navigateTo({
-								// url: '/pages/bm/style4/rankOverview?' + this.queryString
-								url: '/pages/bm/style4/rankList?' + this.queryString
-							});
+							// uni.navigateTo({
+							// 	// url: '/pages/bm/style4/rankOverview?' + this.queryString
+							// 	url: '/pages/bm/style4/rankList?' + this.queryString
+							// });
+							const url = '/pages/bm/style4/rankList?' + this.queryString;
+							tools.appAction(url, "uni.navigateTo");
 						}
 					},
 					fail: (err) => {
@@ -554,12 +557,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 				// console.log("from:", this.from)
 				if (this.from != '') {
 					// window.history.back();
-					uni.navigateTo({
-						url: '/pages/bm/style4/' + this.from + '?' + this.queryString
-					});
+					// uni.navigateTo({
+					// 	url: '/pages/bm/style4/' + this.from + '?' + this.queryString
+					// });
+					const url = '/pages/bm/style4/' + this.from + '?' + this.queryString;
+					tools.appAction(url, "uni.navigateTo");
 				} else {
 					const url = `action://to_home/`;
-					// window.location.href = url;
 					tools.appAction(url);
 				}
 			},
@@ -602,12 +606,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 			},
 			// 获取输入框中值
 			getESelectText(data) {
-				console.log("getESelectText:", data);
+				// console.log("getESelectText:", data);
 				this.coiName = data;
 			},
 			// 获取选择选项值
 			eSelectChange(data) {
-				console.log("eSelectChange:", data);
+				// console.log("eSelectChange:", data);
 			},
 		}
 	}
@@ -690,11 +694,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 	}
 
 	.timebar {
-		width: 80%;
+		width: 90%;
 		height: 65rpx;
 		/* margin-top: 20rpx; */
 		margin-top: -64rpx;
-		padding: 0 50rpx;
+		padding: 0 30rpx;
 		justify-content: space-evenly;
 		background: #ffffff;
 		border: 0.5px solid;

card/pages/jbs/index.vue

@@ -156,13 +156,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/jbs/index
 					const dif = this.endSecond - now;
 					// const dif = 3600*24 - 60;
 					if (dif > 0) {
-						this.countdown = tools.convertSecondsToDHM(dif);
+						this.countdown = "距结束 " + tools.convertSecondsToDHM(dif);
 					} else {
 						this.countdown = "已结束";
 					}
 					// this.countdown = tools.convertSecondsToHMS(dif);
 				} else {
-					this.countdown = "--天--小时";
+					this.countdown = "距结束 --天--小时";
 				}
 			},
 			// 卡片基本信息查询
@@ -266,7 +266,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/jbs/index
 				// uni.reLaunch({
 				// 	url: '/pages/jbs/rankList?full=true&' + this.queryString
 				// });
-				window.location.href = `${ossUrl}#/pages/jbs/rankList?${this.queryString}&full=true`;
+				const url = `${ossUrl}#/pages/jbs/rankList?${this.queryString}&full=true`;
+				tools.appAction(url);
 			}
 		}
 	}

card/pages/jbs/rankList.vue

@@ -416,7 +416,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/jbs/rankList
 							// });
 
 							const url = `action://to_detail/?id=${this.ocaId}&matchType=${this.mcType}`;
-							// window.location.href = url;
 							tools.appAction(url);
 						}
 					},
@@ -433,7 +432,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/jbs/rankList
 			btnBack() {
 				// window.history.back();
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnStart() {

card/pages/mytz/detail.vue

@@ -290,7 +290,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/mytz/detail
 			btnBack() {
 				// window.history.back();
 				const url = `action://to_home/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			btnInfo() {
@@ -299,7 +298,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/mytz/detail
 			},
 			btnStart() {
 				const url = `action://to_map_list/`;
-				// window.location.href = url;
 				tools.appAction(url);
 			},
 			//当前轮播索引

card/pages/mytz/index.vue

@@ -176,7 +176,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/mytz/index
 				// uni.reLaunch({
 				// 	url: '/pages/mytz/detail?full=true&' + this.queryString
 				// });
-				window.location.href = `${ossUrl}#/pages/mytz/detail?${this.queryString}&full=true`;
+				const url = `${ossUrl}#/pages/mytz/detail?${this.queryString}&full=true`;
+				tools.appAction(url);
 			}
 		}
 	}