ios 修改部分

App.vue

@@ -1,145 +1,151 @@
-<script>
-	import config from 'common/config.js';
-	import {
-		mapMutations
-	} from 'vuex'
-	export default {
-
-		methods: {
-			...mapMutations(['onLuanchLogin', 'getBLEDeviceList', 'getFinalUseDevice', 'onAccAndGyroConvertDataGet',
-				'getGuideUnlockState', 'setGuideUnlockState'
-			]),
-
-		},
-		onLaunch: function() {
-			console.log('App Launch');
-			//这里先隐藏游戏和视频栏目
-			uni.setTabBarItem({
-				index:2,
-				visible:false
-			})
-			uni.setTabBarItem({
-				index:3,
-				visible:false
-			})
-			// 先判断 系统版本
-			const _systemInfo = uni.getSystemInfoSync();
-			// uni.getSystemInfo({
-			// 	success: (res) => {
-			// 		console.log("系统信息:", res);
-			// 		this.$store.state.clientName = res.model;
-			// 		this.$store.state.system = res.system;
-			// 		this.$store.state.platform = res.platform;
-			// 		this.$store.state.systemInfo = res;
-			// 	},
-			// 	fail: (err) => {},
-			// 	complete: () => {}
-			// })
-			console.log("系统信息:", _systemInfo);
-			this.$store.state.clientName = _systemInfo.model;
-			this.$store.state.system = _systemInfo.system;
-			this.$store.state.platform = _systemInfo.platform;
-			this.$store.state.systemInfo = _systemInfo;
-			//获取记录的最后一次连接
-			this.getFinalUseDevice();
-			//获取记录的蓝牙列表数据
-			this.getBLEDeviceList();
-
-			// #ifdef APP-PLUS
-			plus.runtime.getProperty(plus.runtime.appid, (info) => {
-				console.log("version:", info);
-				this.$store.state.version = info.version;
-				this.$store.state.versionCode = info.versionCode;
-				this.$store.state.appName = info.name;
-			});
-
-			// 锁住屏幕正方向
-			plus.screen.lockOrientation('portrait-primary');
-			// 屏幕常亮
-			// 下面这个打包要开启手机设置权限
-			plus.device.setWakelock(true);
-			// #endif
-
-			// #ifdef MP
-			//开始登陆
-			this.onLuanchLogin({});
-			// #endif
-
-
-			this.onAccAndGyroConvertDataGet();
-
-
-			// this.setGuideUnlockState({
-			// 	//是否首次安装
-			// 	firstInstallation: true,
-			// 	firstDisconnectBluetooth: true,
-			// 	firstUnlockJumpUp: true,
-			// 	firstUnlockLeftAndRightJump: true,
-			// 	firstUnlockLeftAndRightRotationJump: true
-			// });
-			//获取guide任务的解锁状态
-			this.getGuideUnlockState();
-			
-			
-			if (plus.runtime.isApplicationExist({
-					pname: 'com.tencent.mm',
-					action: 'weixin://'
-				})) {
-				//安装了微信
-				// console.log("安装了微信");
-				this.$store.state.bInstallWechat = true;
-			} else {
-				//未安装微信
-				// console.log("未安装微信");
-				this.$store.state.bInstallWechat = false;
-			}
-			
-		},
-		onShow: function() {
-			console.log('App Show');
-			// #ifdef APP-PLUS
-			// 锁住屏幕正方向
-			// plus.screen.lockOrientation('portrait-primary');
-			// 屏幕常亮
-			// plus.device.setWakelock(true);
-			// 下面这个打包要开启手机设置权限
-			// uni.setScreenBrightness({
-			//     value: 0.8,
-			//     success: function () {
-			//         console.log('setScreenBrightness success');
-			//     }
-			// });
-			// uni.setKeepScreenOn({
-			// 	keepScreenOn: true,
-			// 	success: function () {
-			// 	    console.log('setKeepScreenOn success');
-			// 	}
-			// });
-			// let self = this;
-			// uni.getScreenBrightness({
-			//     success: function (res) {
-			//         console.log('屏幕亮度值：' + res.value);
-			// 		self.Test = '=='+plus.device.isWakelock()+ '=getScreenBrightness success';
-			// 		self.screenValue = res.value;
-			//     }
-			// });
-			// #endif
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-
-	}
-</script>
-<!-- <style src="@/util/util-css/main-nvue.css"></style> -->
-<style>
-	/*每个页面公共css */
-	// #ifndef APP-PLUS-NVUE
-	@import "util/util-css/main.css";
-	@import "util/util-css/icon.css";
-	// #endif
-	/* nvue 页面公共css */
-	// #ifdef APP-PLUS-NVUE 
-	@import "util/util-css/main-nvue.css";
-	// #endif 
+<script>
+	import config from 'common/config.js';
+	import {
+		mapMutations
+	} from 'vuex'
+	export default {
+
+		methods: {
+			...mapMutations(['onLuanchLogin', 'getBLEDeviceList', 'getFinalUseDevice', 'onAccAndGyroConvertDataGet',
+				'getGuideUnlockState', 'setGuideUnlockState'
+			]),
+
+		},
+		onLaunch: function() {
+			console.log('App Launch');
+			//这里先隐藏游戏和视频栏目
+			uni.setTabBarItem({
+				index: 2,
+				visible: false
+			})
+			uni.setTabBarItem({
+				index: 3,
+				visible: false
+			})
+			// 先判断 系统版本
+			const _systemInfo = uni.getSystemInfoSync();
+			// uni.getSystemInfo({
+			// 	success: (res) => {
+			// 		console.log("系统信息:", res);
+			// 		this.$store.state.clientName = res.model;
+			// 		this.$store.state.system = res.system;
+			// 		this.$store.state.platform = res.platform;
+			// 		this.$store.state.systemInfo = res;
+			// 	},
+			// 	fail: (err) => {},
+			// 	complete: () => {}
+			// })
+			console.log("系统信息:", _systemInfo);
+			this.$store.state.clientName = _systemInfo.model;
+			this.$store.state.system = _systemInfo.system;
+			this.$store.state.platform = _systemInfo.platform;
+			this.$store.state.systemInfo = _systemInfo;
+			//获取记录的最后一次连接
+			this.getFinalUseDevice();
+			//获取记录的蓝牙列表数据
+			this.getBLEDeviceList();
+
+			// #ifdef APP-PLUS
+			plus.runtime.getProperty(plus.runtime.appid, (info) => {
+				console.log("version:", info);
+				this.$store.state.version = info.version;
+				this.$store.state.versionCode = info.versionCode;
+				this.$store.state.appName = info.name;
+			});
+
+			// 锁住屏幕正方向
+			plus.screen.lockOrientation('portrait-primary');
+			// 屏幕常亮
+			// 下面这个打包要开启手机设置权限
+			plus.device.setWakelock(true);
+			// #endif
+
+			// #ifdef MP
+			//开始登陆
+			this.onLuanchLogin({});
+			// #endif
+
+
+			this.onAccAndGyroConvertDataGet();
+
+
+			// this.setGuideUnlockState({
+			// 	//是否首次安装
+			// 	firstInstallation: true,
+			// 	firstDisconnectBluetooth: true,
+			// 	firstUnlockJumpUp: true,
+			// 	firstUnlockLeftAndRightJump: true,
+			// 	firstUnlockLeftAndRightRotationJump: true
+			// });
+			//获取guide任务的解锁状态
+			this.getGuideUnlockState();
+
+
+			if (plus.runtime.isApplicationExist({
+					pname: 'com.tencent.mm',
+					action: 'weixin://'
+				})) {
+				//安装了微信
+				// console.log("安装了微信");
+				this.$store.state.bInstallWechat = true;
+			} else {
+				//未安装微信
+				// console.log("未安装微信");
+				this.$store.state.bInstallWechat = false;
+			}
+
+		},
+		onShow: function() {
+			console.log('App Show');
+			// #ifdef APP-PLUS
+			// 设置非暗夜模式
+			var style = plus.navigator.getUIStyle();
+			if ('dark' == style) {
+				plus.nativeUI.setUIStyle('light');
+			}
+
+			// 锁住屏幕正方向
+			// plus.screen.lockOrientation('portrait-primary');
+			// 屏幕常亮
+			// plus.device.setWakelock(true);
+			// 下面这个打包要开启手机设置权限
+			// uni.setScreenBrightness({
+			//     value: 0.8,
+			//     success: function () {
+			//         console.log('setScreenBrightness success');
+			//     }
+			// });
+			// uni.setKeepScreenOn({
+			// 	keepScreenOn: true,
+			// 	success: function () {
+			// 	    console.log('setKeepScreenOn success');
+			// 	}
+			// });
+			// let self = this;
+			// uni.getScreenBrightness({
+			//     success: function (res) {
+			//         console.log('屏幕亮度值：' + res.value);
+			// 		self.Test = '=='+plus.device.isWakelock()+ '=getScreenBrightness success';
+			// 		self.screenValue = res.value;
+			//     }
+			// });
+			// #endif
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+
+	}
+</script>
+<!-- <style src="@/util/util-css/main-nvue.css"></style> -->
+<style>
+	/*每个页面公共css */
+	// #ifndef APP-PLUS-NVUE
+	@import "util/util-css/main.css";
+	@import "util/util-css/icon.css";
+	// #endif
+	/* nvue 页面公共css */
+	// #ifdef APP-PLUS-NVUE 
+	@import "util/util-css/main-nvue.css";
+	// #endif 
 </style>

common/config.js

@@ -5,13 +5,13 @@ const endTime = "2021-03-01"
 //************* 默认的蓝牙设备刷新间隔 再config 设置 a:10ms,b:20ms*************
 const refreshRate = "a";
 //*******当前活动环境，需要和根据地址设置！！环境 dev，prd
-const active = "dev";
+const active = "prd";
 //线上地址，腾讯云服务器
 const host="https://www.9527fun.cn/api_prd"
 //测试地址，阿里云服务器
 // const host = "https://www.9527fun.cn/api_dev"
 //本地测试地址
-// const host = "http://192.168.0.108:9090/api_dev"
+// const host = "http://192.168.0.100:9090/api_prd"
 
 const URL = {
 	//验证token,获取服务器返回的信息

components/m-input.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="m-input-view">
-		<input :focus="focus_" :maxlength="maxlength" :type="inputType" :value="value" @input="onInput" class="m-input-input"
+		<input :inputmode="inputMode" :focus="focus_" :maxlength="maxlength" :type="inputType" :value="value" @input="onInput" class="m-input-input"
 		 placeholder-style="color:rgba(170, 170, 170, 1);" :placeholder="placeholder" :password="type==='password'&&!showPassword"
 		 @focus="onFocus" @blur="onBlur" />
 		<!-- 优先显示密码可见按钮 -->
@@ -26,6 +26,10 @@
 			mIcon
 		},
 		props: {
+			inputmode:{
+				type: String,
+				default: "none"
+			},
 			/**
 			 * 输入类型
 			 */
@@ -82,6 +86,9 @@
 			}
 		},
 		computed: {
+			inputMode() {
+				return this.inputmode
+			},
 			inputType() {
 				const type = this.type
 				return type === 'password' ? 'text' : type
@@ -126,6 +133,7 @@
 		width: 580rpx;
 		flex: 1;
 		padding: 0 10rpx;
+		z-index: 100;
 		/* position: relative; */
 	}
 

components/modal/action-hit/action-hit.vue

@@ -766,7 +766,7 @@
 
 					if (2 === i) {
 						if(!bPlayAudio){
-							console.log("play video2 = "+i);
+							// console.log("play video2 = "+i);
 							bPlayAudio = true;
 							//声音播放
 							if (this.spawnArray[i].jumpName == "RIGHT") {

manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.5.39",
-    "versionCode" : 23031001,
+    "versionName" : "2.5.40",
+    "versionCode" : 23032001,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/Loading-page/Loading/Loading.vue

@@ -49,6 +49,8 @@
 							
 
 						} else {
+							//清空保存的storage
+							uni.clearStorageSync();
 							//如果token 不合法，不存在，跳转登录页面
 							_self.onNavTo("login");
 						}

pages/login-page/bindPhone/bindPhone.vue

@@ -15,7 +15,7 @@
 		<view class="input-container" style="margin: 32px 102rpx 0 68rpx;">
 			<view class="make-text-bPurple text-bold margin-bottom" style="font-size: 20px;">{{pageTitle}}</view>
 			<view class="input-row padding" style="width: 318px;">
-				<m-input :type="bBindPhone?'number':'string'" :maxlength="bBindPhone?'11':'32'" clearable
+				<m-input :inputmode="bBindPhone?'numeric':'email'" :type="bBindPhone?'number':'text'" :maxlength="bBindPhone?'11':'32'" clearable
 					v-model="account" :placeholder="bBindPhone?'请填写11位手机号码':'请输入邮箱'"></m-input>
 			</view>
 		</view>

pages/login-page/login/login.vue

@@ -17,6 +17,7 @@
 				</view>
 				<!-- bMobileLogin -->
 				<view v-if="bPhoneNumberAndPasswordLogin">
+					
 					<view class="input-container" style="margin: 10px 102rpx 0 68rpx;">
 						<view class="input-row padding  align-center" style="width: 318px;">
 							<view class="text-18px text-regular " style="width: 72rpx;white-space:nowrap;">
@@ -25,11 +26,12 @@
 							<view class="margin-left-sm margin-right-sm"
 								style="width: 2rpx; height: 25rpx; background-color: rgba(209, 209, 209, 1);">
 							</view>
-							<m-input focus="true" :type="bMobileLogin?'number':'string'" :maxlength="bMobileLogin?'11':'32'"
+							<m-input :focus="true" :inputmode="bMobileLogin?'numeric':'email'" focus="true" :type="bMobileLogin?'number':'text'" :maxlength="bMobileLogin?'11':'32'"
 								clearable v-model="account" :placeholder="bMobileLogin?'请填写11位手机号码':'请输入邮箱'"></m-input>
 						</view>
-
+					
 					</view>
+					<input type="text" style="width: 0;height: 0;min-height: 0;"/>
 					<view class="input-container" style="margin: 8px 102rpx 0 68rpx;">
 						<view class="input-row padding align-center" style="width: 318px;">
 							<view class="text-18px text-regular " style="width: 72rpx;white-space:nowrap;">
@@ -38,11 +40,12 @@
 							<view class="margin-left-sm margin-right-sm"
 								style="width: 2rpx; height: 25rpx; background-color: rgba(209, 209, 209, 1);">
 							</view>
-							<m-input type="password" maxlength="16" displayable v-model="password" placeholder="请输入密码">
+							<m-input inputmode="text" type="password" maxlength="16" displayable v-model="password" placeholder="请输入密码">
 							</m-input>
 						</view>
 
 					</view>
+					
 					<view @click="onSwitchGetCode" class="make-text-bPurple text-14px text-right text-regular"
 						style="margin: 40rpx 96rpx 0 0;">{{bPhoneNumberAndPasswordLogin?'验证码登录':'密码登录'}} </view>
 					<view class="btn-row" style="margin: 32rpx 0 0 0;">
@@ -59,7 +62,7 @@
 							<view class="margin-left-sm margin-right-sm"
 								style="width: 2rpx; height: 25rpx; background-color: rgba(209, 209, 209, 1);">
 							</view>
-							<m-input :type="bMobileLogin?'number':'string'" :maxlength="bMobileLogin?'11':'32'"
+							<m-input :inputmode="bMobileLogin?'numeric':'email'"  :type="bMobileLogin?'number':'text'" :maxlength="bMobileLogin?'11':'32'"
 								clearable v-model="account" :placeholder="bMobileLogin?'请填写11位手机号码':'请输入邮箱'"></m-input>
 						</view>
 					</view>
@@ -332,9 +335,9 @@
 						console.log('requestData PASSWORDlOGIN =====', res);
 						if (res.code == 0) {
 							uni.showToast({
-								title: "成功",
+								title: "登陆中..",
 								mask: true,
-								duration: 1000
+								duration: 3000
 							})
 							//密码登录成功
 							uni.setStorageSync('token', res.data.token);
@@ -343,11 +346,17 @@
 								console.log("_self.bNewUser=", _self.bNewUser);
 								if (_self.bNewUser) {
 									uni.reLaunch({
-										url: "../../my-page/userInfo/userInfo"
+										url: "../../my-page/userInfo/userInfo",
+										complete() {
+											uni.hideToast();
+										}
 									})
 								} else {
 									uni.reLaunch({
-										url: "../../personal-page/personal/personal"
+										url: "../../personal-page/personal/personal",
+										complete() {
+											uni.hideToast();
+										}
 									})
 								}
 
@@ -467,11 +476,12 @@
 																				.userInfo
 																				.openId ||
 																				'';
-																			uni
-																				.hideToast();
-
+																			
 																			uni.reLaunch({
-																				url: "../../my-page/perfectInfo/perfectInfo"
+																				url: "../../my-page/perfectInfo/perfectInfo",
+																				complete() {
+																					uni.hideToast();
+																				}
 																			})
 																		}
 																	});
@@ -488,9 +498,11 @@
 											} else {
 												//如果不是新用户,直接获取用户信息
 												_self.accountLogin(function() {
-													uni.hideToast();
 													uni.reLaunch({
-														url: "../../personal-page/personal/personal"
+														url: "../../personal-page/personal/personal",
+														complete() {
+															uni.hideToast();
+														}
 													})
 												});
 											}
@@ -499,7 +511,7 @@
 									});
 								} else {
 									uni.showToast({
-										title: "验证码错误",
+										title: "微信登陆失败",
 										mask: true,
 										icon: 'none',
 										duration: 1000
@@ -663,14 +675,19 @@
 									_self.resetCountDown();
 
 									_self.accountLogin(function() {
-										uni.hideToast();
 										if (_self.bNewUser) {
 											uni.reLaunch({
-												url: "../../my-page/userInfo/userInfo"
+												url: "../../my-page/userInfo/userInfo",
+												complete() {
+													uni.hideToast();
+												}
 											})
 										} else {
 											uni.reLaunch({
-												url: "../../personal-page/personal/personal"
+												url: "../../personal-page/personal/personal",
+												complete() {
+													uni.hideToast();
+												}
 											})
 										}
 
@@ -763,7 +780,7 @@
 								//用户信息
 								console.log("resUser:", resUser);
 								uni.showToast({
-									title: '',
+									title: '登录中..',
 									icon: 'loading',
 									mask: true,
 									duration: 10000,
@@ -775,6 +792,12 @@
 										console.log('requestData apple login =====', res);
 										uni.hideToast();
 										if (res.code == 0) {
+											uni.showToast({
+												title: "登录中..",
+												icon: "loading",
+												mask: true,
+												duration: 3000
+											})
 											//登录成功
 											uni.setStorage({
 												key: 'token',
@@ -816,11 +839,12 @@
 																	.userInfo
 																	.openId ||
 																	'';
-																uni
-																	.hideToast();
-
+																	
 																uni.reLaunch({
-																	url: "../../my-page/perfectInfo/perfectInfo"
+																	url: "../../my-page/perfectInfo/perfectInfo",
+																	complete() {
+																		uni.hideToast();
+																	}
 																})
 															}
 														});
@@ -828,9 +852,11 @@
 													} else {
 														//如果不是新用户,直接获取用户信息
 														_self.accountLogin(function() {
-															uni.hideToast();
 															uni.reLaunch({
-																url: "../../personal-page/personal/personal"
+																url: "../../personal-page/personal/personal",
+																complete() {
+																	uni.hideToast();
+																}
 															})
 														});
 													}

pages/login-page/pwd/pwd.vue

@@ -14,35 +14,35 @@
 		</uni-nav-bar>
 		<block v-if="bModifyPassword">
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="text" focus clearable v-model="account"
+				<m-input inputmode="email" style=" margin-left: 46rpx;" type="text" focus clearable v-model="account"
 					placeholder="请输入手机号/邮箱">
 				</m-input>
 			</view>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="oldPassword"
+				<m-input inputmode="text" style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="oldPassword"
 					placeholder="请输入旧密码">
 				</m-input>
 			</view>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="newPassword"
+				<m-input inputmode="text" style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="newPassword"
 					placeholder="请输入新密码">
 				</m-input>
 			</view>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="password" maxlength="16" displayable
+				<m-input inputmode="text" style=" margin-left: 46rpx;" type="password" maxlength="16" displayable
 					v-model="confirmPassword" placeholder="请再次输入新密码">
 				</m-input>
 			</view>
 		</block>
 		<block v-else>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="text" focus clearable v-model="account"
+				<m-input inputmode="email" style=" margin-left: 46rpx;" type="text" focus clearable v-model="account"
 					placeholder="请输入手机号/邮箱">
 				</m-input>
 			</view>
 			<view class="card-view cu-form-group ">
 				<view style="width: 16rpx;"></view>
-				<m-input type="number" focus clearable v-model="verificationCode" placeholder="请输入验证码">
+				<m-input inputmode="numeric" type="number" focus clearable v-model="verificationCode" placeholder="请输入验证码">
 				</m-input>
 				<button v-if="bCodeDisabled" class="cu-btn make-bg-bPurple shadow text-white"
 					style="background-color: rgb(0,0,0);opacity: 0.5;">
@@ -50,12 +50,12 @@
 				<button v-else class="cu-btn make-bg-bPurple shadow text-white" @tap="onGetCode">获取验证码</button>
 			</view>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="newPassword"
+				<m-input inputmode="text" style=" margin-left: 46rpx;" type="password" maxlength="16" displayable v-model="newPassword"
 					placeholder="请输入新密码">
 				</m-input>
 			</view>
 			<view class="card-view password-item flex justify-center ">
-				<m-input style=" margin-left: 46rpx;" type="password" maxlength="16" displayable
+				<m-input inputmode="text" style=" margin-left: 46rpx;" type="password" maxlength="16" displayable
 					v-model="confirmPassword" placeholder="请确认新密码">
 				</m-input>
 			</view>

pages/personal-page/devices-hardware/devices-hardware.vue

@@ -216,12 +216,23 @@
 			// 	})
 			// }
 			this.BLEInfoList.forEach((item, index, selfarr) => {
-				if ((item.deviceType == 'BLEHandle' && item.usageMode == 'hotman') || item.deviceType ==
-					'BLERope') {
-					let item = Object.assign({}, selfarr[index], {
-						bOldDevice: false
-					});
-					this.devicesList.push(item);
+				
+				// ios 暂时去除跳，因为算法还没转化Xcode
+				if (uni.getSystemInfoSync().platform == "ios") {
+					if ((item.deviceType == 'BLEHandle' && item.usageMode == 'hotman') ) {
+						let item = Object.assign({}, selfarr[index], {
+							bOldDevice: false
+						});
+						this.devicesList.push(item);
+					}
+				}else{
+					if ((item.deviceType == 'BLEHandle' && item.usageMode == 'hotman') || item.deviceType ==
+						'BLERope') {
+						let item = Object.assign({}, selfarr[index], {
+							bOldDevice: false
+						});
+						this.devicesList.push(item);
+					}
 				}
 			})
 			uni.$on('retryConnectBLESuccess', this.onRetryConnectBLESuccess);

pages/platform-page/guide/guide.vue

@@ -1,121 +1,131 @@
-<template>
-	<view>
-		<uni-nav-bar id="nav-bar" status-bar="true" @clickLeft="onBack()" :title="title" color="#000000" fixed="true"
-			:border="false">
-			<view slot="left">
-				<view class=" flex align-center margin-left">
-					<image class="p-left-arrow" src="../../../static/p-left-arrow.png"></image>
-				</view>
-			</view>
-
-		</uni-nav-bar>
-		<view class="card-view settings-item" v-for="(item,index) in list" :key="index">
-			<view class="content position-relative" @tap="onNavTo(item)">
-				<text class="text-black text-regular text-16px margin-left-xl">{{item.gameName}}</text>
-				<view class="only-arrow"></view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import reqUtil from "@/util/util-js/requstUtil.js"
-	import config from "@/common/config.js"
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		computed: mapState(['guideUnlockState']),
-		data() {
-			return {
-				list: [{
-						gameName: '新手指导',
-						navType: 'personalGuide'
-					}, {
-						gameName: '蓝牙连接指导',
-						navType: 'bluetoothConnect'
-					},
-					// {
-					// 	gameName: '游戏手柄校准指导',
-					// 	navType: 'feedback'
-					// },
-					{
-						gameName: '关卡指导',
-						navType: 'levelGuide'
-					}
-				],
-				title: "新手指导",
-				type: '',
-			}
-		},
-		onLoad(option) {
-
-
-
-		},
-		methods: {
-			...mapMutations(['setGuideUnlockState']),
-			onBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-
-			onNavTo(item) {
-				// console.log(item);
-				let url = '';
-				switch (item.navType) {
-					case 'personalGuide':
-						//跳回首页时候，重置新手教程
-						let guideUnlockState = Object.assign(this.guideUnlockState, {
-							//是否首次安装
-							firstInstallation: true,
-							// firstDisconnectBluetooth: true,
-							firstUnlockJumpUp: true,
-							firstUnlockLeftAndRightJump: true,
-							firstUnlockLeftAndRightRotationJump: true,
-							firstPromptSelectLevel:true
-						});
-						this.setGuideUnlockState(guideUnlockState);
-						
-						uni.switchTab({
-							url: '../../personal-page/personal/personal',
-							success: res => {},
-							fail: () => {},
-							complete: () => {}
-						});
-						return;
-					case 'bluetoothConnect':
-						url = './guide-ble-scroll';
-						break;
-					case 'levelGuide':
-						url = './guide-level-scroll';
-						break;
-				}
-				uni.navigateTo({
-					url: url,
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-
-			}
-		}
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		height: 50px;
-	}
-
-	.settings-item {
-		position: relative;
-		background-color: #FFFFFF;
-		border-radius: 10px;
-	}
+<template>
+	<view>
+		<uni-nav-bar id="nav-bar" status-bar="true" @clickLeft="onBack()" :title="title" color="#000000" fixed="true"
+			:border="false">
+			<view slot="left">
+				<view class=" flex align-center margin-left">
+					<image class="p-left-arrow" src="../../../static/p-left-arrow.png"></image>
+				</view>
+			</view>
+
+		</uni-nav-bar>
+		<view class="card-view settings-item" v-for="(item,index) in list" :key="index">
+			<view class="content position-relative" @tap="onNavTo(item)">
+				<text class="text-black text-regular text-16px margin-left-xl">{{item.gameName}}</text>
+				<view class="only-arrow"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import reqUtil from "@/util/util-js/requstUtil.js"
+	import config from "@/common/config.js"
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		computed: mapState(['guideUnlockState']),
+		data() {
+			return {
+				list: [],
+				title: "新手指导",
+				type: '',
+			}
+		},
+		onLoad(option) {
+
+			if (uni.getSystemInfoSync().platform == "ios") {
+				this.list = [{
+					gameName: '新手指导',
+					navType: 'personalGuide'
+				}, {
+					gameName: '蓝牙连接指导',
+					navType: 'bluetoothConnect'
+				}]
+			} else {
+				this.list = [{
+						gameName: '新手指导',
+						navType: 'personalGuide'
+					}, {
+						gameName: '蓝牙连接指导',
+						navType: 'bluetoothConnect'
+					},
+					// {
+					// 	gameName: '游戏手柄校准指导',
+					// 	navType: 'feedback'
+					// },
+					{
+						gameName: '关卡指导',
+						navType: 'levelGuide'
+					}
+				]
+			}
+
+		},
+		methods: {
+			...mapMutations(['setGuideUnlockState']),
+			onBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+
+			onNavTo(item) {
+				// console.log(item);
+				let url = '';
+				switch (item.navType) {
+					case 'personalGuide':
+						//跳回首页时候，重置新手教程
+						let guideUnlockState = Object.assign(this.guideUnlockState, {
+							//是否首次安装
+							firstInstallation: true,
+							// firstDisconnectBluetooth: true,
+							firstUnlockJumpUp: true,
+							firstUnlockLeftAndRightJump: true,
+							firstUnlockLeftAndRightRotationJump: true,
+							firstPromptSelectLevel: true
+						});
+						this.setGuideUnlockState(guideUnlockState);
+
+						uni.switchTab({
+							url: '../../personal-page/personal/personal',
+							success: res => {},
+							fail: () => {},
+							complete: () => {}
+						});
+						return;
+					case 'bluetoothConnect':
+						url = './guide-ble-scroll';
+						break;
+					case 'levelGuide':
+						url = './guide-level-scroll';
+						break;
+				}
+				uni.navigateTo({
+					url: url,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		height: 50px;
+	}
+
+	.settings-item {
+		position: relative;
+		background-color: #FFFFFF;
+		border-radius: 10px;
+	}
 </style>