Merge branch 'main' into ft_local_dev

@@ -57,9 +57,9 @@
 					<text style="color: #333; font-size: 14px;font-weight:700;margin-right: 30rpx;">下发类型:</text>
 
 					<u-radio-group v-model="commandType" placement="row">
-						<u-radio activeColor="#3388FF" label="OneWay" name="OneWay"></u-radio>
+						<u-radio activeColor="#3388FF" label="单向" name="OneWay"></u-radio>
 						<view style="margin: 0 20rpx;"></view>
-						<u-radio activeColor="#3388FF" label="TwoWay" name="TwoWay"></u-radio>
+						<u-radio activeColor="#3388FF" label="双向" name="TwoWay"></u-radio>
 					</u-radio-group>
 				</view>
 				<view style="margin-top: 28rpx;width: 100%;"><u--textarea placeholder="请输入命令内容" v-model="commandValue" /></view>

@@ -8,25 +8,35 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click.top="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="userInfo.avatar || thirdObj.avatarUrl || '../../static/logo.png'"></image>
+						<image class="avatar" mode="aspectFill"
+							:src="userInfo.avatar || thirdObj.avatarUrl || '../../static/logo.png'"></image>
 					</view>
 					<view class="u-flex-1" @click.top="openPersonalInfo">
 						<view class="nickName u-flex">
 							<view class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
-								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
+								<text
+									style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
 							</view>
-							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
+							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text
+									class="text">绑定账号</text></view>
 						</view>
-						<view style="color: #ffffff; font-size: 14px" v-if="userInfo.phoneNumber">{{ handlePhoneFunc(userInfo.phoneNumber || '') }}</view>
+						<view style="color: #ffffff; font-size: 14px" v-if="userInfo.phoneNumber">
+							{{ handlePhoneFunc(userInfo.phoneNumber || '') }}</view>
 					</view>
 				</block>
 				<block v-else>
 					<view class="u-m-r-20" @click="openLoginFunc">
-						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/logo.png"></image></view>
+						<view class="avatar u-flex">
+							<image class="avatar" mode="aspectFill" src="../../static/logo.png"></image>
+						</view>
+					</view>
+					<view class="u-flex-1">
+						<view @click="openLoginFunc" class="u-font-lg click-login login-btn">请点击登录</view>
 					</view>
-					<view class="u-flex-1"><view @click="openLoginFunc" class="u-font-lg click-login login-btn">请点击登录</view></view>
 				</block>
-				<view v-if="userInfo.isToken" @click="openPersonalInfo"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
+				<view v-if="userInfo.isToken" @click="openPersonalInfo">
+					<u-icon name="arrow-right" color="white" size="13"></u-icon>
+				</view>
 			</view>
 			<!-- 登录 -->
 			<!-- #endif -->
@@ -34,14 +44,22 @@
 		<view class="u-flex my-nav">
 			<view class="nav-main">
 				<view @click="onTokenJump('/sysNotifySubPage/sysNotifyPage/systemNotify')" class="u-flex nav-link">
-					<view class="nav-image"><image class="image" src="../../static/sys-not.png"></image></view>
+					<view class="nav-image">
+						<image class="image" src="../../static/sys-not.png"></image>
+					</view>
 					<view class="nav-center"><text class="text">系统通知</text></view>
-					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
+					<view class="nav-right">
+						<image class="image" src="../../static/arrow-right.png"></image>
+					</view>
 				</view>
 				<view @click="onTokenJump('/feedBackSubPage/feedback/feedback')" class="u-flex nav-link">
-					<view class="nav-image"><image class="image" src="../../static/find-sugg.png"></image></view>
+					<view class="nav-image">
+						<image class="image" src="../../static/find-sugg.png"></image>
+					</view>
 					<view class="nav-center"><text class="text">意见反馈</text></view>
-					<view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view>
+					<view class="nav-right">
+						<image class="image" src="../../static/arrow-right.png"></image>
+					</view>
 				</view>
 			</view>
 			<view @click="onLoginoutFunc" class="u-flex" style="justify-content: center; width: 600rpx">
