Просмотр исходного кода

1: 2.2.1版本
2: 修改首页ui显示

slambb 5 лет назад
Родитель
Сommit
e080b9b43a

+ 12 - 9
components/modal/boxing-hit/boxing-hit.vue

@@ -15,7 +15,7 @@
 		 position: relative; width: 100%;">
 
 			<!-- 波动 -->
-			<view v-if="mode !== 'pkMode'" class="flex justify-around align-center" style="width: 600rpx;height: 100rpx;">
+			<view v-if="mode !== 'pkMode'" class="flex justify-around align-center" style="width: 600rpx;height: 100rpx; margin: 20rpx;">
 				<view style="height: 1rpx;width: 80rpx;background-color: #FFFFFF;"></view>
 				<view style="display: flex; justify-content: center; align-self: center; height: 100%;">
 					<view style="display: flex; justify-content: center; align-items: center;">
@@ -57,7 +57,8 @@
 			</view>
 
 
-			<view v-if="mode == 'pkMode'" style="height: 80rpx;"></view>
+			<view v-if="mode == 'pkMode'" style="height: 110rpx;"></view>
+			<view v-else style="height: 20rpx;"></view>
 
 			<!-- 控制按钮 -->
 			<view class="flex justify-center " :class="mode == 'pkMode'?'big':''" style="margin-top: 40rpx;" @tap="onControlPlay">
@@ -70,8 +71,8 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="mode == 'pkMode'" style="height: 80rpx;"></view>
-			<view style="margin-top: 40rpx;width: 310rpx; height: 90rpx;"></view>
+			<!-- <view v-if="mode == 'pkMode'" style="height: 160rpx;"></view> -->
+			<!-- <view style="margin-top: 40rpx;width: 310rpx; height: 90rpx;"></view> -->
 			<!-- 模式按钮  @tap="onChangeMode"-->
 			<!-- <view class="flex justify-center " style="margin-top: 40rpx;">
 				<view style="position: relative; width: 310rpx; height: 90rpx;background-color: #FFFFFF; display: flex;flex-direction: row;justify-content: center;align-items: center; border-radius: 50rpx;">
@@ -80,9 +81,11 @@
 					</view>
 				</view>
 			</view> -->
-			<view v-if="mode == 'pkMode'" style="height: 20rpx;"></view>
+			<!-- <view v-if="mode == 'pkMode'" style="height: 20rpx;"></view> -->
+			<view v-if="mode == 'pkMode'" style="height: 170rpx;"></view>
+			<view v-else style="height: 110rpx;"></view>
 
-			<view v-if="mode == 'pkMode'" class="hit-vertical-container" :style="{'top': mode == 'pkMode'?'-50rpx':'-300rpx'}">
+			<view v-if="mode == 'pkMode'" class="hit-vertical-container" :style="{'top': mode == 'pkMode'?'-120rpx':'-300rpx'}">
 				<view class="hit-vertical-bar">
 					<view class="hit-vertical-child" v-for="(item, index) in 25" :key="index">
 						<view :class="25-aiShowCount>=index+1? 'hit-vertical-active':'hit-vertical-inactive'"></view>
@@ -96,7 +99,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-else class="hit-vertical-container" :style="{'top': mode == 'pkMode'?'-50rpx':'-300rpx'}">
+			<view v-else class="hit-vertical-container" :style="{'top': mode == 'pkMode'?'-120rpx':'-300rpx'}">
 				<view class="hit-vertical-bar">
 					<view class="hit-vertical-child" v-for="(item, index) in 25" :key="index">
 						<view :class="showCount>=index+1? 'hit-vertical-active':'hit-vertical-inactive'"></view>
@@ -115,7 +118,7 @@
 		<!-- <button style="margin-top: 100rpx;" @tap="onTestHit('left')">击中</button> -->
 
 		<!-- 显示数据 -->
-		<view class="flex justify-around " style="margin: 60rpx 15rpx;">
+		<view class="flex justify-around " style="margin: 0rpx 15rpx;">
 			<view class="boxing-item-bg">
 				<image src="/static/modal/boxing-hit/f.png" class="boxing-hit-png " mode="aspectFit"></image>
 				<view class="text-white text-13px" style="margin: 10rpx 0;">最大力量</view>
@@ -181,7 +184,7 @@
 		},
 		data() {
 			return {
-				mode: 'pkMode', //pkMode calorieMode
+				mode: 'calorieMode', //pkMode calorieMode
 				//满格的数值是 25
 				maxShowCount: 25,
 				//pk模式下,两边涨的区分,自己和ai

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.2.0",
-    "versionCode" : 21020903,
+    "versionName" : "2.2.1",
+    "versionCode" : 21020904,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 4 - 3
pages/personal-page/personal/personal.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="content bg-person " :class="bEFHitShake?' screen-jitter ':''">
+		<!-- :title="title" -->
 		<!-- 自定义导航栏 backgroundColor="rgba(164, 136, 220, 1)"  @clickRight="onSyncData" @clickRight="onTestShare"-->
 		<uni-nav-bar id="nav-bar" status-bar="true" backgroundColor="rgba(153, 150, 252, 255)" @clickLeft="showClickEvent()"
-		 @clickRight="onNavAppInfo()" :title="title" color="#FFFFFF" fixed="true" :border="false">
+		 @clickRight="onNavAppInfo()" title="" color="#FFFFFF" fixed="true" :border="false">
 			<view slot="left">
 				<view class=" flex align-center margin-left">
 					<image class="png-more" src="/static/more.png"></image>
@@ -29,7 +30,7 @@
 					<scroll-view scroll-y="true" style="height: 100%; width: 100%;">
 						<view class="plan-view">
 							<!-- 拳击模块 -->
-							<view v-if="currentMode == 'pkMode'" style="display: flex; flex-direction: row; height: 200rpx; margin-top: 120rpx; justify-content: space-around;align-items: center;">
+							<view v-if="currentMode == 'pkMode'" style="display: flex; flex-direction: row; height: 200rpx; margin-top: 140rpx; justify-content: space-around;align-items: center;">
 								<view>
 									<view class="cu-avatar-group" style="position: relative;">
 										<view class="cu-avatar round xl" :class="bAiHitShake?' screen-jitter':''" :style="[{ backgroundImage:'url('+avatarUrl+')' }]"></view>
@@ -734,7 +735,7 @@
 					name: '匿名',
 					avatar: '/static/defaultAvatar.png'
 				},
-				currentMode: 'pkMode', //calorieMode
+				currentMode: 'calorieMode', //pkMode calorieMode
 
 				bHitShake: false,