wzx 1 year ago
parent
commit
860c0d786a

+ 2 - 2
card/common/api.js

@@ -3,8 +3,8 @@ 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 = 'd4dd6b57a15b4abaccf6cb6adcd4fd44';
 
 // 卡片基本信息查询

+ 33 - 1
card/components/my-pathList/my-pathList.vue

@@ -15,6 +15,18 @@
 					<text class="navtext">(导航)</text>
 				</view>
 			</view>
+			<view v-if="item.type == 4" class="path-nav uni-column">
+				<view class="uni-column">
+					<image mode="aspectFit" class="pathimg3" :src="item.pathImg" @click="onPathImgClick(item, 'path')">
+					</image>
+					<text class="pathName" v-html="item.pathName"></text>
+				</view>
+				<view class="uni-column">
+					<image mode="aspectFit" class="navimg2" :src="item.navImg" @click="onPathImgClick(item, 'nav')">
+					</image>
+					<text class="navtext">(导航)</text>
+				</view>
+			</view>
 		</template>
 		<view v-if="showLine && num < pathListLen" class="line"></view>
 	</view>
@@ -56,12 +68,13 @@
 		},
 		methods: {
 			onPathImgClick(item, type = '') {
+				// console.log("onPathImgClick");
 				//item.type 1: 比赛路线  2: 导航到指定地点
 				if (item.type == 1) {
 					this.dealPathClick(item);
 				} else if (item.type == 2) {
 					this.dealNavClick(item);
-				} else if (item.type == 3) {
+				} else if (item.type >= 3) {
 					if (type == 'path') {
 						this.dealPathClick(item);
 					} else if (type == 'nav') {
@@ -126,11 +139,30 @@
 		height: 80px;
 	}
 
+	.pathimg3 {
+		width: 141px;
+		height: 141px;
+	}
+	
+	.pathName {
+		font-weight: 500;
+		color: #383838;
+		font-size: 16px;
+		line-height: 36px;
+		font-family: Source Han Sans CN;
+	}
+	
 	.navimg {
 		width: 25px;
 		height: 25px;
 	}
 
+	.navimg2 {
+		width: 44px;
+		height: 65px;
+		margin-top: 20px;
+	}
+	
 	.navtext {
 		font-weight: 500;
 		color: #aaaaaa;

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

@@ -42,7 +42,7 @@
 				type: Number,
 				default: -1
 			},
-			rankType: {	// totalDistance:总里程 totalCp:打点数 totalSysPoint:百味豆 fastPace:配速 rightAnswerPer:答题正确率 speed:速度
+			rankType: {	// totalScore:总积分 totalDistance:总里程 totalCp:打点数 totalSysPoint:百味豆 fastPace:配速 rightAnswerPer:答题正确率 speed:速度
 				type: String,
 				default: ""
 			},

+ 1 - 1
card/components/my-topbar/my-topbar.vue

@@ -7,7 +7,7 @@
 		<text class="mcName" v-html="mcName"></text>
 		<view class="topbar-left-right uni-row uni-jce">
 			<uni-icons v-if="showMessage" type="notification-filled" class="topbar-ico topbar-ico-message" @click="btnMessage"></uni-icons>
-			<text v-if="showRule" class="topbar-rule" @click="btnInfo">规则</text>
+			<text v-if="showRule" class="topbar-rule" @click="btnInfo">说明</text>
 		</view>
 	</view>
 </template>

+ 2 - 2
card/manifest.json

@@ -2,8 +2,8 @@
     "name" : "card",
     "appid" : "__UNI__A61F96B",
     "description" : "",
-    "versionName" : "1.8.6",
-    "versionCode" : 186,
+    "versionName" : "1.8.9",
+    "versionCode" : 189,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 13 - 8
card/pages/achievement/ecert/ecert.vue

@@ -13,6 +13,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/ecert/ecert
 			<text v-if="isCertCreate == 0" class="btnlist-item" @click="modify">修改姓名</text>
 			<text class="btnlist-item" @click="previewCert">预览证书</text>
 			<text class="btnlist-item" @click="downloadCert">下载证书</text>
+			<!-- <text class="btnlist-item" @click="shareWx">打开微信</text> -->
 		</view>
 		
 		<!-- <br>
@@ -29,13 +30,6 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/ecert/ecert
 		&nbsp; -->
 		<!-- <a href="tel:13335119550">拨打电话</a> &nbsp; -->
 
-		<!-- <view class="info uni-column uni-ais">
-			<text class="info-text">姓名:{{nickName}}</text>
-			<text class="info-text">院系:{{coiName}}</text>
-			<text class="info-memo">(注:姓名只能修改一次,院系部分无法修改)</text>
-		</view>
-		<button class="btnCert" @click="btnCert">{{btnCertText}}</button> -->
-
 		<canvas v-if="canvasReady" canvas-id="ecert" id="ecert" class="ecert" :style="getEcertCanvasStyle()"></canvas>
 		
 		<uni-popup ref="modifyDialog" type="dialog">
@@ -443,7 +437,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/ecert/ecert
 					type: "image"
 				};
 				data = JSON.stringify(data);
-				console.log(data);
+				// console.log(data);
 				save_base64.postMessage(data);
 				
 				/* let filename = `${this.compName}_${this.certificateName}_ecert`;
@@ -495,6 +489,17 @@ https://oss-mbh5.colormaprun.com/card/#/pages/achievement/ecert/ecert
 					}
 				}); */
 			},
+			shareWx() {
+				let data = {
+					title: "彩图奔跑商家版",
+					url: "https://oss-mbh5.colormaprun.com/shop/",
+					image: "https://oss-mbh5.colormaprun.com/shop/static/logo.png",
+					scene: "session" // session:分享到对话  timeline:分享到朋友圈  favorite:分享到收藏
+				};
+				data = JSON.stringify(data);
+				// console.log(data);
+				share_wx.postMessage(data);
+			},
 			btnCert() {
 				this.makeCert();
 			},

+ 3 - 2
card/pages/bm/style1/index.vue

@@ -19,7 +19,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{type}}</text>
 				</view>
-				<text class="name mod-text">{{ecName}}</text>
+				<view class="name mod-text">{{ecName}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>
@@ -399,7 +399,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style1/index
 
 	.main {
 		width: 100%;
-		height: 700rpx;
+		/* height: 700rpx; */
+		height: 660rpx;
 		margin-top: 20rpx;
 		justify-content: space-evenly;
 	}

+ 3 - 2
card/pages/bm/style2/index.vue

@@ -19,7 +19,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{type}}</text>
 				</view>
-				<text class="name mod-text">{{ecName}}</text>
+				<view class="name mod-text">{{ecName}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>
@@ -432,7 +432,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/index
 
 	.main {
 		width: 100%;
-		height: 700rpx;
+		/* height: 700rpx; */
+		height: 660rpx;
 		margin-top: 20rpx;
 		justify-content: space-evenly;
 	}

+ 2 - 1
card/pages/bm/style2/rankList.vue

@@ -566,7 +566,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/rankList
 						if (code == 0) {
 							this.isJoin = data.isJoin;
 							if (this.isJoin) { // 已报名
-								this.btnStartGameText = "我要比赛";
+								// this.btnStartGameText = "我要比赛";
+								this.btnStartGameText = "选择场地";
 							} else {	// 未报名
 								this.btnStartGameText = "我要报名";
 							}

+ 3 - 2
card/pages/bm/style3/index.vue

@@ -19,7 +19,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{type}}</text>
 				</view>
-				<text class="name mod-text">{{ecName}}</text>
+				<view class="name mod-text">{{ecName}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>
@@ -432,7 +432,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/index
 
 	.main {
 		width: 100%;
-		height: 700rpx;
+		/* height: 700rpx; */
+		height: 660rpx;
 		margin-top: 20rpx;
 		justify-content: space-evenly;
 	}

+ 2 - 1
card/pages/bm/style3/rankList.vue

@@ -756,7 +756,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/rankList
 						if (code == 0) {
 							this.isJoin = data.isJoin;
 							if (this.isJoin) { // 已报名
-								this.btnStartGameText = "我要比赛";
+								// this.btnStartGameText = "我要比赛";
+								this.btnStartGameText = "选择场地";
 							} else {	// 未报名
 								this.btnStartGameText = "我要报名";
 							}

+ 429 - 0
card/pages/bm/style4/cardconfig.md

@@ -1,5 +1,434 @@
 卡片页面定制
 
+[山大经济研究院 - 欢乐定向赛]
+
+index卡片URL参数:type=“筑梦宿州·创赢未来 ”特训营&btnText=进入活动
+
+"index": {
+	"css": "
+		.content-bg{
+			background: url('static/cardbg/shanda_jjyjy.png');
+			background-size: cover;
+		}
+		.logo{
+			width: 40vw;
+			height: 40vw;
+			background: url('static/logo/sddx2.png') no-repeat center;
+			background-size: contain;
+		}
+		.mod-text{
+			color: #FFC300 !important;
+		}
+		.mod-button{
+			color: #942914 !important;
+			background-color: #ffffff !important;
+		}
+	"
+},
+"signup": {
+	"css": `
+		.top{
+			width: 100%;
+			height: 220px;
+			padding-top: 36px;
+			justify-content: space-between;
+			background-image: url('static/backgroud/top_bg_sddx2.png');
+			background-repeat: no-repeat;
+			background-position: center;
+			background-size: cover;
+		}
+		.topbar-rule {
+			color: #FFFFFF;
+			border-radius: 4px;
+			background: #FF870D;
+		}
+		.logo{
+			width: 180.5px !important;
+			height: 130.5px !important;
+			background-image: url('static/logo/sddx_jjyjy.png');
+		}
+		.top-acttime{
+			display: flex !important;
+			font-size: 20px !important; 
+			line-height: 30px !important;
+		}
+		.topbar-color{
+			color: #ffffff;
+		}
+		.btnSignup-enable {
+			background-color: #a43a07 !important;
+		}
+		.swiper-item-button {
+			background-color: #a43a07 !important;
+		}
+		.uni-swiper-dot-active {
+			background: #a43a07 !important;
+		}
+	`,
+	"popupRuleConfig": {
+		"height": "530px"
+	},
+	"popupDataList": [		
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "“筑梦宿州·创赢未来 ”特训营",
+				"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+				"imageList": []
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "活动流程",
+				"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+				"imageList": []
+			}
+		},								
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "定向运动怎么玩?",
+				"content": "",
+				"imageList": [{
+					"src": "/static/common/qrcode_spjc.png",
+					"width": "140.5px",
+					"height": "163.5px"
+				}]
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "赛事规则及奖励",
+				"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+				"imageList": []
+			}
+		},
+		"default2"
+	],
+	"introduce": {
+		"title": "介绍:",
+		"content": "  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>"
+	},
+	"param": {
+		"labelName": "姓名",
+		"labelOrg": "战队",
+		"subTitle": "“筑梦宿州·创赢未来 ”特训营"
+	}
+},
+"rankList": {
+	"css": "
+		.top{
+			width: 100%;
+			height: 170px;
+			padding-top: 36px;
+			justify-content: space-between;
+			background-image: url('static/backgroud/top_bg_sddx2.png');
+			background-repeat: no-repeat;
+			background-position-x: center;
+			background-position-y: bottom;
+			background-size: cover;
+		}
+		.topbar-rule {
+			color: #FFFFFF;
+			border-radius: 4px;
+			background: #FF870D;
+		}
+		.topcontent {
+			display: none !important;
+		}
+		.topcontent2 {
+			display: flex !important;
+		}
+		.logo{
+			width: 243px !important;
+			height: 50px !important;
+			background-image: url('static/logo/sddx_jjyjy2.png');
+		}
+		.topbtm-egg {
+			display: none !important;
+		}
+		.main-bar{
+			display: flex !important;
+			background-color: #FFDFDB !important;
+			color: #A43A07 !important;
+		}
+		.topbar-color{
+			color: #ffffff;
+		}
+		.btnBack{
+			background-color: #a43a07 !important;
+		}
+		.tab-active{
+			background-color: #a43a07 !important;
+		}
+		.swiper-item-button {
+			background-color: #a43a07 !important;
+		}
+		.uni-swiper-dot-active {
+			background: #a43a07 !important;
+		}
+	",
+	"tabActiveColor": "#a43a07",
+	"popupRuleConfig": {
+		"height": "530px"
+	},
+	"popupDataList": [
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "“筑梦宿州·创赢未来 ”特训营",
+				"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+				"imageList": []
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "活动流程",
+				"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+				"imageList": []
+			}
+		},								
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "定向运动怎么玩?",
+				"content": "",
+				"imageList": [{
+					"src": "/static/common/qrcode_spjc.png",
+					"width": "140.5px",
+					"height": "163.5px"
+				}]
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "赛事规则及奖励",
+				"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+				"imageList": []
+			}
+		},
+		"default2"
+	],
+	"popupExchgConfig": {
+		"height": "460px"
+	},
+	"popupExchgList": [
+	],
+	"popupMessageConfig": {
+		"height": "500px"
+	},
+	"param": {
+		"subTitle": "“筑梦宿州·创赢未来 ”特训营",
+		"labelRightAnswerNum": "正确答题",
+		"labelTicketName": "",
+		"labelAwardAddress": "",
+		"tab1InitActIndex": 0,
+		"tab2InitActIndex": 0
+	},
+	"rankParam": {
+		"dispArrStr": "teamCp,teamDistance,teamRightAnswerPer,teamSpeed,regionCp,regionDistance,regionRightAnswerPer,regionSpeed",
+		"tab2Items_team": ["累计积分", "总里程", "正确答题", "单场用时"],
+		"tab2Items_person": ["累计积分", "总里程", "正确答题", "单场用时"],
+		"rankTypeList_team": ["totalCp", "totalDistance", "rightAnswerPer", "speed"],
+		"rankTypeList_person": ["totalCp", "totalDistance", "rightAnswerPer", "speed"],
+		"rank1List": ["teamCpRs", "teamDistanceRs", "teamRightAnswerPerRs", "teamSpeedRs"],
+		"rank2List": ["regionCpRs", "regionDistanceRs", "regionRightAnswerPerRs", "regionSpeedRs"]
+	}
+},
+"rankOverview": {
+	"css": `
+		.top{
+			position: relative;
+			width: 100%;
+			height: 220px;
+			padding-top: 36px;
+			justify-content: space-between;
+			background-image: url('static/backgroud/top_bg_sddx2.png');
+			background-repeat: no-repeat;
+			background-position-x: center;
+			background-position-y: center;
+			background-size: cover;
+		}
+		.topbar-rule {
+			color: #FFFFFF;
+			border-radius: 4px;
+			background: #FF870D;
+		}
+		.logo{
+			width: 180.5px !important;
+			height: 130.5px !important;
+			background-image: url('static/logo/sddx_jjyjy.png');
+		}
+		.top-acttime{
+			display: flex !important;
+			font-size: 20px !important; 
+			line-height: 30px !important;
+		}
+		.topbar-color{
+			color: #ffffff;
+		}
+		.midType0{
+			margin-top: -20px !important;
+		}
+		.main-title {
+			display: none !important;
+		}
+		.btnStartGame{
+			background-color: #a43a07 !important;
+		}
+		.e-select{
+			background-color: #a43a07 !important;
+		}
+		.swiper-item-button{
+			background-color: #a43a07 !important;
+		}
+		.uni-swiper-dot-active{
+			background: #a43a07 !important;
+		}
+	`,
+	"pathList": {
+		"row1": [{
+				"type": 4,
+				"pathImg": "/static/common/sdzxxq2.png",
+				"pathName": "山东大学中心校区",
+				"path": {
+					"ocaId": 1,
+					"mcType": 3
+				},
+				"navImg": "/static/common/nav3.png",
+				"point": {
+					"longitude": 117.022194,
+					"latitude": 36.661612,
+					"name": "山东大学中心校区起始点"
+				}
+			}
+		]
+	},
+	"pathListStyle" : {
+		"showLine" : true,
+		"style": "justify-content: center;"
+	},
+	"popupRuleConfig": {
+		"height": "560px"
+	},
+	"popupDataList": [
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "“筑梦宿州·创赢未来 ”特训营",
+				"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+				"imageList": []
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "活动流程",
+				"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+				"imageList": []
+			}
+		},								
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "定向运动怎么玩?",
+				"content": "",
+				"imageList": [{
+					"src": "/static/common/qrcode_spjc.png",
+					"width": "140.5px",
+					"height": "163.5px"
+				}]
+			}
+		},
+		{
+			"type": 7,
+			"data": {
+				"topLogo": {
+					"src": "/static/logo/sddx.png",
+					"width": "80px",
+					"height": "80px"
+				},
+				"title": "赛事规则及奖励",
+				"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+				"imageList": []
+			}
+		},
+		"default2"
+	],
+	"popupWarnConfig": {
+		"height": "550px"
+	},
+	"popupHelpConfig": {
+		"height": "539px"
+	},
+	"popupHelpList": [
+	],
+	"param": {
+		"subTitle": "“筑梦宿州·创赢未来 ”特训营",
+		"midType": 0
+	}
+}
+
+
 [小飞龙登山节]
 
 "index": {

+ 10 - 9
card/pages/bm/style4/index.vue

@@ -19,7 +19,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{type}}</text>
 				</view>
