v1.0.8

manifest.json

@@ -2,8 +2,8 @@
     "name" : "定向场控",
     "appid" : "__UNI__B2C7D60",
     "description" : "小飞龙定向场控系统",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/AO/mapShow.vue

@@ -4,7 +4,7 @@
 
 		<view v-show="popupShow" class="popup" :style="{ height: popupHeight + 'px', width: popupWidth + 'px' }">
 			<!-- <uni-section title="活动路线列表" type="line"> -->
-				<uni-data-picker class="actionsTree" placeholder="请选择活动" popup-title="请选择活动路线" :localdata="actionsTree"
+				<uni-data-picker class="actionsTree" :style="{ width: popupWidth + 'px' }" placeholder="请选择活动" popup-title="请选择活动路线" :localdata="actionsTree"
 					v-model="sltActRoute" @change="onActionChange" @popupopened="onActionsTreePopupOpened" @popupclosed="onActionsTreePopupClosed"></uni-data-picker>
 			<!-- </uni-section> -->
 
@@ -27,8 +27,8 @@
 										{{item.distance}}米 配速 {{formatTime(item.pace, false)}}
 									</view>
 									<view class="slot-note">
-										心率 {{item.lasthr}} 平均 {{item.avghr}} 最大 {{item.maxhr}} | CAL
-										{{Math.round(item.calorie/1000)}} Ck {{Math.round(item.ck/1000)}} Ei
+										心率 {{item.lasthr}} 平均 {{item.avghr}} 最大 {{item.maxhr}} | Cal
+										{{Math.round(item.calorie/1000)}} Ck {{item.ck}} Ei
 										{{Math.round(item.ei*100)/100}}
 									</view>
 								</view>
@@ -81,7 +81,7 @@
 				popupHeight: 0,
 				popupWidth: 0,
 				popupHeightPortrait: 360, // 竖屏状态下的底部弹框高度
-				popupWidthlandscape: 330, // 横屏状态下的右侧弹框宽度
+				popupWidthlandscape: 336, // 横屏状态下的右侧弹框宽度
 				popupType: 'bottom',
 				popupShow: false,
 				extraIcon: {
@@ -228,7 +228,7 @@
 							value: act.actid + '-' + course.courseid
 						})
 					}
-					if (actUserNum > 0) {
+					if (actUserNum >= 0) {
 						pushData.children.unshift({
 							text: '全部 (' + actUserNum + '人)',
 							value: act.actid + '-' + 0
@@ -605,7 +605,7 @@
 	}
 	
 	.actionsTree {
-		width: 100%;
+		// width: 100%;
 		// background-color: #ffffff;
 		
 		/deep/ .input-value-border {
@@ -646,7 +646,8 @@
 		/* #endif */
 		flex-direction: column;
 		align-items: flex-start;
-		max-width: 280px;
+		width: 330px;
+		max-width: 350px;
 	}
 
 	.slot-image {

utils/map/sub/player.js

@@ -38,6 +38,7 @@ export default {
 		}
 		if (togglePlayerFlag) {
 			this.playerLayerGroup.addTo(global.map)
+			this.toggleTooltip(store.state.mapControlTooltip)
 		}
 	},
 	togglePlayer(flag) {
@@ -232,7 +233,7 @@ export default {
 		popupContent += '<div>打点 ' + player.effectivenum + '/' + player.totalcontrolnum +
 			' &nbsp; 距离 ' + player.distance + '米 &nbsp; 配速 ' + formatTime(player.pace, false) + '</div>'
 		popupContent += '<div>' + '心率 ' + player.lasthr + ' &nbsp; 平均 ' + player.avghr + ' &nbsp; 最大 ' + player.maxhr + '</div>'
-		popupContent += '<div>Cal ' + Math.round(player.calorie / 1000) + ' &nbsp; Ck ' + Math.round(player.ck / 1000) +
+		popupContent += '<div>Cal ' + Math.round(player.calorie / 1000) + ' &nbsp; Ck ' + player.ck +
 			' &nbsp; Ei ' + Math.round(player.ei * 100) / 100 + '</div>'
 		popupContent += '</div>'