2.3.5 21022701

components/code-elf-guide/code-elf-guide.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
 		<view class="swiper">
+			<!-- 计划 -->
 			<view class="swiper-item" v-if="thisCurrent==0">
 				<view class="swiper-project" :class="thisCurrent==0&&bShow?'active':''">
 					<view style="display: flex;flex-direction: column;" :style="{'margin-top' :projectTop+'px'}">
@@ -23,7 +24,7 @@
 					</view>
 				</view>
 			</view>
-
+			<!-- 下滑连接蓝牙提示 -->
 			<view class="swiper-item" v-if="thisCurrent==1">
 				<view class="swiper-bluetooth">
 					<image style="margin: 10rpx;  width: 50rpx;height: 50rpx;" src="/static/guide/BLE_arrow.png" mode="aspectFit"></image>
@@ -35,7 +36,7 @@
 					</view>
 				</view>
 			</view>
-
+			<!-- 提示调整添加蓝牙设备 -->
 			<view class="swiper-item" v-if="thisCurrent==3">
 				<!-- <button>{{deviceTop}}</button> -->
 				<view class="swiper-device active">
@@ -52,7 +53,7 @@
 						<image style="width: 394rpx;height: 123rpx;" src="/static/guide/device_tip.png" mode="aspectFit"></image>
 					</view>
 
-					<view style="display: flex;align-self: center;margin-top: 200px;">
+					<view style="display: flex;align-self: center;margin-top: -200px;">
 						<view @tap="launchFlag(true)">
 							<image style="width: 120px;height: 45px;" src="/static/guide/BLE_tip.png"></image>
 						</view>
@@ -60,7 +61,7 @@
 				</view>
 
 			</view>
-
+			<!-- 连接设备提示 -->
 			<view class="swiper-item" v-if="thisCurrent==4">
 				<!-- <button>{{deviceTop}}</button> -->
 				<view class="swiper-device active">
@@ -91,6 +92,7 @@
 				</view>
 
 			</view>
+			<!-- 拳击血量提示 -->
 			<view class="swiper-item" v-if="thisCurrent==5">
 				<view class="swiper-device active">
 					<view class="guide-vertical-container">

manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.3.4",
-    "versionCode" : 21022603,
+    "versionName" : "2.3.5",
+    "versionCode" : 21022701,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/personal-page/personal/personal.vue

@@ -1747,8 +1747,8 @@
 					// }
 					//2.检测是否有设备
 					if (this.BLEDeviceShowList.length == 0) {
-						// this.$store.state.bGuidePages = true;
-						// this.guideCurrent = 1;
+						this.$store.state.bGuidePages = true;
+						this.guideCurrent = 3;
 						uni.showToast({
 							title: '请添加蓝牙设备',
 							icon: 'none'
@@ -2253,15 +2253,18 @@
 					//跳转计划页面
 					this.openPlan();
 				} else if (e.current == 1 && !e.onlyHide) {
+					console.log('guideHide:',e.current);
 					//跳转搜索设备页面
-					this.openDeviceList();
+					// this.openDeviceList();
 				} else if (e.current == 3 && !e.onlyHide) {
 					//新手引导跳转扫码页面，直接走绑定 再check
-					this.openQRCode((res) => {
-						setTimeout(() => {
-							this.onPersonalCheck();
-						}, 200);
-					});
+					// this.openQRCode((res) => {
+					// 	setTimeout(() => {
+					// 		this.onPersonalCheck();
+					// 	}, 200);
+					// });
+					// 跳转连接蓝牙页面
+					this.openDeviceList();
 				} else if (e.current == 4 && !e.onlyHide) {
 					//连接绑定设备
 					// this.openQRCode();