-				<text class="name mod-text">{{ecName}}</text>
+				<view class="name mod-text">{{ecName}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>
@@ -246,25 +246,25 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 						/* const config = {
 						"css": `
 							.content-bg{
-								background: url('static/cardbg/dengshanjie.png');
+								background: url('static/cardbg/shanda_jjyjy.png');
 								background-size: cover;
 							}
 							.logo{
 								width: 40vw;
 								height: 40vw;
-								background: url('static/logo/xfl2.png') no-repeat center;
+								background: url('static/logo/sddx2.png') no-repeat center;
 								background-size: contain;
 							}
 							.mod-text{
-								color: #000000 !important;
+								color: #FFC300 !important;
 							}
 							.mod-button{
-								color: #ffffff !important;
-								background-color: #ff870e !important;
+								color: #942914 !important;
+								background-color: #ffffff !important;
 							}
 						`
-						}; */
-						
+						};
+						 */
 						this.loadConfig(config);
 					},
 					fail: (err) => {
@@ -425,7 +425,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/index
 
 	.main {
 		width: 100%;
-		height: 700rpx;
+		/* height: 700rpx; */
+		height: 660rpx;
 		margin-top: 20rpx;
 		justify-content: space-evenly;
 	}

+ 100 - 139
card/pages/bm/style4/rankList.vue

@@ -23,6 +23,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 					</view>
 					<text class="today" :data-content="today">{{today}}</text>
 				</view>
+				
+				<view class="topcontent2 uni-column uni-jcsa">
+					<view class="logo"></view>
+					<text v-if="configParam.subTitle && configParam.subTitle.length > 0" class="top-acttime">{{configParam.subTitle}}</text>
+				</view>
 
 				<!-- <view class="topcontent uni-column uni-jcsa">
 					<view class="logo"></view>
@@ -40,9 +45,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 			</view>
 			<view class="main uni-column">
 				<view class="main-bar uni-row uni-jcse">
+					<text>题目输出:{{all_totalAnswerNum}}</text>
 					<text>总里程:{{fmtDistanct(all_totalDistance)}}km</text>
-					<text>总打点:{{all_totalCp}}</text>
-					<text>总百味豆:{{all_totalSysPoint}}</text>
+					<text>总打点:{{all_totalCp}}</text>
+					<text>总百味豆:{{all_totalSysPoint}}</text>
 				</view>
 				
 				<my-tab ref="tab1" :tabItems="tab1Items" :type="1" @onTabClick="onTab1Click"
@@ -182,11 +188,12 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				cssTop: "",
 				cssTopbarColor: "",
 				configParam: {
+					subTitle: "",
 					labelRightAnswerNum: "文化输出",
 					labelTicketName: "我的奖券",
 					labelAwardAddress: "兑奖地址",
 					tab1InitActIndex: 0,
-					tab2InitActIndex: 0,
+					tab2InitActIndex: 0
 				},
 				// selectedMapId: 0, // 用户选择的地图ID
 				popupRuleConfig: {}, // 规则弹窗配置
@@ -453,6 +460,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				// 加载页面参数
 				const param = config.param;
 				if (param != undefined) {
+					if (param.subTitle != undefined && param.subTitle.length > 0) {
+						this.configParam.subTitle = param.subTitle;
+					}
 					if (param.labelRightAnswerNum != undefined && param.labelRightAnswerNum.length > 0) {
 						this.configParam.labelRightAnswerNum = param.labelRightAnswerNum;
 					}
@@ -536,47 +546,53 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 									height: 170px;
 									padding-top: 36px;
 									justify-content: space-between;
-									background-image: url('static/backgroud/top_bg_dengshanjie.png');
+									background-image: url('static/backgroud/top_bg_sddx2.png');
 									background-repeat: no-repeat;
 									background-position-x: center;
-									background-position-y: -20px;
+									background-position-y: bottom;
 									background-size: cover;
 								}
+								.topbar-rule {
+									color: #FFFFFF;
+									border-radius: 4px;
+									background: #FF870D;
+								}
 								.topcontent {
 									display: none !important;
 								}
-								.topbar-color{
-									color: #333333;
+								.topcontent2 {
+									display: flex !important;
 								}
-								.topbtm-name {
-									background-color: #c77f34 !important;
-									border: none !important;
-									color: #ffffff !important;
+								.logo{
+									width: 243px !important;
+									height: 50px !important;
+									background-image: url('static/logo/sddx_jjyjy2.png');
 								}
 								.topbtm-egg {
-									background-color: #c77f34 !important;
-									border: none !important;
-									color: #ffffff !important;
+									display: none !important;
 								}
-								.main-bar {
+								.main-bar{
 									display: flex !important;
-									background-color: #ffeddb !important;
-									color: #ff8d1a !important;
+									background-color: #FFDFDB !important;
+									color: #A43A07 !important;
+								}
+								.topbar-color{
+									color: #ffffff;
 								}
 								.btnBack{
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.tab-active{
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.swiper-item-button {
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.uni-swiper-dot-active {
-									background: #ff870e !important;
+									background: #a43a07 !important;
 								}
 							`,
-							"tabActiveColor": "#ff870e",
+							"tabActiveColor": "#a43a07",
 							"popupRuleConfig": {
 								"height": "530px"
 							},
@@ -584,155 +600,85 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 								{
 									"type": 7,
 									"data": {
-										"title": "活动规则",
-										"content": "<br>① 任何人、任何时间均可体验参赛。<br><br>② 6个场地任意选,比赛时间内,不限次数参赛。<br><br>③ 1次成功打点,获取1个百味豆。<br><br>④ 1次正确答题,获取1个百味豆。"
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "活动奖励",
-										"content": "<br><li>活动: 20个百味豆兑换一个鸡蛋<br><span style='font-size: 12px; color:#999999;'>(限本次活动百味豆,兑换以“蛋叔券”为准)</style><li>百味豆越多,“蛋叔”给你的鸡蛋 越多,上不封顶!<li>随时可以兑换哦~<li>能不能吃上自己挣的鸡蛋,就看你的了!<li style='color:#FF870E;'><span style='color:#FF870E;'>同时,参赛即可获取合作机构的奖励!</span><br><br>",
-										"imageList": [{
-											"src": "/static/common/danshu.png",
-											"width": "183px",
-											"height": "81px"
-										}]
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/xxhpgy.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "星星和蒲公英双语阅读馆"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "星星和蒲公英双语阅读馆,济南儿童阅读网红圣地!馆藏2W+册正版图书,涵盖中英文大奖绘本、桥梁书、自然科学与文学社科名著,以及艺术画册和摄影图集。开展面向4-12岁孩子的中文阅读读书会&中英双语阅读课。<br><br><span style='color:#FF870E;'>礼品一:到店阅读权限一年<br>礼品二:店内饮品五折券一张</span>",
-										"pointList": [
-											{
-												"name": "星星和蒲公英双语阅读馆",
-												"tel": "电话:<a href='tel:18765812082' style='color: #333333;'>18765812082</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "“筑梦宿州·创赢未来 ”特训营",
+										"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+										"imageList": []
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/wensiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "文思语少年读书会"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "文思语少年读书会,专注于为4-15岁儿童和家庭提供阅读素养发展解决方案和产品。读书会以整本书精读伴读为核心,塑造良好的读书习惯,训练阅读理解能力,培养创意作文能力。<br><br><span style='color:#FF870E;'>礼品:《山海经》精装套系书<br>书籍原价158元,仅需19.9元/套,不限领取次数,多余权限可赠送他人使用!</span>",
-										"pointList": [
-											{
-												"name": "文思语少年读书会",
-												"tel": "电话:<a href='tel:17663733631' style='color: #333333;'>17663733631</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "活动流程",
+										"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+										"imageList": []
 									}
-								},
+								},								
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/lezhigu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "乐知谷"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "乐知谷是济南科学类口碑最好的机构,主做面向4-12岁儿童,内容涵盖工程科技、自然科学、生命科学、地球太空、PBL综合项目等五大板块,室内&户外相结合,真正将实验、动手、探究融于生活,培养独立思考、永存好奇、敢于创造的未来型孩子。<br><span style='color:#FF870E;'>礼品:乐知谷经典工程体验课《建造一座斜拉桥》一堂,感受力学结构的科技含量课程每人限参与1次,多余权限可赠送他人使用</span>",
-										"pointList": [
-											{
-												"name": "乐知谷",
-												"tel": "电话:<a href='tel:19100652564' style='color: #333333;'>19100652564</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "定向运动怎么玩?",
+										"content": "",
+										"imageList": [{
+											"src": "/static/common/qrcode_spjc.png",
+											"width": "140.5px",
+											"height": "163.5px"
+										}]
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/kusentiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "酷森体育俱乐部"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "酷森体育俱乐部包含少儿篮球、体能训练、跳绳,三大课程。拥有二十年以上资深学院派专家教练团队,制定系统的少儿运动训练体系,结合不同年龄及能力的孩子进行定制化教学,使其更符合不同孩子的综合能力提升。<br><br><span style='color:#FF870E;'>礼品:手机全年影视会员卡</span>",
-										"pointList": [
-											{
-												"name": "酷森体育俱乐部",
-												"tel": "电话:<a href='tel:15621875115' style='color: #333333;'>15621875115</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "赛事规则及奖励",
+										"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+										"imageList": []
 									}
-								}
+								},
+								"default2"
 							],
 							"popupExchgConfig": {
 								"height": "460px"
 							},
 							"popupExchgList": [
-								{
-									"type": 5,
-									"data": {
-										"title": "兑换地点1",
-										"img": "/static/common/gtgwcs.png",
-										"point": {
-											"longitude": 117.022194,
-											"latitude": 36.661612,
-											"name": "冠同购物超市"
-										}
-									}
-								},
-								{
-									"type": 5,
-									"data": {
-										"title": "兑换地点2",
-										"img": "/static/common/wslgwcs2.png",
-										"point": {
-											"longitude": 117.022194,
-											"latitude": 36.661612,
-											"name": "万盛隆购物超市"
-										}
-									}
-								}
 							],
 							"popupMessageConfig": {
 								"height": "500px"
 							},
 							"param": {
-								"labelRightAnswerNum": "文化输出",
-								"labelTicketName": "蛋叔券",
-								"labelAwardAddress": "兑换地址",
+								"subTitle": "“筑梦宿州·创赢未来 ”特训营",
+								"labelRightAnswerNum": "正确答题",
+								"labelTicketName": "",
+								"labelAwardAddress": "",
 								"tab1InitActIndex": 0,
 								"tab2InitActIndex": 0
 							},
 							"rankParam": {
-								"tab2ItemsMark": [],
-								"dispArrStr": "teamDistance,teamPoint,teamCp,teamPace,regionDistance,regionPoint,regionCp,regionPace",
-								"tab2Items_team": ["里程", "打点数", "百味豆", "配速"],
-								"tab2Items_person": ["里程", "打点数", "百味豆", "配速"],
-								"rankTypeList_team": ["totalDistance", "totalCp", "totalSysPoint", "fastPace"],
-								"rankTypeList_person": ["totalDistance", "totalCp", "totalSysPoint", "fastPace"],
-								"rank1List": ["teamDistanceRs", "teamPointRs", "teamCpRs", "teamPaceRs"],
-								"rank2List": ["regionDistanceRs", "regionPointRs", "regionCpRs", "regionPaceRs"]
+								"dispArrStr": "teamCp,teamDistance,teamRightAnswerPer,teamSpeed,regionCp,regionDistance,regionRightAnswerPer,regionSpeed",
+								"tab2Items_team": ["累计积分", "总里程", "正确答题", "单场用时"],
+								"tab2Items_person": ["累计积分", "总里程", "正确答题", "单场用时"],
+								"rankTypeList_team": ["totalScore", "totalDistance", "rightAnswerPer", "speed"],
+								"rankTypeList_person": ["totalScore", "totalDistance", "rightAnswerPer", "speed"],
+								"rank1List": ["teamCpRs", "teamDistanceRs", "teamRightAnswerPerRs", "teamSpeedRs"],
+								"rank2List": ["regionCpRs", "regionDistanceRs", "regionRightAnswerPerRs", "regionSpeedRs"]
 							}
 						}; */
 
@@ -1003,7 +949,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 						if (code == 0) {
 							this.isJoin = data.isJoin;
 							if (this.isJoin) { // 已报名
-								this.btnStartGameText = "我要比赛";
+								// this.btnStartGameText = "我要比赛";
+								this.btnStartGameText = "选择场地";
 							} else {	// 未报名
 								this.btnStartGameText = "我要报名";
 							}
@@ -1244,6 +1191,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 		/* margin-bottom: 20px; */
 	}
 
+	.topcontent2 {
+		width: 90%;
+		display: none;
+	}
+	
 	.logo {
 		width: 80px;
 		height: 80px;
@@ -1256,6 +1208,15 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 		background-size: contain;
 	}
 
+	.top-acttime {
+		text-shadow: 3px 3px 0px #640008;
+		font-family: YouSheBiaoTiHei;
+		/* font-family: Arial, Helvetica, sans-serif; */
+		font-weight: bold;
+		color: #ffee0b;
+		font-size: 20px;
+	}
+	
 	.tcview {
 		width: 90%;
 		/* height: 100px; */

+ 74 - 210
card/pages/bm/style4/rankOverview.vue

@@ -362,8 +362,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 				if (this.cssTopbarColor == "") {
 					this.cssTopbarColor = "topbar-color-default";
 				}
-				console.log("[loadConfig] cssTop:", this.cssTop);
-				console.log("[loadConfig] cssTopbarColor:", this.cssTopbarColor);
+				// console.log("[loadConfig] cssTop:", this.cssTop);
+				// console.log("[loadConfig] cssTopbarColor:", this.cssTopbarColor);
 
 				// 加载比赛路线数据
 				const pathList = config.pathList;
@@ -522,260 +522,129 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 									height: 220px;
 									padding-top: 36px;
 									justify-content: space-between;
-									background-image: url('static/backgroud/top_bg_dengshanjie.png');
+									background-image: url('static/backgroud/top_bg_sddx2.png');
 									background-repeat: no-repeat;
 									background-position-x: center;
 									background-position-y: center;
 									background-size: cover;
 								}
-								.topcontent {
-									display: none !important;
+								.topbar-rule {
+									color: #FFFFFF;
+									border-radius: 4px;
+									background: #FF870D;
+								}
+								.logo{
+									width: 180.5px !important;
+									height: 130.5px !important;
+									background-image: url('static/logo/sddx_jjyjy.png');
+								}
+								.top-acttime{
+									display: flex !important;
+									font-size: 20px !important; 
+									line-height: 30px !important;
 								}
 								.topbar-color{
-									color: #333333;
+									color: #ffffff;
 								}
-								.mid{
-									margin-top: -40px !important;
+								.midType0{
+									margin-top: -20px !important;
+								}
+								.main-title {
+									display: none !important;
 								}
 								.btnStartGame{
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.e-select{
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.swiper-item-button{
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.uni-swiper-dot-active{
-									background: #ff870e !important;
+									background: #a43a07 !important;
 								}
 							`,
 							"pathList": {
 								"row1": [{
-										"type": 3,
-										"pathImg": "/static/common/lingxiucheng.png",
-										"path": {
-											"ocaId": 1,
-											"mcType": 3
-										},
-										"navImg": "/static/common/nav.png",
-										"point": {
-											"longitude": 117.022194,
-											"latitude": 36.661612,
-											"name": "领秀城起始点"
-										}
-									},
-									{
-										"type": 3,
-										"pathImg": "/static/common/quanchenggongyuan.png",
+										"type": 4,
+										"pathImg": "/static/common/sdzxxq2.png",
+										"pathName": "山东大学中心校区",
 										"path": {
 											"ocaId": 1,
 											"mcType": 3
 										},
-										"navImg": "/static/common/nav.png",
+										"navImg": "/static/common/nav3.png",
 										"point": {
 											"longitude": 117.022194,
 											"latitude": 36.661612,
-											"name": "泉城公园起始点"
+											"name": "山东大学中心校区起始点"
 										}
 									}
-								],
-								"row2": [{
-										"type": 3,
-										"pathImg": "/static/common/baihuagongyuan.png",
-										"path": {
-											"ocaId": 1,
-											"mcType": 3
-										},
-										"navImg": "/static/common/nav.png",
-										"point": {
-											"longitude": 117.022194,
-											"latitude": 36.661612,
-											"name": "百花公园起始点"
-										}
-									},
-									{
-										"type": 3,
-										"pathImg": "/static/common/aotizhongxin.png",
-										"path": {
-											"ocaId": 1,
-											"mcType": 3
-										},
-										"navImg": "/static/common/nav.png",
-										"point": {
-											"longitude": 117.022194,
-											"latitude": 36.661612,
-											"name": "奥体中心起始点"
-										}
-									}
-								],
-								"row3": [{
-									"type": 3,
-									"pathImg": "/static/common/muniushan.png",
-									"path": {
-										"ocaId": 1,
-										"mcType": 3
-									},
-									"navImg": "/static/common/nav.png",
-									"point": {
-										"longitude": 117.022194,
-										"latitude": 36.661612,
-										"name": "牧牛山起始点"
-									}
-								}]
+								]
 							},
 							"pathListStyle" : {
 								"showLine" : true,
-								"style": "justify-content: flex-start;"
+								"style": "justify-content: center;"
 							},
 							"popupRuleConfig": {
 								"height": "560px"
 							},
 							"popupDataList": [
-								{
-									"type": 1,
-									"data": {
-										"title": "小飞龙定向登山节",
-										"logo": {
-											"src": "/static/logo/xfl2.png",
-											"width": "100px",
-											"height": "100px"
-										},
-										"content": "小飞龙定向登山节燃情开幕!7大公园/社区等你探索,加入心仪战队,开启寻宝之旅!奖品多到拿不下!",
-										"imageList": [{
-											"src": "/static/common/qrcode_xfldsjzxbzq.png",
-											"width": "150px",
-											"height": "150px"
-										}]
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "活动流程",
-										"logo": {
-											"src": "/static/logo/xfl2.png",
-											"width": "100px",
-											"height": "100px"
-										},
-										"content": "<br>① 导航至起点打点 → ② 依次打点 → ③ 接受挑战 → ④ 终点打点 → ⑤ 查看成绩 → ⑥ 赢取奖励",
-										"imageList": [{
-											"src": "/static/common/qrcode_spjc.png",
-											"width": "150px",
-											"height": "150px"
-										}]
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "规则及奖励",
-										"content": "<br><span style='color:#fe880e;'>规则:</span><br>① 7个场地任选、参赛时间自由、路线随机、不限参赛次数;<br>② 选择心仪战队,共筑个人与战队荣耀;<br>③ 1次成功打点,获取1个百味豆(积分);1次正确答题,获取1个百味豆(积分);<br>④ 正常完赛累计百味豆,未完赛不计入。<br><br> <span style='color:#fe880e;'>奖励:</span><br>① 每20个百味豆(积分)兑换一枚鸡蛋,上不封顶(7日内兑换);<br>② 每20个百味豆(积分)获取各合作机构多种精美礼品(7日内兑换);<br>③ 赛事中不定期推出额外奖励,请随时关注赛事弹出公告。"
-									}
-								},
 								{
 									"type": 7,
 									"data": {
-										"title": "奖励",
-										"logo": {
-											"src": "/static/logo/xxhpgy.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "星星和蒲公英双语阅读馆"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "星星和蒲公英双语阅读馆,济南儿童阅读网红圣地!馆藏2W+册正版图书,涵盖中英文大奖绘本、桥梁书、自然科学与文学社科名著,以及艺术画册和摄影图集。开展面向4-12岁孩子的中文阅读读书会&中英双语阅读课。<br><br>每20个百味豆奖励:<br><span style='color:#FF870E;'>礼品一:到店阅读权限一年<br>礼品二:店内饮品五折券一张</span>",
-										"pointList": [
-											{
-												"name": "星星和蒲公英双语阅读馆",
-												"tel": "电话:<a href='tel:18765812082' style='color: #333333;'>18765812082</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "“筑梦宿州·创赢未来 ”特训营",
+										"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+										"imageList": []
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "奖励",
-										"logo": {
-											"src": "/static/logo/wensiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "文思语少年读书会"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "文思语少年读书会,专注于为4-15岁儿童和家庭提供阅读素养发展解决方案和产品。读书会以整本书精读伴读为核心,塑造良好的读书习惯,训练阅读理解能力,培养创意作文能力。<br><br>每20个百味豆奖励:<br><span style='color:#FF870E;'>《山海经》精装套系书。原价:158元/套,活动价19.9元/套,封顶5套,权限可赠送他人</span>",
-										"pointList": [
-											{
-												"name": "文思语少年读书会",
-												"tel": "电话:<a href='tel:17663733631' style='color: #333333;'>17663733631</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "奖励",
-										"logo": {
-											"src": "/static/logo/lezhigu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "乐知谷"
-										},
-										"content": "乐知谷是济南科学类口碑最好的机构,主做面向4-12岁儿童,内容涵盖工程科技、自然科学、生命科学、地球太空、PBL综合项目等五大板块,室内&户外相结合,真正将实验、动手、探究融于生活,培养独立思考、永存好奇、敢于创造的未来型孩子。<br><br>每20个百味豆奖励:<br><span style='color:#FF870E;'>乐知谷景点工程体验课《建造一座斜拉桥》一堂,感受力学结构的科技含量。每人限参与1次,多余权限可赠送他人</span>",
-										"pointList": [
-											{
-												"name": "乐知谷",
-												"tel": "电话:<a href='tel:19100652564' style='color: #333333;'>19100652564</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "活动流程",
+										"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+										"imageList": []
 									}
-								},
+								},								
 								{
 									"type": 7,
 									"data": {
-										"title": "奖励",
-										"logo": {
-											"src": "/static/logo/kusentiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "酷森体育俱乐部"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "酷森体育俱乐部包含少儿篮球、体能训练、跳绳,三大课程。拥有二十年以上资深学院派专家教练团队,制定系统的少儿运动训练体系,结合不同年龄及能力的孩子进行定制化教学,使其更符合不同孩子的综合能力提升。<br><br>每20个百味豆奖励:<br><span style='color:#FF870E;'>手机全年影视会员卡,封顶5张</span>",
-										"pointList": [
-											{
-												"name": "酷森体育俱乐部",
-												"tel": "电话:<a href='tel:15621875115' style='color: #333333;'>15621875115</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "定向运动怎么玩?",
+										"content": "",
+										"imageList": [{
+											"src": "/static/common/qrcode_spjc.png",
+											"width": "140.5px",
+											"height": "163.5px"
+										}]
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "主办方",
-										"logo": {
-											"src": "/static/logo/xfl2.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "英泓小飞龙体育俱乐部"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "专注15年青少年体能训练,俱乐部开馆7年具备完善的针对中国青少年体质的科学训练体系,为12万青少年提供运动方案。俱乐部小学会员,通过俱乐部的系统训练,已达到中考体育满分标准。",
-										"pointList": [
-											{
-												"name": "英泓小飞龙体育俱乐部",
-												"tel": "电话:<a href='tel:15689409077' style='color: #333333;'>15689409077</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "赛事规则及奖励",
+										"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+										"imageList": []
 									}
 								},
 								"default2"
@@ -787,20 +656,10 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 								"height": "539px"
 							},
 							"popupHelpList": [
-								{
-									"type": 2,
-									"data": {
-										"title": "帮助",
-										"img": "/static/common/qrcode_help.png",
-										"imgParam": {
-											"height": "370px"
-										}
-									}
-								}
 							],
 							"param": {
-								"subTitle": "",
-								"midType": 1
+								"subTitle": "“筑梦宿州·创赢未来 ”特训营",
+								"midType": 0
 							}
 						}; */
 
@@ -839,6 +698,11 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 								map.text = data[i].mapName;
 								map.value = data[i].ocaId;
 								mapItems.push(map);
+								if (i == 0 && this.ocaId == 0) {
+									this.ocaId = data[i].ocaId;
+									this.matchRsDetailQuery();
+									uni.setStorageSync(this.mapKey, this.ocaId);
+								}
 							}
 							this.mapList = mapItems;
 							// console.log("mapList", this.mapList);

+ 60 - 95
card/pages/bm/style4/signup.vue

@@ -372,147 +372,112 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 							"css": `
 								.top{
 									width: 100%;
-									height: 150px;
+									height: 220px;
 									padding-top: 36px;
 									justify-content: space-between;
-									background-image: url('static/backgroud/top_bg_dengshanjie.png');
+									background-image: url('static/backgroud/top_bg_sddx2.png');
 									background-repeat: no-repeat;
 									background-position: center;
 									background-size: cover;
 								}
-								.topbar-color{
-									color: #333333;
+								.topbar-rule {
+									color: #FFFFFF;
+									border-radius: 4px;
+									background: #FF870D;
+								}
+								.logo{
+									width: 180.5px !important;
+									height: 130.5px !important;
+									background-image: url('static/logo/sddx_jjyjy.png');
+								}
+								.top-acttime{
+									display: flex !important;
+									font-size: 20px !important; 
+									line-height: 30px !important;
 								}
-								.timebar {
-									margin-top: 25px !important;
-									margin-bottom: 10px;
+								.topbar-color{
+									color: #ffffff;
 								}
 								.btnSignup-enable {
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.swiper-item-button {
-									background-color: #ff870e !important;
+									background-color: #a43a07 !important;
 								}
 								.uni-swiper-dot-active {
-									background: #ff870e !important;
+									background: #a43a07 !important;
 								}
 							`,
 							"popupRuleConfig": {
 								"height": "530px"
 							},
-							"popupDataList": [								
+							"popupDataList": [		
 								{
 									"type": 7,
 									"data": {
-										"title": "活动规则",
-										"content": "<br>① 任何人、任何时间均可体验参赛。<br><br>② 6个场地任意选,比赛时间内,不限次数参赛。<br><br>③ 1次成功打点,获取1个百味豆。<br><br>④ 1次正确答题,获取1个百味豆。"
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "活动奖励",
-										"content": "<br><li>活动: 20个百味豆兑换一个鸡蛋<br><span style='font-size: 12px; color:#999999;'>(限本次活动百味豆,兑换以“蛋叔券”为准)</style><li>百味豆越多,“蛋叔”给你的鸡蛋 越多,上不封顶!<li>随时可以兑换哦~<li>能不能吃上自己挣的鸡蛋,就看你的了!<li style='color:#FF870E;'><span style='color:#FF870E;'>同时,参赛即可获取合作机构的奖励!</span><br><br>",
-										"imageList": [{
-											"src": "/static/common/danshu.png",
-											"width": "183px",
-											"height": "81px"
-										}]
-									}
-								},
-								{
-									"type": 7,
-									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/xxhpgy.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "星星和蒲公英双语阅读馆"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "星星和蒲公英双语阅读馆,济南儿童阅读网红圣地!馆藏2W+册正版图书,涵盖中英文大奖绘本、桥梁书、自然科学与文学社科名著,以及艺术画册和摄影图集。开展面向4-12岁孩子的中文阅读读书会&中英双语阅读课。<br><br><span style='color:#FF870E;'>礼品一:到店阅读权限一年<br>礼品二:店内饮品五折券一张</span>",
-										"pointList": [
-											{
-												"name": "星星和蒲公英双语阅读馆",
-												"tel": "电话:<a href='tel:18765812082' style='color: #333333;'>18765812082</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "“筑梦宿州·创赢未来 ”特训营",
+										"content": "<span style='display:block; text-align: center; margin: 20px; font-weight: bold;'>欢乐定向赛</span>  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>",
+										"imageList": []
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/wensiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "文思语少年读书会"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "文思语少年读书会,专注于为4-15岁儿童和家庭提供阅读素养发展解决方案和产品。读书会以整本书精读伴读为核心,塑造良好的读书习惯,训练阅读理解能力,培养创意作文能力。<br><br><span style='color:#FF870E;'>礼品:《山海经》精装套系书<br>书籍原价158元,仅需19.9元/套,不限领取次数,多余权限可赠送他人使用!</span>",
-										"pointList": [
-											{
-												"name": "文思语少年读书会",
-												"tel": "电话:<a href='tel:17663733631' style='color: #333333;'>17663733631</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "活动流程",
+										"content": "<span style='line-height: 30px;'>① 选择战队赛事报名 ↓ <br>② 选择场地导航至起点 ↓ <br>③ 进入活动起点打点 ↓ <br>④ 按序号依次打点 ↓ <br>⑤ 知识问答 ↓ <br>⑥ 终点打点 ↓ <br>⑦ 查看成绩 ↓ <br>⑧ 获得奖励</span>",
+										"imageList": []
 									}
-								},
+								},								
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/lezhigu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "乐知谷"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "乐知谷是济南科学类口碑最好的机构,主做面向4-12岁儿童,内容涵盖工程科技、自然科学、生命科学、地球太空、PBL综合项目等五大板块,室内&户外相结合,真正将实验、动手、探究融于生活,培养独立思考、永存好奇、敢于创造的未来型孩子。<br><span style='color:#FF870E;'>礼品:乐知谷经典工程体验课《建造一座斜拉桥》一堂,感受力学结构的科技含量课程每人限参与1次,多余权限可赠送他人使用</span>",
-										"pointList": [
-											{
-												"name": "乐知谷",
-												"tel": "电话:<a href='tel:19100652564' style='color: #333333;'>19100652564</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "定向运动怎么玩?",
+										"content": "",
+										"imageList": [{
+											"src": "/static/common/qrcode_spjc.png",
+											"width": "140.5px",
+											"height": "163.5px"
+										}]
 									}
 								},
 								{
 									"type": 7,
 									"data": {
-										"title": "合作机构",
-										"logo": {
-											"src": "/static/logo/kusentiyu.png",
-											"width": "120px",
-											"height": "120px",
-											"memo": "酷森体育俱乐部"
+										"topLogo": {
+											"src": "/static/logo/sddx.png",
+											"width": "80px",
+											"height": "80px"
 										},
-										"content": "酷森体育俱乐部包含少儿篮球、体能训练、跳绳,三大课程。拥有二十年以上资深学院派专家教练团队,制定系统的少儿运动训练体系,结合不同年龄及能力的孩子进行定制化教学,使其更符合不同孩子的综合能力提升。<br><br><span style='color:#FF870E;'>礼品:手机全年影视会员卡</span>",
-										"pointList": [
-											{
-												"name": "酷森体育俱乐部",
-												"tel": "电话:<a href='tel:15621875115' style='color: #333333;'>15621875115</a>",
-												"longitude": 117.075174,
-												"latitude": 36.654108
-											}
-										]
+										"title": "赛事规则及奖励",
+										"content": "<br><span style='line-height: 22px;'>规则:<br>1. 选择心仪战队,共筑个人与战队荣耀。<br>2. 在规定的时间内,<span style='color: #FF8D1A;'>不限完赛次数</span>,最终成绩以完赛累计积分计算。<br>3. 途经点成功打点1积分,正确答题1积分。<br>4. 未成功完赛(未打结束点)积分不计入。<br><br>奖励:<br><span style='color: #FF8D1A;'>完赛奖、最佳战队奖、个人前三名</span></span>",
+										"imageList": []
 									}
-								}
+								},
+								"default2"
 							],
 							"introduce": {
 								"title": "介绍:",
-								"content": "<li>小飞龙定向赛再次来袭!这次有6个场地哟~<li>神秘“蛋叔”闪亮登场~<li>蛋叔放大招,百味豆换鸡蛋!<li>时不可待!冲鸭!<br><br><li>能不能把蛋叔整郁闷,就看你的啦~<li>还等啥?火速报名吧!"
+								"content": "  欢迎加入“筑梦宿州·创赢未来”特训营定向赛!在这里,你将亲历百年奥运精英运动——定向运动,体验个人与团队目标的完美融合,过程中运动与智慧并重。完赛即享奖励,最佳团队更享奖上奖!让我们携手加油吧!<br><br><span style='display:block; text-align: right;'>山东大学经济研究院</span>"
 							},
 							"param": {
 								"labelName": "姓名",
-								"labelOrg": "分组",
-								"subTitle": ""
+								"labelOrg": "战队",
+								"subTitle": "“筑梦宿州·创赢未来 ”特训营"
 							}
 						}; */
 

+ 1 - 1
card/pages/jbs/index.vue

@@ -18,7 +18,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/jbs/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{type}}</text>
 				</view>
-				<text class="name mod-text">{{ecName}}</text>
+				<view class="name mod-text">{{ecName}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>

+ 1 - 1
card/pages/mytz/index.vue

@@ -12,7 +12,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/mytz/index
 					<image v-if="notice" mode="aspectFit" src="/static/common/notice.png" class="notice"></image>
 					<text class="type mod-text">{{ecName}}</text>
 				</view>
-				<text class="name mod-text">{{name}}</text>
+				<view class="name mod-text">{{name}}</view>
 				<button class="button mod-button">{{btnText}}</button>
 			</view>
 		</view>

BIN
card/static/backgroud/top_bg_sddx2.png


BIN
card/static/cardbg/shanda_jjyjy.png


BIN
card/static/common/nav3.png


BIN
card/static/common/sdzxxq2.png


BIN
card/static/logo/ctbpsjb.png


BIN
card/static/logo/sddx2.png


BIN
card/static/logo/sddx_jjyjy.png


BIN
card/static/logo/sddx_jjyjy2.png