@@ -53,18 +71,12 @@
 			<u-modal :showConfirmButton="false" :show="show" :title="title">
 				<view v-if="!bindPhone" class="loginPhone">
 					<view class="form-row">
-						<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号" v-model="bindAccountObj.appUserKey"></u--input>
+						<u--input shape="circle" class="input" prefixIcon="account-fill" type="text" placeholder="登录账号"
+							v-model="bindAccountObj.appUserKey"></u--input>
 					</view>
 					<view class="form-row item-bind">
-						<u--input
-							class="input"
-							shape="circle"
-							prefixIcon="lock-fill"
-							suffixIconStyle="color: #909399"
-							type="password"
-							placeholder="登录密码"
-							v-model="bindAccountObj.appUserSecret"
-						></u--input>
+						<u--input class="input" shape="circle" prefixIcon="lock-fill" suffixIconStyle="color: #909399"
+							type="password" placeholder="登录密码" v-model="bindAccountObj.appUserSecret"></u--input>
 					</view>
 					<view class="u-flex item-phone">
 						<view class="phone-hide">手机验证码登录</view>
@@ -73,25 +85,14 @@
 				</view>
 				<view v-else class="loginPhone">
 					<view class="form-row">
-						<u--input
-							shape="circle"
-							class="input"
-							type="text"
-							v-model="bindPhoneObj.appUserKey"
-							placeholder="请输入手机号码"
-							placeholder-style="font-weight:normal;color:#bbbbbb;"
-						></u--input>
+						<u--input shape="circle" class="input" type="text" v-model="bindPhoneObj.appUserKey"
+							placeholder="请输入手机号码" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
 					</view>
 					<view class="form-row row-top">
-						<u--input
-							shape="circle"
-							class="input"
-							type="text"
-							v-model="bindPhoneObj.appUserSecret"
-							placeholder="请输入验证码"
-							placeholder-style="font-weight:normal;color:#bbbbbb;"
-						></u--input>
-						<view style="color: #377dff" class="getvcode" :class="{ forhidden: readonly }" @click="getVcode">{{ codeText }}</view>
+						<u--input shape="circle" class="input" type="text" v-model="bindPhoneObj.appUserSecret"
+							placeholder="请输入验证码" placeholder-style="font-weight:normal;color:#bbbbbb;"></u--input>
+						<view style="color: #377dff" class="getvcode" :class="{ forhidden: readonly }"
+							@click="getVcode">{{ codeText }}</view>
 					</view>
 					<view class="u-flex item-phone">
 						<view class="phone-hide">手机验证码登录</view>
@@ -100,8 +101,12 @@
 				</view>
 				<view class="bottom-content">
 					<view class="u-flex content">
-						<view class="cancel"><u-button @click="show = false" type="info" shape="circle" text="取消"></u-button></view>
-						<view class="confrim"><u-button @click="bindConfirm" type="primary" shape="circle" text="确认"></u-button></view>
+						<view class="cancel">
+							<u-button @click="show = false" type="info" shape="circle" text="取消"></u-button>
+						</view>
+						<view class="confrim">
+							<u-button @click="bindConfirm" type="primary" shape="circle" text="确认"></u-button>
+						</view>
 					</view>
 				</view>
 			</u-modal>
@@ -122,145 +127,215 @@
 </template>
 
 <script>
