wzx 1 ano atrás
pai
commit
7e2508be8b

+ 62 - 24
card/components/my-ranklist/my-ranklist.vue

@@ -6,14 +6,19 @@
 				<text class="item-rankNum"
 					:class="getMedalClass(item.rankNum)">{{item.rankNum > 0 ? item.rankNum : '--'}}</text>
 				<view class="item-detail uni-row">
-					<view class="uni-row">
-						<text class="item-userName">{{ teamType >= 0 ? getTeamName(teamType, item.userName) : item.userName}}</text>
+					<view class="uni-row item-box">
+						<view v-if="item.isDispAdditionalName == 1 && item.additionalName.length > 0" class="uni-row item-userName">
+							<text class="item-userName2">{{item.userName}}</text>
+							<text class="item-additionalName">({{item.additionalName}})</text>
+						</view>
+						<text v-else class="item-userName">{{ teamType >= 0 ? getTeamName(teamType, item.userName) : item.userName}}</text>
 						<image class="item-inGame" v-if="item.isInGame == 1" mode="aspectFit" src="/static/common/ingame.gif"></image>
 					</view>
 					<text class="item-totalTime" v-if="rankType == 'totalDistance'">{{fmtDistanct(item.inRankNum)}} km</text>
 					<text class="item-totalTime" v-else-if="rankType == 'fastPace'">{{fmtPace(item.inRankNum)}}</text>
 					<text class="item-totalTime" v-else-if="rankType == 'rightAnswerPer'">{{item.inRankNum}}%</text>
 					<text class="item-totalTime" v-else-if="rankType == 'totalCp' || rankType == 'totalSysPoint'">{{item.inRankNum}} 个</text>
+					<text class="item-totalTime" v-else-if="rankType == 'totalScore'">{{item.inRankNum}}</text>
 					<text class="item-totalTime" v-else-if="rankType == 'speed'">{{fmtTime(item.inRankNum)}}</text>
 					<text class="item-totalTime" v-else>{{fmtTime(item.totalTime)}}</text>
 				</view>
@@ -203,22 +208,26 @@
 
 <style lang="scss" scoped>
 	.list {
-		width: 95%;
+		width: 90%;
 		height: 43vh;
 		flex-grow: 1;
 		overflow: scroll;
-		margin-top: 16rpx;
-		margin-bottom: 16rpx;
+		margin-top: 8px;
+		margin-bottom: 8px;
 	}
 
 	.list-item {
 		width: 100%;
-		height: 70rpx;
+		height: 35px;
 		justify-content: flex-start;
 
 		// transition: all 1s ease;
 		// -webkit-transition: all 1s ease;
 	}
