Browse Source

1.切换 uniapp_3.2.9 sdk
2.修复nvue侧滑栏显示问题

slambb 3 years ago
parent
commit
0626b340d0

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.4.29",
-    "versionCode" : 21102002,
+    "versionName" : "2.4.30",
+    "versionCode" : 21102202,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 13 - 11
pages/game-page/game-play-sub/subGame/subGame.nvue

@@ -1,9 +1,12 @@
 <template>
-	<view class="web-view">
+	<view>
 		<!-- :src="url" src = 'http://192.168.0.112:7456/build/index.html' :src="LocationGameUrl" -->
 		<!-- @receivedtitle="onReceivedTitle"   @pagefinish="onPageFinish"-->
-		<web-view class="web-view-child" :src="url" ref="webview" @pagestart="onPageStart"
-			@onPostMessage="handlePostMessage" @error="onError"></web-view>
+		<view class="web-view">
+			<web-view class="web-view-child" :src="url" ref="webview" @pagestart="onPageStart"
+				@onPostMessage="handlePostMessage" @error="onError"></web-view>
+		</view>
+
 		<view class="web-back" @click="navBack">
 			<image style="width: 40rpx;height: 40rpx;" src="/static/gameCloseW.png"></image>
 		</view>
@@ -79,7 +82,7 @@
 
 				//拳击数据判断对象
 				EquipmentActionObj: null,
-			
+
 				BLENum: 0,
 				BLEACX: 0,
 				BLEACYL: 0,
@@ -88,13 +91,13 @@
 				bGameOpenListen: false,
 				//手机陀螺仪和加速计android模块
 				bMyAttitudeListen: false,
-				
+
 				/**
 				 * 跳绳相应数据
 				 */
 				//跳绳数据判断对象
 				actionJumpObj: null,