-var clear;
-import base from '@/config/baseUrl';
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import fNavbar from '@/components/module/f-navbar/f-navbar';
-import { mapState, mapMutations } from 'vuex';
+	var clear;
+	import base from '@/config/baseUrl';
+	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+	import fNavbar from '@/components/module/f-navbar/f-navbar';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 
-export default {
-	components: {
-		fTabbar,
-		fNavbar
-	},
-	data() {
-		return {
-			PrimaryColor: '#0079fe', //主题色
-			showLogout: false,
-			readonly: false,
-			codeText: '获取验证码',
-			tips: '验证码',
-			bindPhone: false,
-			show: false,
-			title: '绑定账号',
-			systemInfo: base.systemInfo,
-			PrimaryButtonColor: '#0079fe', //主题色
-			bindAccountObj: {
-				appUserKey: '',
-				appUserSecret: ''
-			},
-			bindPhoneObj: {
-				appUserKey: '',
-				appUserSecret: ''
-			},
-			thirdObj: {},
-			getOpenId: '',
-			mpOwnConfig: {}
-		};
-	},
-	mounted() {
-		this.getPlateForm();
-	},
-	onLoad(e) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		// if (e.obj != null) {
-		// 	const params = JSON.parse(decodeURIComponent(e.obj));
-		// 	// uni.$u.toast('eee', params.avatarUrl);
-		// 	this.thirdObj = params;
-		// }
-		this.getOpenId = getApp().globalData.openId;
-	},
-	computed: {
-		...mapState(['userInfo', 'plateInfo'])
-	},
-	methods: {
-		//获取平台定制信息
-		getPlateForm() {
-			uni.$u.http.get('/yt/app_design/get').then(res => {
-				if (res) {
-					this.mpOwnConfig = {
-						bg: res.background,
-						logo: res.logo,
-						name: res.name
-					};
-				}
-			});
-		},
-		handlePhoneFunc(e) {
-			//前三后四位显示
-			const result = /^(\d{3})\d{4}(\d{4})$/;
-			const y = e.toString().replace(result, '$1****$2');
-			return y;
-		},
-		...mapMutations(['emptyUserInfo', 'setUserInfo', 'setPlateInfo']),
-		// 跳转前判断登录
-		onTokenJump(url) {
-			this.judgeLogin(r => {
-				uni.navigateTo({
-					url: url
-				});
-			});
-		},
-		onJump(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		openLoginFunc() {
-			uni.navigateTo({
-				url: '/publicLoginSubPage/public/login'
-			});
+	export default {
+		components: {
+			fTabbar,
+			fNavbar
 		},
-		openPersonalInfo() {
-			let obj = {
-				data: this.userInfo,
-				third: this.thirdObj
+		data() {
+			return {
+				PrimaryColor: '#0079fe', //主题色
+				showLogout: false,
+				readonly: false,
+				codeText: '获取验证码',
+				tips: '验证码',
+				bindPhone: false,
+				show: false,
+				title: '绑定账号',
+				systemInfo: base.systemInfo,
+				PrimaryButtonColor: '#0079fe', //主题色
+				bindAccountObj: {
+					appUserKey: '',
+					appUserSecret: ''
+				},
+				bindPhoneObj: {
+					appUserKey: '',
+					appUserSecret: ''
+				},
+				thirdObj: {},
+				getOpenId: '',
+				mpOwnConfig: {}
 			};
-			uni.navigateTo({
-				url: '/publicLoginSubPage/other/set?data=' + JSON.stringify(obj)
-			});
 		},
-		clickAccountFunc() {
-			this.show = true;
-			this.resetFunc();
+		mounted() {
+			this.getPlateForm();
 		},
-		resetFunc() {
-			this.bindPhone = false;
-			this.bindAccountObj = {};
-			this.bindPhoneObj = {};
+		onLoad(e) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
+			// if (e.obj != null) {
+			// 	const params = JSON.parse(decodeURIComponent(e.obj));
+			// 	// uni.$u.toast('eee', params.avatarUrl);
+			// 	this.thirdObj = params;
+			// }
+			this.getOpenId = getApp().globalData.openId;
 		},
-		bindConfirm() {
-			//需要绑定
-			if (!this.bindPhone) {
-				if (this.bindAccountObj.appUserKey == '' || this.bindAccountObj.appUserKey == undefined) {
-					return uni.$u.toast('请输入登录账号~');
-				}
-				const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
-				if (this.bindAccountObj.appUserSecret == '') {
-					uni.showToast({
-						title: '请输入登录密码~',
-						icon: 'none'
-					});
-					return;
-				} else if (!passReg.test(this.bindAccountObj.appUserSecret)) {
-					uni.showModal({
-						title: '提示',
-						content: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
-						showCancel: false
+		computed: {
+			...mapState(['userInfo', 'plateInfo'])
+		},
+		methods: {
+			//获取平台定制信息
+			getPlateForm() {
+				uni.$u.http.get('/yt/app_design/get').then(res => {
+					if (res) {
+						this.mpOwnConfig = {
+							bg: res.background,
+							logo: res.logo,
+							name: res.name
+						};
+					}
+				});
+			},
+			handlePhoneFunc(e) {
+				//前三后四位显示
+				const result = /^(\d{3})\d{4}(\d{4})$/;
+				const y = e.toString().replace(result, '$1****$2');
+				return y;
+			},
+			...mapMutations(['emptyUserInfo', 'setUserInfo', 'setPlateInfo']),
+			// 跳转前判断登录
+			onTokenJump(url) {
+				this.judgeLogin(() => {
+					uni.navigateTo({
+						url: url
 					});
-					return;
-				}
-				const postData = {
-					loginMethod: 'ACCOUNT',
-					...this.bindAccountObj,
-					platformName: 'WECHAT',
-					thirdUserId: this.getOpenId
-				};
-				uni.$u.http
-					.post('/yt/third/bind', postData)
-					.then(res => {
-						if (res) {
+				});
+			},
+			onJump(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			openLoginFunc() {
+				uni.navigateTo({
+					url: '/publicLoginSubPage/public/login'
+				});
+			},
+			openPersonalInfo() {
+				let obj = {
+					data: this.userInfo,
+					third: this.thirdObj
+				};
+				uni.navigateTo({
+					url: '/publicLoginSubPage/other/set?data=' + JSON.stringify(obj)
+				});
+			},
+			clickAccountFunc() {
+				this.show = true;
+				this.resetFunc();
+			},
+			resetFunc() {
+				this.bindPhone = false;
+				this.bindAccountObj = {};
+				this.bindPhoneObj = {};
+			},
+			bindConfirm() {
+				//需要绑定
+				if (!this.bindPhone) {
+					if (this.bindAccountObj.appUserKey == '' || this.bindAccountObj.appUserKey == undefined) {
+						return uni.$u.toast('请输入登录账号~');
+					}
+					const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
+					if (this.bindAccountObj.appUserSecret == '') {
+						uni.showToast({
+							title: '请输入登录密码~',
+							icon: 'none'
+						});
+						return;
+					} else if (!passReg.test(this.bindAccountObj.appUserSecret)) {
+						uni.showModal({
+							title: '提示',
+							content: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
+							showCancel: false
+						});
+						return;
+					}
+					const postData = {
+						loginMethod: 'ACCOUNT',
+						...this.bindAccountObj,
+						platformName: 'WECHAT',
+						thirdUserId: this.getOpenId
+					};
+					uni.$u.http
+						.post('/yt/third/bind', postData)
+						.then(res => {
+							if (res) {
+								this.show = false;
+								// 储存登录信息
+								let resObj = {
+									refreshToken: res.refreshToken,
+									isToken: res.token
+								};
+								let userInfo = {
+									...resObj,
+									token: true, //token用于判断是否登录
+									isThirdLogin: false,
+									isThirdLoginAndNoDind: true
+								};
+								if (userInfo.token) {
+									this.setUserInfo(userInfo);
+								}
+								uni.showToast({
+									title: '账号绑定成功~',
+									icon: 'none'
+								});
+								this.saveUserInfo();
+							}
+						})
+						.catch(e => {
+							let msg = e.message || e.data?.message;
+							// if (msg == undefined) {
+							// 	msg = '';
+							// }
+							if (msg) uni.$u.toast(msg);
+							this.show = true;
+						});
+				} else {
+					const phoneRegular = /^1\d{10}$/;
+					if (this.bindPhoneObj.appUserKey == '') {
+						uni.showToast({
+							title: '请输入手机号码~',
+							icon: 'none'
+						});
+						return;
+					} else if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
+						uni.showToast({
+							title: '手机号格式不正确~',
+							icon: 'none'
+						});
+						return;
+					}
+					if (this.bindPhoneObj.appUserSecret == '') {
+						uni.showToast({
+							title: '请输入验证码~',
+							icon: 'none'
+						});
+						return;
+					} else if (!/^\d{6}$/.test(this.bindPhoneObj.appUserSecret)) {
+						uni.showToast({
+							title: '验证码格式不正确~',
+							icon: 'none'
+						});
+						return;
+					}
+					const postData = {
+						loginMethod: 'PHONE',
+						...this.bindPhoneObj,
+						platformName: 'WECHAT',
+						thirdUserId: this.getOpenId
+					};
+					uni.$u.http
+						.post('/yt/third/bind', postData)
+						.then(res => {
 							this.show = false;
 							// 储存登录信息
 							let resObj = {
@@ -277,185 +352,116 @@ export default {
 								this.setUserInfo(userInfo);
 							}
 							uni.showToast({
-								title: '账号绑定成功~',
+								title: '手机绑定成功~',
 								icon: 'none'
 							});
 							this.saveUserInfo();
-						}
-					})
-					.catch(e => {
-						let msg = e.data?.message;
-						if (msg == undefined) {
-							msg = '';
-						}
-						uni.$u.toast(msg);
-						this.show = true;
-					});
-			} else {
-				const phoneRegular = /^1\d{10}$/;
-				if (this.bindPhoneObj.appUserKey == '') {
-					uni.showToast({
-						title: '请输入手机号码~',
-						icon: 'none'
-					});
-					return;
-				} else if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
+						})
+						.catch(e => {
+							let msg = e.message || e.data?.message;
+							// 	msg = '';
+							// }
+							if (msg) uni.$u.toast(msg);
+							this.show = true;
+						});
+				}
+			},
+			saveUserInfo() {
+				//储存个人信息
+				uni.$u.http.get('/yt/user/me/info').then(res => {
+					if (res) {
+						this.setUserInfo(res);
+					}
+				});
+				//储存平台信息
+				uni.$u.http.get('/yt/platform/get').then(res => {
+					if (res) {
+						this.setPlateInfo(res);
+					}
+				});
+			},
+			bindPhoneFunc() {
+				this.bindPhone = true;
+			},
+			bindAccountFunc() {
+				this.bindPhone = false;
+			},
+			//验证码按钮文字状态
+			getCodeState() {
+				const _this = this;
+				this.readonly = true;
+				this.codeText = '60S后重新获取';
+				var s = 60;
+				clear = setInterval(() => {
+					s--;
+					_this.codeText = s + 'S后重新获取';
+					if (s <= 0) {
+						clearInterval(clear);
+						_this.codeText = '获取验证码';
+						_this.readonly = false;
+					}
+				}, 1000);
+			},
+			//获取验证码
+			getVcode() {
+				if (this.readonly) {
 					uni.showToast({
-						title: '手机号格式不正确~',
+						title: '验证码已发送~',
 						icon: 'none'
 					});
 					return;
 				}
-				if (this.bindPhoneObj.appUserSecret == '') {
+				if (this.bindPhoneObj.appUserKey == '') {
 					uni.showToast({
-						title: '请输入验证码~',
+						title: '请输入手机号~',
 						icon: 'none'
 					});
 					return;
-				} else if (!/^\d{6}$/.test(this.bindPhoneObj.appUserSecret)) {
+				}
+				const phoneRegular = /^1\d{10}$/;
+				if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
 					uni.showToast({
-						title: '验证码格式不正确~',
+						title: '手机号格式不正确~',
 						icon: 'none'
 					});
 					return;
 				}
-				const postData = {
-					loginMethod: 'PHONE',
-					...this.bindPhoneObj,
-					platformName: 'WECHAT',
-					thirdUserId: this.getOpenId
-				};
-				uni.$u.http
-					.post('/yt/third/bind', postData)
-					.then(res => {
-						this.show = false;
-						// 储存登录信息
-						let resObj = {
-							refreshToken: res.refreshToken,
-							isToken: res.token
-						};
-						let userInfo = {
-							...resObj,
-							token: true, //token用于判断是否登录
-							isThirdLogin: false,
-							isThirdLoginAndNoDind: true
-						};
-						if (userInfo.token) {
-							this.setUserInfo(userInfo);
-						}
-						uni.showToast({
-							title: '手机绑定成功~',
-							icon: 'none'
-						});
-						this.saveUserInfo();
-					})
-					.catch(e => {
-						let msg = e.data?.msg;
-						if (msg == undefined) {
-							msg = '';
-						}
-						uni.$u.toast(msg);
-						this.show = true;
-					});
-			}
-		},
-		saveUserInfo() {
-			//储存个人信息
-			uni.$u.http.get('/yt/user/me/info').then(res => {
-				if (res) {
-					this.setUserInfo(res);
-				}
-			});
-			//储存平台信息
-			uni.$u.http.get('/yt/platform/get').then(res => {
-				if (res) {
-					this.setPlateInfo(res);
-				}
-			});
-		},
-		bindPhoneFunc() {
-			this.bindPhone = true;
-		},
-		bindAccountFunc() {
-			this.bindPhone = false;
-		},
-		//验证码按钮文字状态
-		getCodeState() {
-			const _this = this;
-			this.readonly = true;
-			this.codeText = '60S后重新获取';
-			var s = 60;
-			clear = setInterval(() => {
-				s--;
-				_this.codeText = s + 'S后重新获取';
-				if (s <= 0) {
-					clearInterval(clear);
-					_this.codeText = '获取验证码';
-					_this.readonly = false;
-				}
-			}, 1000);
-		},
-		//获取验证码
-		getVcode() {
-			if (this.readonly) {
-				uni.showToast({
-					title: '验证码已发送~',
-					icon: 'none'
-				});
-				return;
-			}
-			if (this.bindPhoneObj.appUserKey == '') {
-				uni.showToast({
-					title: '请输入手机号~',
-					icon: 'none'
+				let httpData = {};
+				// 获取验证码接口
+				uni.$u.http.post(`/yt/noauth/send_login_code/${this.bindPhoneObj.appUserKey}`).then(res => {
+					if (res) {
+						this.getCodeState(); //开始倒计时
+					}
 				});
-				return;
-			}
-			const phoneRegular = /^1\d{10}$/;
-			if (!phoneRegular.test(this.bindPhoneObj.appUserKey)) {
-				uni.showToast({
-					title: '手机号格式不正确~',
-					icon: 'none'
+			},
+			onLoginoutFunc() {
+				this.showLogout = true;
+			},
+			closeLogout() {
+				this.showLogout = false;
+			},
+			logoutBtn() {
+				let that = this;
+				uni.showModal({
+					title: '退出登录',
+					content: '你确定退出登录吗？',
+					success(res) {
+						if (res.confirm) {
+							that.emptyUserInfo();
+							that.showLogout = false;
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/publicLoginSubPage/public/login'
+								});
+							}, 500);
+						} else if (res.cancel) {}
+					}
 				});
-				return;
 			}
-			let httpData = {};
-			// 获取验证码接口
-			uni.$u.http.post(`/yt/noauth/send_login_code/${this.bindPhoneObj.appUserKey}`).then(res => {
-				if (res) {
-					this.getCodeState(); //开始倒计时
-				}
-			});
-		},
-		onLoginoutFunc() {
-			this.showLogout = true;
-		},
-		closeLogout() {
-			this.showLogout = false;
-		},
-		logoutBtn() {
-			let that = this;
-			uni.showModal({
-				title: '退出登录',
-				content: '你确定退出登录吗？',
-				success(res) {
-					if (res.confirm) {
-						that.emptyUserInfo();
-						that.showLogout = false;
-						setTimeout(() => {
-							uni.navigateTo({
-								url: '/publicLoginSubPage/public/login'
-							});
-						}, 500);
-					} else if (res.cancel) {
-					}
-				}
-			});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@import './static/personal.scss';
-</style>
+	@import './static/personal.scss';
+</style>