最新需求修改

pagesMy/deviceAdd.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
-		<cus-header title='添加新设备' bgColor='transparent' :backUrl="'/pages/home'"></cus-header>
+		<cus-header title='开机' bgColor='transparent' :backUrl="'/pages/home'"></cus-header>
 		<image class="topbg" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/03/57d11386-a720-4e76-ac9b-69826e56d83a.png" mode="widthFix"></image>
 		<div class="icons adfacjb">
 			<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/03/76406f0b-dba6-4797-a42d-0254e9f06ee6.png"></image>
@@ -9,30 +9,42 @@
 			<image class="next" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/03/b4acf520-1d30-4f67-8fa8-fb03de1768cf.png"></image>
 			<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/03/b47cb0c5-7df7-49a1-8d2f-e6362de17a89.png"></image>
 		</div>
-		<div class="tip">请确认玩具已开机，点击下方开始配网</div>
+		<div class="tip">请确认玩具已开机</div>
 		<div class="memo adfacjb" @tap="showSetMemo">
 			<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/03/d218058d-3720-461a-8a25-87b5657c1957.png"></image>
 			<text>配置网络说明</text>
 		</div>
 		<div class="steps">
-			<div class="item">
-				<image class="yuan" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/7942575f-4288-4109-9a55-2a48c526530c.png"></image>
-				<p>首次开机设备将会自动进入配网模式</p>
+			<div class="s_item">
+				<div class="si_top adfac">
+					<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/7942575f-4288-4109-9a55-2a48c526530c.png"></image>
+					<div class="sit_title">确认蓝牙权限</div>
+				</div>
+				<div class="si_tip">请确认手机蓝牙功能打开，并且小程序拥有蓝牙权限</div>
 			</div>
-			<div class="item">
-				<image class="yuan" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/b6716138-07a5-42f9-86b3-b9517e64ffe8.png"></image>
-				<p>选择<span>"xiaozhi"</span>Wi-Fi热点，连接成功</p>
+			<div class="s_item">
+				<div class="si_top adfac">
+				<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/b6716138-07a5-42f9-86b3-b9517e64ffe8.png"></image>
+					<div class="sit_title">靠近设备</div>
+				</div>
+				<div class="si_tip">请将手机靠近设备并保持2米以内</div>
 			</div>
-			<div class="item">
-				<image class="yuan" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/01707d1d-6a11-4001-9db2-6680f5f2b9c9.png"></image>
-				<p>选择网络，输入Wi-Fi密码，设备配网成功</p>
+			<div class="s_item">
+				<div class="si_top adfac">
+				<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/01707d1d-6a11-4001-9db2-6680f5f2b9c9.png"></image>
+					<div class="sit_title">首次开机</div>
+				</div>
+				<div class="si_tip">首次开机设备将会自动进入配网模式</div>
 			</div>
-			<div class="item">
-				<image class="yuan" src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/42cb08bf-b7a9-4d54-a1b0-eff9e1afca9d.png"></image>
-				<p>扫描设备或说明书上的二维码，绑定设备成功</p>
+			<div class="s_item">
+				<div class="si_top adfac">
+				<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/04/42cb08bf-b7a9-4d54-a1b0-eff9e1afca9d.png"></image>
+					<div class="sit_title">重新配网</div>
+				</div>
+				<div class="si_tip">重新配网请长按M键3秒钟，听到提示音之后进入配网模式</div>
 			</div>
 		</div>
-		<div class="zt_btn" @tap="startWiFi">开始配网</div>
+		<div class="zt_btn" @tap="startWiFi">我已开机</div>
 	</view>
 </template>
 
@@ -61,7 +73,7 @@
 <style scoped lang="less">
 	.page{
 		background: #FFFFFF;
-		padding: 0 60rpx 160rpx;
+		padding: 0 80rpx 160rpx;
 		box-sizing: border-box;
 		display: flex;
 		flex-direction: column;
@@ -89,18 +101,18 @@
 		}
 		.tip{
 			position: relative;
-			margin-top: 260rpx;
-			font-family: PingFangSC, PingFang SC;
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #7C8592;
-			line-height: 37rpx;
+			margin-top: 124rpx;
+			font-family: PingFang-SC, PingFang-SC;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #111111;
+			line-height: 45rpx;
 			text-align: center;
 		}
 		.memo{
 			width: 250rpx;
 			position: relative;
-			margin-top: 36rpx;
+			margin-top: 34rpx;
 			background: rgba(27,80,255,0.06);
 			border-radius: 28rpx;
 			padding: 10rpx 29rpx;
@@ -119,36 +131,33 @@
 			}
 		}
 		.steps{
-			margin-top: 219rpx;
-			margin-left: 16rpx;
-			border-left: 1rpx solid #E2E2E2;
-			padding-left: 30rpx;
-			.item{
-				margin-top: 58rpx;
-				position: relative;
-				&:first-child{
-					margin-top: 0;
-				}
-				.yuan{
-					width: 32rpx;
-					height: 32rpx;
-					border-radius: 50%;
-					box-shadow: 0 0 4rpx 4rpx #FFFFFF;
-					position: absolute;
-					left: -48rpx;
-					top: 50%;
-					margin-top: -16rpx;
+			position: relative;
+			margin-top: 53rpx;
+			.s_item{
+				margin-top: 56rpx;
+				.si_top{
+					image{
+						width: 36rpx;
+						height: 36rpx;
+						border-radius: 50%;
+					}
+					.sit_title{
+						font-family: PingFang-SC, PingFang-SC;
+						font-weight: bold;
+						font-size: 28rpx;
+						color: #111111;
+						line-height: 40rpx;
+						margin-left: 18rpx;
+					}
 				}
-				p{
+				.si_tip{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
-					font-size: 26rpx;
+					font-size: 24rpx;
 					color: #7C8592;
-					line-height: 37rpx;
-					span{
-						font-weight: bold;
-						color: #111111;
-					}
+					line-height: 33rpx;
+					text-align: left;
+					margin: 23rpx 0 0 54rpx;
 				}
 			}
 		}