优化

pages.json

@@ -76,6 +76,11 @@
 			"style": {
 				"navigationBarTitleText": "隐私协议"
 			}
+		}, {
+			"path": "pages/me/agreement",
+			"style": {
+				"navigationBarTitleText": "服务协议"
+			}
 		},
 		{
 			"path": "pages/index/search/index",

pages/login/bind.vue

@@ -19,13 +19,10 @@
 </template>
 
 <script>
-	import listCell from '@/components/com-input';
+	import { reactive } from 'vue';
-	export default {
+	import { onLoad} from '@dcloudio/uni-app'
-		components: {
+	import {setSendMsg,forgetPwd} from '@/api/login/login.js';
-			listCell
+	let data = reactive({
-		},
-		data() {
-			return {
 		mobile: '',
 		code: '',
 		loginIng: false,
@@ -33,51 +30,52 @@
 		sendTime: '获取验证码',
 		count: 60,
 		type: '',
-			}
+	})
-		},
-		onLoad(option) {
-			if (option.type) {
-				this.type = option.type
-			}
-		},
-		methods: {
-			inputChange(e) {
-				const key = e.currentTarget.dataset.key;
-				this[key] = e.detail.value;
-			},
 	
-			countDown() {
+	onLoad((option) => {
+		if (option.type) {
+			data.type = option.type
+		}
+	})
+	
+	function inputChange(e) {
+		const key = e.currentTarget.dataset.key;
+		data[key] = e.detail.value;
+	}
+			
+	function countDown() {
 		const {
 			count
-				} = this;
+		} = data;
 		if (count === 1) {
-					this.count = 60;
+			data.count = 60;
-					this.sendIng = false;
+			data.sendIng = false;
-					this.sendTime = '获取验证码'
+			data.sendTime = '获取验证码'
 		} else {
-					this.count = count - 1;
+			data.count = count - 1;
-					this.sendIng = true;
+			data.sendIng = true;
-					this.sendTime = count - 1 + '秒后重新获取';
+			data.sendTime = count - 1 + '秒后重新获取';
-					setTimeout(this.countDown.bind(this), 1000);
+			setTimeout(data.countDown.bind(data), 1000);
 		}
-			},
+	}
-			sendMsg() {
+	
+	function sendMsg() {
 		const {
 			mobile
-				} = this;
+		} = data;
 		if (!mobile) {
-					this.$queue.showToast("请输入手机号");
+			data.$queue.showToast("请输入手机号");
 		} else if (mobile.length !== 11) {
-					this.$queue.showToast("请输入正确的手机号");
+			data.$queue.showToast("请输入正确的手机号");
 		} else {
-					this.$queue.showLoading("正在发送验证码...");
+			data.$queue.showLoading("正在发送验证码...");
 			http.request({
 				url: 'app/Login/sendMsg/' + mobile + '/gzg',
 			}).then(res => {
 				if (res.code === 0) {
-							this.sendIng = true;
+					data.sendIng = true;
-							this.$queue.showToast('验证码发送成功请注意查收');
+					uni.showToast({ title: '验证码发送成功请注意查收', icon: 'none', })
-							this.countDown();
+					data.countDown();
 				} else {
 					uni.showModal({
 						showCancel: false,
@@ -90,21 +88,22 @@
 			})
 			
 		}
-			},
+	}
-			toLogin() {
+	
+	function toLogin() {
 		const {
 			mobile,
 			code
-				} = this;
+		} = data;
 		let userId = this.$queue.getData("userId");
 		if (!mobile) {
-					this.$queue.showToast("请输入手机号");
+			uni.showToast({ title: '请输入手机号', icon: 'none', })
 		} else if (mobile.length !== 11) {
-					this.$queue.showToast("请输入正确的手机号");
+			uni.showToast({ title: '请输入正确的手机号', icon: 'none', })
 		} else if (!code) {
-					this.$queue.showToast("请输入验证码");
+			uni.showToast({ title: '请输入验证码', icon: 'none', })
 		} else {
-					this.$queue.showLoading("正在绑定中...");
+			uni.showLoading({ title: '正在绑定中...' })
 			let openId = this.$queue.getData('openId') ? this.$queue.getData('openId') : '';
 			let openidnickname = this.$queue.getData('openidnickname') ? this.$queue.getData('openidnickname') :
 				'';
@@ -134,6 +133,7 @@
 					this.$queue.setData('avatar', res.user.avatar ? res.user.avatar :
 						'../../static/logo.png');
 					this.$queue.showToast('绑定成功');
+					uni.showToast({ title: '绑定成功', icon: 'none', })
 					setTimeout(function() {
 						uni.navigateBack()
 					}, 1000)
@@ -147,9 +147,6 @@
 				uni.hideLoading();
 			});
 		}
-			},
-		},
-
 	}
 </script>
 

pages/login/login.vue

@@ -128,8 +128,6 @@
 				password: password,
 				phone: mobile
 			})
-			
-			if (res.code === 0) {
 			uni.setStorageSync('token', res.token)
 			uni.setStorageSync('userId', res.user.userId)
 			uni.setStorageSync('userName', res.user.userName)
@@ -142,6 +140,7 @@
 			if (res.user.qdCode) {
 				uni.setStorageSync('qdCode', res.user.qdCode)
 			}
+			uni.hideLoading();
 			uni.showToast({
 				title: '登录成功',
 				icon: 'none'
@@ -149,13 +148,7 @@
 			uni.reLaunch({
 				url:'/pages/index/index'
 			})
-			} else{
+			
-				uni.hideLoading();
-				uni.showToast({
-					title: res.msg,
-					icon: 'none'
-				})
-			}
 		
 		}
 	}

pages/login/register.vue

@@ -70,9 +70,7 @@
 		if (options.invitation ) { data.invitation = options.invitation }
 		
 		let res = await commonType(3)
-		if (res.code == 0) {
+		data.registerCode = res.value
-			data.registerCode = res.data.value
-		}
 	})
 	
 	/**
@@ -96,8 +94,9 @@
 				title: '正在发送验证码...'
 			})
 			let res = await setSendMsg(data.mobile,'login')
-			console.log(res)
+			uni.hideLoading();
-			if ( res.code == 0 ) {
+			uni.hideToast();
+			if( res ){
 				data.sending = true;
 				uni.showToast({
 					title: '验证码发送成功请注意查收',
@@ -109,11 +108,10 @@
 				uni.showModal({
 					showCancel: false,
 					title: '短信发送失败',
-					content: res.msg ? res.msg : '请一分钟后再获取验证码'
+					content: '请一分钟后再获取验证码'
 				});
 			}
 			
-			uni.hideLoading();
 			
 		}
 	}

pages/me/privacy.vue

@@ -27,7 +27,7 @@
 	
 	async function getGuize() {
 		let res = await commonType(155)
-		this.content = res.data.value
+		this.content = res.value
 	}
 	
 	function cancel(){