wzx 1 year ago
parent
commit
f8ee928ba9

+ 3 - 0
card/common/tools.js

@@ -177,6 +177,9 @@ var tools = {
 	// 秒数转换成时分秒
 	// style:  0 [01:02:03]  1 [1h:02'3"]
 	convertSecondsToHMS(seconds, style = 0) {
+		if (!(seconds > 0)) {
+			return '--';
+		}
 		var hours = Math.floor(seconds / 3600);
 		var minutes = Math.floor((seconds % 3600) / 60);
 		var remainingSeconds = Math.floor(seconds % 60);

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

@@ -67,6 +67,7 @@
 			this.refList = this.$refs.list;
 			this.refListItems = this.refList.$el.children;
 			// console.log("refListItems", this.refListItems);
+			console.log("rankRs", this.rankType);
 		},
 		methods: {
 			getListItemClass(item, index) {

+ 2 - 2
card/manifest.json

@@ -2,8 +2,8 @@
     "name" : "card",
     "appid" : "__UNI__A61F96B",
     "description" : "",
-    "versionName" : "2.0.0",
-    "versionCode" : 200,
+    "versionName" : "2.0.1",
+    "versionCode" : 201,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 24 - 0
card/pages/tpl/style1/cardconfig/test.js

@@ -126,6 +126,30 @@ export const localCardConfig = `{
 			"labelTicketName": "蛋叔券",
 			"labelAwardAddress": "兑换地址",
 			"labelGoodsList": ""
+		},
+		"rankParam": {
+			"dispArrStr": "totalSysPoint,totalDistance,rightAnswerPer,totalCp,fastSpeed",
+			"tabItems": [
+				"总积分",
+				"总里程",
+				"正确答题",
+				"打点数",
+				"单圈用时"
+			],
+			"rankTypeList": [
+				"totalScore",
+				"totalDistance",
+				"rightAnswerPer",
+				"totalCp",
+				"speed"
+			],
+			"rankRsList": [
+				"totalSysPointRs",
+				"totalDistanceRs",
+				"rightAnswerPerRs",
+				"totalCpRs",
+				"fastSpeedRs"
+			]
 		}
 	},
 	"rankOverview": {

+ 47 - 31
card/pages/tpl/style1/rankList.vue

@@ -21,25 +21,20 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/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>
+				<!-- <view>>> {{rankList}}</view> -->
+				<my-tab ref="tab" :tabItems="tabItems" :tabItemsMark="tabItemsMark" :type="0"
+					:initActIndex=configParam.tabInitActIndex @onTabClick="onTabClick" :fontSize="12"></my-tab>
 				
-				<uni-segmented-control class="main-tab" :current="tabCurrent" :values="tabItems"
-					@clickItem="onClickTabItem" styleType="button" :activeColor="cardConfigData.tabActiveColor"></uni-segmented-control>
 				<view class="tab-view uni-column">
-					<!-- 里程 -->
-					<my-ranklist v-show="tabCurrent === 0" :rankRs="rankList.totalDistanceRs" rank-type="totalDistance"></my-ranklist>
-
-					<!-- 打点数 -->
-					<my-ranklist v-show="tabCurrent === 1" :rankRs="rankList.totalCpRs" rank-type="totalCp"></my-ranklist>
-					
-					<!-- 百味豆 -->
-					<my-ranklist v-show="tabCurrent === 2" :rankRs="rankList.totalSysPointRs" rank-type="totalSysPoint"></my-ranklist>
-					
-					<!-- 配速 -->
-					<my-ranklist v-show="tabCurrent === 3" :rankRs="rankList.fastPaceRs" rank-type="fastPace"></my-ranklist>
+					<template v-for="(item, index) in rankRsList" :key="index">
+						<my-ranklist v-show="tabCurrent === index" :rankRs="rankList[item]"
+							:rank-type="rankTypeList[index]"></my-ranklist>
+					</template>
 				</view>
 
 				<button class="btnBack bgcolor-main" @click="btnStartGame">{{btnStartGameText}}</button>
@@ -114,24 +109,26 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankList
 				mcState: 0 ,	// 赛事/活动状态 0: 未开始  1: 进行中  2: 已结束
 				allowMcSignUp: false,	// 是否允许重新分组
 				countdown: "", // 倒计时
-				rankList: { // 排名列表
-					totalDistanceRs: [],
-					totalCpRs: [],
-					totalSysPointRs: [],
-					fastPaceRs: []
-				},
+				rankList: {}, // 排名列表
 				interval: null,
 				
 				teamType: 0, // 队伍类型
 				dispArrStr: "totalDistance,totalCp,totalSysPoint,fastPace", // 要显示的集合范围
-				tabItems: ["里程", "打点数", "百味豆", "配速"],
+				tabItems: ["总里程", "打点数", "百味豆", "配速"],
+				rankTypeList: ["totalDistance", "totalCp", "totalSysPoint", "fastPace"],
 				tabCurrent: 0,
-				tabActiveColor: "#81cd00",
+				tabItemsMark: [{
+					textColor: "#ff6203",
+					icon: "static/common/award.png"
+				}],
+				rankRsList: ["totalDistanceRs", "totalCpRs", "totalSysPointRs", "fastPaceRs"],
+				
 				
 				configParam: {
 					labelTicketName: "我的奖券",
 					labelAwardAddress: "兑奖地址",
 					// labelGoodsList: "兑换商品",
+					tabInitActIndex: 0
 				}
 			}
 		},
@@ -290,6 +287,29 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankList
 					tools.loadCssCode(css);
 				}
 				
+				// 加载成绩参数
+				const rankParam = config.rankParam;
+				if (rankParam != undefined) {
+					if (rankParam.tabItemsMark != undefined) {
+						this.tabItemsMark = rankParam.tabItemsMark;
+					}
+					if (rankParam.dispArrStr != undefined && rankParam.dispArrStr.length > 0) {
+						this.dispArrStr = rankParam.dispArrStr;
+						// console.log("[loadConfig] dispArrStr:", rankParam.dispArrStr);
+					}
+					if (rankParam.tabItems != undefined && rankParam.tabItems.length > 0) {
+						this.tabItems = rankParam.tabItems;
+						// console.log("[loadConfig] tabItems:", rankParam.tabItems);
+					}
+					if (rankParam.rankTypeList != undefined && rankParam.rankTypeList.length > 0) {
+						this.rankTypeList = rankParam.rankTypeList;
+					}
+					if (rankParam.rankRsList != undefined && rankParam.rankRsList.length > 0) {
+						this.rankRsList = rankParam.rankRsList;
+					}
+				}
+				// console.log("[loadConfig] rankParam:", rankParam);
+				
 				// 加载页面参数
 				const param = config.param;
 				if (param != undefined) {
@@ -408,10 +428,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankList
 					success: (res) => {
 						// console.log("getCardRankDetailQuery", res);
 						const rankdata = res.data.data;
-						this.rankList.totalDistanceRs = rankdata.totalDistanceRs;
-						this.rankList.totalCpRs = rankdata.totalCpRs;
-						this.rankList.totalSysPointRs = rankdata.totalSysPointRs;
-						this.rankList.fastPaceRs = rankdata.fastPaceRs;
+						this.rankList = rankdata;
 					},
 					fail: (err) => {
 						console.log("getCardRankDetailQuery err", err);
@@ -539,10 +556,9 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankList
 				const url = "/pages/exchange/style1/goodsList?" + this.queryString;
 				tools.appAction(url, "uni.navigateTo");
 			},
-			onClickTabItem(e) {
-				if (this.tabCurrent != e.currentIndex) {
-					this.tabCurrent = e.currentIndex;
-				}
+			onTabClick(val) {
+				// console.log("onTabClick: ", val);
+				this.tabCurrent = val;
 			}
 		}
 	}

+ 10 - 8
card/pages/tpl/style1/rankOverview.vue

@@ -11,28 +11,29 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankOverview
 					@btnBackClick="btnBack" @btnInfoClick="btnInfo"></my-topbar>
 			</view>
 			
-			<view class="mid uni-column">
+			<view class="mid uni-column uni-jcc">
 				<view class="mid-1 uni-row uni-jcsb">
+					<text>排名:<text style="color: #ff0045;">{{totalSysPointRankNum}}</text></text>
 					<text class="mid-1-name">{{nickName}}</text>
-					<text>场次:{{totalNum}}</text>
+					<text>场次:<text style="color: #ff0045;">{{totalNum}}</text></text>
 				</view>
 				<view class="mid-2 uni-row uni-jcsa">
 					<view class="uni-column">
-						<text class="mid-2-value" style="color: #ff0045;">{{totalSysPoint}}</text>
-						<text class="mid-2-text">百味豆(个)</text>
+						<text class="mid-2-value">{{totalSysPoint}}</text>
+						<text class="mid-2-text">百味豆</text>
 					</view>
 
 					<view class="mid-line"></view>
 
 					<view class="uni-column">
 						<text class="mid-2-value">{{fmtDistanct(totalDistanct)}}</text>
-						<text class="mid-2-text">里程km</text>
+						<text class="mid-2-text">里程 km</text>
 					</view>
 
 					<view class="mid-line"></view>
 					<view class="uni-column">
 						<text class="mid-2-value">{{totalCp}}</text>
-						<text class="mid-2-text">打点数(个)</text>
+						<text class="mid-2-text">打点数</text>
 					</view>
 
 					<view class="mid-line"></view>
@@ -408,14 +409,15 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style1/rankOverview
 
 	.mid-1 {
 		width: 90%;
-		margin: 12px;
+		/* margin: 12px; */
+		margin-bottom: 12px;
 		font-weight: 500;
 		color: #8e8e8e;
 		font-size: 14px;
 	}
 	
 	.mid-1-name {
-		max-width: 360rpx;
+		max-width: 310rpx;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;

+ 6 - 6
card/pages/tpl/style2/rankOverview.vue

@@ -37,13 +37,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style2/rankOverview
 				<view class="mid-2 uni-row uni-jcsa">
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalNum}}</text>
-						<text class="mid-2-text">场次</text>
+						<text class="mid-2-text">场次</text>
 					</view>
 
 					<view class="mid-line"></view>
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalCp}}</text>
-						<text class="mid-2-text">打点数</text>
+						<text class="mid-2-text">打点数</text>
 					</view>
 
 					<view class="mid-line"></view>
@@ -74,25 +74,25 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style2/rankOverview
 						<text class="mid-1-name">{{nickName}}</text>
 					</view>
 					<!-- <text class="mid-1-name">{{coiName}}</text> -->
-					<text class="uni-nowrap">场次:{{regionTotalNum}}</text>
+					<text class="uni-nowrap">场次:{{regionTotalNum}}</text>
 				</view>
 				<view class="mid-2 uni-row uni-jcsa">
 					<view class="uni-column">
 						<text class="mid-2-value" style="color: #ff0045;">{{regionTotalSysPoint}}</text>
-						<text class="mid-2-text">百味豆(个)</text>
+						<text class="mid-2-text">百味豆</text>
 					</view>
 			
 					<view class="mid-line"></view>
 			
 					<view class="uni-column">
 						<text class="mid-2-value">{{fmtDistanct(regionTotalDictance)}}</text>
-						<text class="mid-2-text">里程km</text>
+						<text class="mid-2-text">里程 km</text>
 					</view>
 			
 					<view class="mid-line"></view>
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalCp}}</text>
-						<text class="mid-2-text">打点数(个)</text>
+						<text class="mid-2-text">打点数</text>
 					</view>
 			
 					<view class="mid-line"></view>

+ 6 - 6
card/pages/tpl/style3/rankOverview.vue

@@ -37,13 +37,13 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style3/rankOverview
 				<view class="mid-2 uni-row uni-jcsa">
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalNum}}</text>
-						<text class="mid-2-text">场次</text>
+						<text class="mid-2-text">场次</text>
 					</view>
 
 					<view class="mid-line"></view>
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalCp}}</text>
-						<text class="mid-2-text">打点数</text>
+						<text class="mid-2-text">打点数</text>
 					</view>
 
 					<view class="mid-line"></view>
@@ -74,25 +74,25 @@ https://oss-mbh5.colormaprun.com/card/#/pages/tpl/style3/rankOverview
 						<text class="mid-1-name">{{nickName}}</text>
 					</view>
 					<text class="mid-1-name">{{coiName}}</text>
-					<text class="uni-nowrap">场次:{{regionTotalNum}}</text>
+					<text class="uni-nowrap">场次:{{regionTotalNum}}</text>
 				</view>
 				<view class="mid-2 uni-row uni-jcsa">
 					<view class="uni-column">
 						<text class="mid-2-value" style="color: #ff0045;">{{regionTotalSysPoint}}</text>
-						<text class="mid-2-text">百味豆(个)</text>
+						<text class="mid-2-text">百味豆</text>
 					</view>
 			
 					<view class="mid-line"></view>
 			
 					<view class="uni-column">
 						<text class="mid-2-value">{{fmtDistanct(regionTotalDictance)}}</text>
-						<text class="mid-2-text">里程km</text>
+						<text class="mid-2-text">里程 km</text>
 					</view>
 			
 					<view class="mid-line"></view>
 					<view class="uni-column">
 						<text class="mid-2-value">{{regionTotalCp}}</text>
-						<text class="mid-2-text">打点数(个)</text>
+						<text class="mid-2-text">打点数</text>
 					</view>
 			
 					<view class="mid-line"></view>