Merge branch 'main' of http://git.pseer.com/pseer/gxpt_wechat

pages/my/myInfo.vue

@@ -96,16 +96,16 @@
 		<uni-popup ref="popup" type="bottom" maskClick="false">
 			<view class="popup-content">
 				<view class="flex-between title-box">
-					<text class="text-black text-bold text-xl">无线WIFI</text>
+					<text class="text-black text-bold text-xl">无线WI-FI</text>
 					<text class="cuIcon-roundclose text-gray text-xxl" @tap="onClose"></text>
 				</view>
 				<view class="flex-col">
 					<view class="text">
-						<text class="text-title text-xl">wifi名称：</text>
+						<text class="text-title text-xl">WI-FI名称：</text>
 						<text class="text-title text-xxl">{{wifiData.name}}</text>
 					</view>
 					<view class="text">
-						<text class="text-title text-xl">wifi名称：</text>
+						<text class="text-title text-xl">WI-FI密码：</text>
 						<text class="text-title text-xxl">{{wifiData.password}}</text>
 					</view>
 				</view>
@@ -541,6 +541,7 @@
 			padding: 30upx 0;
 			justify-content: center;
 			align-items: center;
+      margin-bottom: 10%;
 			.cu-btn{
 				margin: 0 5%;
 			}