+	
+	::v-deep .uni-list-item__container {
+		padding: 0 5px;
+	}
 
 	.list-item-move {
 		background-color: #bd640a !important;
@@ -226,19 +235,19 @@
 
 	.list-item-isself {
 		background-color: #ececea !important;
-		border-radius: 10rpx;
+		border-radius: 6px;
 	}
 
 	.item-rankNum {
-		width: 80rpx;
-		height: 50rpx;
+		width: 40px;
+		height: 25px;
 		text-align: center;
-		margin-top: 6rpx;
-		padding-right: 0.5rpx;
-		margin-right: 10rpx;
-		font-size: 26rpx;
+		margin-top: 3px;
+		padding-right: 0.25px;
+		margin-right: 5px;
+		font-size: 13px;
 		font-weight: bold;
-		line-height: 50rpx;
+		line-height: 25px;
 		background-repeat: no-repeat;
 		background-position-x: center;
 		background-position-y: top;
@@ -247,10 +256,10 @@
 
 	.item-detail {
 		width: 82%;
-		height: 60rpx;
-		padding-left: 10rpx;
-		padding-right: 10rpx;
-		border-bottom: #ececea 5rpx solid;
+		height: 30px;
+		padding-left: 5px;
+		padding-right: 5px;
+		border-bottom: #ececea 2px solid;
 		justify-content: space-between;
 	}
 
@@ -278,22 +287,51 @@
 		color: #9a140a;
 	}
 
+	.item-box {
+		width: 80%;
+		// background-color: #55aa00;
+	}
+	
 	.item-userName {
-		max-width: 360rpx;
-		font-size: 30rpx;
+		// max-width: 176px;
+		// max-width: 66%;
+		max-width: 88%;
+		font-size: 15px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.item-userName2 {
+		// max-width: 88%;
+		font-size: 14px;
+		white-space: nowrap;
+	}
+
+	.item-additionalName {
+		// max-width: 100px;
+		font-size: 12px;
+		color: #9f9f9f;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
 
 	.item-inGame {
-		width: 36rpx;
-		height: 60rpx;
-		margin-left: 20rpx;
+		width: 18px;
+		height: 30px;
+		margin-left: 3px;
 	}
 
 	.item-totalTime {
-		font-size: 26rpx;
+		font-size: 13px;
 		font-weight: 550;
+		white-space: nowrap;
+	}
+	
+	.nowrap {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
 </style>

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

@@ -2,7 +2,7 @@
 	<view class="tab uni-row" :style="'font-size: ' + fontSize + 'px;'">
 		<template v-for="(item,index) in tabItems" :key="index">
 			<text v-if="typeof item == 'string'" :class="getClassList(index)" :style="getTextStyle(index)" @click="onTabClick(index)">{{item}}</text>
-			<e-select v-if="typeof item == 'object'" :style="getSelectStyle()" v-model="item.selectValue" 
+			<e-select v-if="typeof item == 'object'" :style="getSelectStyle()" v-model="item.selectValue" maxHeight="300px"
 				:options="item.data" :search="false" :inputClick="false" :clearable="false" :class="getClassList(index)"
 				@click="onTabClick(index)" @getText="getESelectText" @change="eSelectChange"></e-select>
 		</template>

BIN
card/favicon.ico


+ 2 - 2
card/manifest.json

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

+ 1 - 1
card/pages/bm/style2/signup.vue

@@ -16,7 +16,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style2/signup
 					<text class="acttime">{{acttime}}</text>
 				</view>
 
-				<input class="uni-input" maxlength="20" placeholder="请填写昵称或姓名" v-model="nickName" />
+				<input class="uni-input" maxlength="12" placeholder="请填写昵称或姓名" v-model="nickName" />
 
 				<view class="introduce uni-column">
 					<text class="introduce-title">{{introduce.title}}</text>

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

@@ -16,7 +16,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/signup
 					<text class="acttime">{{acttime}}</text>
 				</view>
 
-				<input class="uni-input" maxlength="20" placeholder="请填写昵称或姓名" v-model="nickName" />
+				<input class="uni-input" maxlength="12" placeholder="请填写昵称或姓名" v-model="nickName" />
 
 				<view class="introduce uni-column">
 					<text class="introduce-title">{{introduce.title}}</text>
@@ -641,7 +641,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style3/signup
 	.acttime {
 		font-weight: 550;
 		color: #333333;
-		font-size: 15px;
+		font-size: 14px;
+		text-wrap: nowrap;
 	}
 
 	.clock {

+ 4 - 4
card/pages/bm/style4/cardconfig.md

@@ -199,7 +199,7 @@ index卡片URL参数:type=团建活动&btnText=进入活动
 					"height": "72px"
 				},
 				"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-				"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+				"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 				"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 				"pointList": [
 					{
@@ -530,7 +530,7 @@ index卡片URL参数:type=团建活动&btnText=进入活动
 					"height": "72px"
 				},
 				"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-				"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+				"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 				"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 				"pointList": [
 					{
@@ -756,7 +756,7 @@ index卡片URL参数:type=团建活动&btnText=进入活动
 					"height": "72px"
 				},
 				"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-				"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+				"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 				"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 				"pointList": [
 					{
@@ -813,7 +813,7 @@ index卡片URL参数:type=团建活动&btnText=进入活动
 					"height": "72px"
 				},
 				"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-				"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+				"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 				"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 				"pointList": [
 					{

+ 3 - 3
card/pages/bm/style4/rankList.vue

@@ -153,7 +153,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 				tabActiveColor: "#81cd00",
 
 				// 成绩类型列表
-				rankTypeList: ["totalCp", "totalDistance", "rightAnswerPer", "fastPace", "fastPace"],
+				rankTypeList: ["totalScore", "totalDistance", "rightAnswerPer", "fastPace", "fastPace"],
 				// 团体成绩列表
 				rank1List: ["teamCpRs", "teamDistanceRs", "teamRightAnswerPerRs", "teamPaceRs", "teamSpeedRs"],
 				// 个人成绩列表
@@ -596,7 +596,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 											"height": "72px"
 										},
 										"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-										"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+										"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 										"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 										"pointList": [
 											{
@@ -653,7 +653,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankList
 											"height": "72px"
 										},
 										"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-										"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+										"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 										"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 										"pointList": [
 											{

+ 2 - 2
card/pages/bm/style4/rankOverview.vue

@@ -20,7 +20,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 			<view class="mid uni-column">
 				<view class="mid-0 uni-row uni-jcsb">
 					<e-select class="" v-model="ocaId" :options="mapList" :search="false" :inputClick="true"
-						:clearable="false" @change="eSelectChange"></e-select>
+						maxHeight="300px" :clearable="false" @change="eSelectChange"></e-select>
 				</view>
 				<view class="mid-1 uni-row uni-jcsa">
 					<text class="mid-1-text">{{nickName}}</text>
@@ -674,7 +674,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/rankOverview
 											"height": "72px"
 										},
 										"topMemo": "<view style='color:#E60012;font-size:14px;'>品质消费引领者 &nbsp; &nbsp; 美好生活推荐官</view>",
-										"bottomMemo": "<view style='display: block; margin-top: 20px; text-align: center; font-weight: 500; font-size: 14px;'>优惠券使用说明</view>",
+										"bottomMemo": "<view style='display: flex; align-items: center; justify-content: center; margin-top: 20px; color: #E67300; font-weight: 500; font-size: 15px; text-decoration-line: underline;'><image src='static/common/bulb.png' style='width: 22px; height: 26px; margin-right: 6px;'></image>点击查看《优惠券使用说明》</view>",
 										"bottomMemoUrl": "https://oss-mbh5.colormaprun.com/page/explanation/inzone.html",
 										"pointList": [
 											{

+ 4 - 3
card/pages/bm/style4/signup.vue

@@ -23,7 +23,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 			</view>
 
 			<view class="main uni-column uni-jct">
-				<input class="uni-input" maxlength="20" :placeholder="'请填写'+configParam.labelName" placeholder-style="font-size: 14px;" v-model="nickName" />
+				<input class="uni-input" maxlength="12" :placeholder="'请填写'+configParam.labelName" placeholder-style="font-size: 14px;" v-model="nickName" />
 				<e-select v-model="coiId" :options="coiRs" :props="eSelectionProps" clearable
 					maxHeight="40vh" :placeholder="'请选择'+configParam.labelOrg+'(可输入关键字)'" @getText="getESelectText"
 					@change="eSelectChange"></e-select>
@@ -716,7 +716,7 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 	}
 
 	.timebar {
-		width: 68%;
+		min-width: 68%;
 		height: 32px;
 		margin-top: -17px;
 		padding: 0 15px;
@@ -731,7 +731,8 @@ https://oss-mbh5.colormaprun.com/card/#/pages/bm/style4/signup
 	.acttime {
 		font-weight: 550;
 		color: #333333;
-		font-size: 15px;
+		font-size: 14px;
+		text-wrap: nowrap;
 	}
 
 	.clock {

BIN
card/static/common/bulb.png


BIN
card/static/logo.png