-				BLEAccIndex:0
+				BLEAccIndex: 0
 			}
 		},
 		onLoad() {
@@ -206,7 +209,7 @@
 			...mapMutations(['addlocalCalorie', 'syncRequestEvent', 'onWriteBLEConnectionValue',
 				'gCreateFilterObj', 'gUpdateFilter', 'B_OpenRopeSkipping', 'B_CloseRopeSkipping',
 				'gStopSimulateBLEUpdate', 'gStartSimulateBLEUpdate', 'gUpdateSandbagAlgorithm',
-				'gCreateSandbagAlgorithm','onConvertDeviceData'
+				'gCreateSandbagAlgorithm', 'onConvertDeviceData'
 			]),
 			navBack() {
 
@@ -1057,12 +1060,12 @@
 				this.xA = alpha * this.xA + (1 - alpha) * _ax;
 				this.yA = alpha * this.yA + (1 - alpha) * _ay;
 				this.zA = alpha * this.zA + (1 - alpha) * _az;
-			
+
 				//高通滤波获取线性速度
 				let linear_acceleration_x = _ax - this.xA;
 				let linear_acceleration_y = _az - this.zA;
 				let linear_acceleration_z = _ay - this.yA;
-			
+
 				let _temp = {
 					linearAcc: {
 						lAccX: linear_acceleration_x,
@@ -1112,7 +1115,6 @@
 
 	.web-view-child {
 		width: 750rpx;
-		height: 100%;
 		flex: 1;
 	}
 
@@ -1158,7 +1160,7 @@
 		opacity: 0.5;
 
 		/* #ifndef APP-PLUS-NVUE */
-		z-Index: 100;
+		/* z-Index: 999; */
 		display: flex;
 		/* #endif */
 

+ 21 - 4
pages/my-page/homepage/homepage.vue

@@ -8,8 +8,8 @@
 					<image class="p-left-arrow" src="../../../static/p-left-arrow.png"></image>
 				</view>
 			</view> -->
-			<view slot="middle">
-				<view class="flex justify-center align-center"
+			<view slot="right">
+				<!-- <view class="flex justify-center align-center"
 					style="margin-left: 220rpx; ">
 					<view class="flex align-center" style="margin-right: 40rpx; padding: 0 18px; height: 56rpx; background-color: rgba(183,183,183,0.33); border-radius: 13.5px;">
 						<image class="png-more" style="margin-right: 16rpx;"
@@ -21,6 +21,23 @@
 							src="/static/common/sideBar/sDiamond.png"></image>
 						<view  class="text-14px" style="line-height: 28rpx;">{{cDiamond}}</view>
 					</view>
+				</view> -->
+				
+				<view class="flex justify-center align-center" style="margin-right: 400rpx;">
+					<view class="flex align-center justify-between"
+						style="margin-right: 40rpx; padding: 0 16rpx; height: 56rpx; background-color: rgba(183,183,183,0.33); border-radius: 13.5px;">
+						<image class="png-more" style="margin-right: 16rpx;"
+							src="/static/common/sideBar/sGold.png">
+						</image>
+						<view class="text-15px text-center" style="line-height: 56rpx; min-width: 100rpx;">{{cGold}}</view>
+					</view>
+					<view class="flex align-center justify-between"
+						style="padding: 0 16rpx; height: 56rpx; background-color: rgba(183,183,183,0.33); border-radius: 13.5px;">
+						<image  style="margin-right: 16rpx; width: 38rpx; height: 34rpx; "
+							src="/static/common/sideBar/sDiamond.png">
+						</image>
+						<view class="text-15px text-center" style="line-height: 56rpx; min-width: 100rpx;">{{cDiamond}}</view>
+					</view>
 				</view>
 			</view>
 		
@@ -213,8 +230,8 @@
 				// 	title: "提示",
 				// 	content: "功能尚未开放"
 				// })
-				uni.navigateTo({
-					url: '../../game-page/game/game'
+				uni.switchTab({
+					url: '../../game-page/game-video/game-video'
 				});
 			},
 			onBack(){

+ 9 - 9
pages/personal-page/personal/personal.vue

@@ -9,21 +9,21 @@
 					<image class="png-more" src="/static/more.png"></image>
 				</view>
 			</view>
-			<view slot="middle">
-				<view class="flex justify-center align-center" style="margin-left: 160rpx; ">
-					<view class="flex align-center "
-						style="margin-right: 40rpx; padding: 0 18px; height: 56rpx; background-color: rgba(255, 153, 0, 1); border-radius: 13.5px;">
+			<view slot="right">
+				<view class="flex align-center" style="margin-right: 400rpx;">
+					<view class="flex align-center justify-between"
+						style="margin-right: 40rpx; padding: 0 16rpx; height: 56rpx; background-color: rgba(255, 153, 0, 1); border-radius: 13.5px;">
 						<image class="png-more-black" style="margin-right: 16rpx;"
 							src="/static/common/sideBar/gold_black@2x.png">
 						</image>
-						<view class="text-14px" style="line-height: 28rpx;">{{cGold}}</view>
+						<view class="text-15px text-center" style="line-height: 56rpx; min-width: 100rpx;">{{cGold}}</view>
 					</view>
-					<view class="flex  align-center"
-						style="padding: 0 18px; height: 56rpx; background-color: rgba(255, 153, 0, 1); border-radius: 13.5px;">
-						<image class="png-more-black" style="margin-right: 16rpx; "
+					<view class="flex align-center justify-between"
+						style="padding: 0 16rpx; height: 56rpx; background-color: rgba(255, 153, 0, 1); border-radius: 13.5px;">
+						<image class="png-more-black" style="margin-right: 16rpx; width: 36rpx; height: 38rpx;"
 							src="/static/common/sideBar/diamond_black@2x.png">
 						</image>
-						<view class="text-14px" style="line-height: 28rpx;">{{cDiamond}}</view>
+						<view class="text-15px text-center" style="line-height: 56rpx; min-width: 100rpx;">{{cDiamond}}</view>
 					</view>
 				</view>
 			</view>

+ 9 - 9
platform/app-plus/subNVue/drawer.nvue

@@ -18,12 +18,13 @@
 				</view>
 			</view>
 			<view class="flex justify-center align-center  position-relative" style="height: 256rpx;">
-				<view class="pos-top-center ">
-					<image class="bg-days" src="../../../static/bg-days.png"></image>
+				<view class="position-absolute-center-top">
+					<view class="pos-top-center ">
+						<image class="bg-days" src="../../../static/bg-days.png"></image>
+					</view>
+					<text class="text-12px text-right text-white bg-days-text">{{days}}天</text>
 				</view>
-				<text class="text-12px text-right text-white bg-days-text">{{days}}天</text>
-				<text
-					class="text-more text-13px text-gray text-cut text-lines1 margin-12px ">{{signature!=='null'?signature:'111111111'}}</text>
+				<text class="text-more text-13px text-grey text-cut text-lines1">{{signature!=='null'?signature:''}}</text>
 			</view>
 			<list class="list-wrapper">
 				<cell v-for="item in lists" :key="item.id">
@@ -57,8 +58,7 @@
 		]),
 		data() {
 			return {
-				lists: sideBarData.getSideBarList,
-				signature: null
+				lists: sideBarData.getSideBarList
 			}
 		},
 		beforeCreate() {
@@ -214,8 +214,8 @@
 
 	.text-more {
 		width: 200px;
-		line-height: 13px;
-		height: 13px;
+		line-height: 20px;
+		height: 20px;
 	}
 
 	/* 自定义导航栏的图片大小 */