From f499eaa37c88150513ed99a5e19e4e82f095fdfc Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 21 Aug 2024 14:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E9=99=86=E5=BA=94=E8=81=98=E6=8A=80=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  75 ++++
 pages/publicThree/bind.vue       | 191 +++++++++
 pages/publicThree/css/main.css   |  93 +++++
 pages/publicThree/forgetPwd.vue  | 201 +++++++++
 pages/publicThree/login.vue      | 694 +++++++++++++++++++++++++++++++
 pages/publicThree/loginmsg.vue   | 234 +++++++++++
 pages/publicThree/loginphone.vue | 194 +++++++++
 pages/publicThree/pwd.vue        | 188 +++++++++
 pages/publicThree/register.vue   | 377 +++++++++++++++++
 pages/publicTwo/bind.vue         |  24 +-
 pages/publicTwo/login.vue        |   7 +-
 11 files changed, 2268 insertions(+), 10 deletions(-)
 create mode 100644 pages/publicThree/bind.vue
 create mode 100644 pages/publicThree/css/main.css
 create mode 100644 pages/publicThree/forgetPwd.vue
 create mode 100644 pages/publicThree/login.vue
 create mode 100644 pages/publicThree/loginmsg.vue
 create mode 100644 pages/publicThree/loginphone.vue
 create mode 100644 pages/publicThree/pwd.vue
 create mode 100644 pages/publicThree/register.vue

diff --git a/pages.json b/pages.json
index c49dd46..fe1b3fa 100644
--- a/pages.json
+++ b/pages.json
@@ -710,6 +710,81 @@
 			}
 		},
 		// #ifdef H5
+		{
+			"path": "pages/publicThree/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		// #endif
+		// #ifndef H5
+		{
+			"path": "pages/publicThree/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		// #endif
+		{
+			"path": "pages/publicThree/bind",
+			"style": {
+				"navigationBarTitleText": "绑定手机号",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/publicThree/forgetPwd",
+			"style": {
+				"navigationBarTitleText": "重置密码",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		
+		{
+			"path": "pages/publicThree/loginphone",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/publicThree/loginmsg",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/publicThree/pwd",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/publicThree/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		}, 
+		// #ifdef H5
 		{
 			"path": "pages/publicTwo/login",
 			"style": {
diff --git a/pages/publicThree/bind.vue b/pages/publicThree/bind.vue
new file mode 100644
index 0000000..bda871d
--- /dev/null
+++ b/pages/publicThree/bind.vue
@@ -0,0 +1,191 @@
+<template>
+	<view class="container">
+		<view class="cu-form-group"
+			style="margin: 30upx;border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+			<view class="title">手机号</view>
+			<input type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
+				@input="inputChange" />
+		</view>
+		<view class="cu-form-group"
+			style="margin: 30upx;border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+			<text class="title">验证码</text>
+			<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange"
+				@confirm="toLogin" />
+			<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
+		</view>
+
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">立即绑定</button>
+	</view>
+	</view>
+</template>
+
+<script>
+	import listCell from '@/components/com-input';
+	export default {
+		components: {
+			listCell
+		},
+		data() {
+			return {
+				mobile: '',
+				code: '',
+				logining: false,
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+			}
+		},
+		methods: {
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			countDown() {
+				const {
+					count
+				} = this;
+				if (count === 1) {
+					this.count = 60;
+					this.sending = false;
+					this.sendTime = '获取验证码'
+				} else {
+					this.count = count - 1;
+					this.sending = true;
+					this.sendTime = count - 1 + '秒后重新获取';
+					setTimeout(this.countDown.bind(this), 1000);
+				}
+			},
+			sendMsg() {
+				const {
+					mobile
+				} = this;
+				if (!mobile) {
+					this.$queue.showToast("请输入手机号");
+				} else if (mobile.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在发送验证码...");
+					this.$Request.getT('/app/Login/sendMsg/' + mobile + '/gzg').then(res => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast('验证码发送成功请注意查收');
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '短信发送失败',
+								content: res.msg ? res.msg : '请一分钟后再获取验证码'
+							});
+						}
+					});
+				}
+			},
+			toLogin() {
+				const {
+					mobile,
+					code
+				} = this;
+				let userId = this.$queue.getData("userId");
+				if (!mobile) {
+					this.$queue.showToast("请输入手机号");
+				} else if (mobile.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else if (!code) {
+					this.$queue.showToast("请输入验证码");
+				} else {
+					this.$queue.showLoading("正在绑定中...");
+					let openId = this.$queue.getData('openid') ? this.$queue.getData('openid') : '';
+					let openidnickname = this.$queue.getData('openidnickname') ? this.$queue.getData('openidnickname') : '';
+					let openidheadimgurl = this.$queue.getData('openidheadimgurl') ? this.$queue.getData('openidheadimgurl') : '';
+					let invitation = this.$queue.getData('inviterCode') ? this.$queue.getData('inviterCode') : '';
+					this.$Request.post(`/app/Login/registerCode`, {
+						phone: mobile,
+						openId: openId,
+						inviterCode: invitation,
+						avatar: openidheadimgurl,
+						userName: openidnickname,
+						msg: code
+					}).then(res => {
+						if (res.code === 0) {
+							this.$queue.setData("token", res.token);
+							this.$queue.setData('userId', res.user.userId);
+							this.$queue.setData('userName', res.user.userName);
+							this.$queue.setData('phone', res.user.phone);
+							this.$queue.setData('avatar', res.user.avatar ? res.user.avatar :
+								'../../static/logo.png');
+							this.$queue.showToast('绑定成功');
+							uni.navigateTo({
+								url: '/pages/my/hehuo'
+							});
+							// setTimeout(function() {
+							// 	uni.switchTab({
+							// 		url: '/pages/index/index'
+							// 	})
+							// }, 1000)
+						} else {
+							uni.showModal({
+								showCancel: false,
+								title: '绑定失败',
+								content: res.msg,
+							});
+						}
+						uni.hideLoading();
+					});
+				}
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	.send-msg {
+		color: #096f4b;
+		height: 30px;
+		font-size: 29rpx;
+		line-height: 30px;
+	}
+	uni-button:after{
+		border: 0 !important;
+	}
+
+	.container {
+		top: 0;
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #ffffff;
+	}
+	.cu-form-group{
+		background-color: #f7f7f7;
+	}
+	.cu-form-group .title{
+		font-size: 29rpx;
+		color: #333;
+	}
+	.cu-form-group uni-input{
+		font-size: 29rpx;
+		color: #999999;
+	}
+	.confirm-btn {
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60upx;
+		margin-top: 32upx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		font-size: 30upx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+</style>
diff --git a/pages/publicThree/css/main.css b/pages/publicThree/css/main.css
new file mode 100644
index 0000000..3474926
--- /dev/null
+++ b/pages/publicThree/css/main.css
@@ -0,0 +1,93 @@
+.content {
+	display: flex;
+	flex-direction: column;
+	justify-content:center;
+	/* margin-top: 128upx; */
+}
+
+/* 头部 logo */
+.header {
+	text-align: center;
+
+	width:161upx;
+	height:161upx;
+	box-shadow:0upx 0upx 60upx 0upx rgba(0,0,0,0.1);
+	border-radius:50%;
+	background: -moz-linear-gradient(left, #F15B6C, #e10a07 100%);
+	background: -webkit-gradient(linear, left top, left right, color-stop(0, #F15B6C), color-stop(100%, #e10a07));
+	background: -webkit-linear-gradient(left, #F15B6C 0, #e10a07 100%);
+	background: -o-linear-gradient(left, #F15B6C 0, #e10a07 100%);
+	background: -ms-linear-gradient(left, #F15B6C 0, #e10a07 100%);
+	background: linear-gradient(to left, #F15B6C 0, #e10a07 100%);
+	margin-top: 180upx;
+	margin-bottom: 72upx;
+	font-size: 60upx;
+	color: white;
+	font-weight: bold;
+	padding-top: 32upx;
+	margin-left: auto;
+	margin-right: auto;
+}
+.header image{
+	width:161upx;
+	height:161upx;
+	border-radius:50%;
+}
+
+/* 主体 */
+.main {
+	display: flex;
+	flex-direction: column;
+	padding-left: 70upx;
+	padding-right: 70upx;
+}
+.tips {
+	color: #999999;
+	font-size: 28upx;
+	margin-top: 64upx;
+	margin-left: 48upx;
+}
+
+/* 其他登录方式 */
+.other_login{
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	margin-top: 256upx;
+	text-align: center;
+}
+.login_icon{
+	border: none;
+	font-size: 64upx;
+	margin: 0 64upx 0 64upx;
+	color: rgba(0,0,0,0.7)
+}
+.wechat_color{
+	color: #83DC42;
+}
+.weibo_color{
+	color: #F9221D;
+}
+.github_color{
+	color: #24292E;
+}
+
+/* 底部 */
+.footer{
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	font-size: 28upx;
+	margin-top: 64upx;
+	color: rgba(0,0,0,0.7);
+	text-align: center;
+	height: 40upx;
+	line-height: 40upx;
+}
+.footer text{
+	font-size: 24upx;
+	margin-left: 15upx;
+	margin-right: 15upx;
+}
\ No newline at end of file
diff --git a/pages/publicThree/forgetPwd.vue b/pages/publicThree/forgetPwd.vue
new file mode 100644
index 0000000..9f72b82
--- /dev/null
+++ b/pages/publicThree/forgetPwd.vue
@@ -0,0 +1,201 @@
+<template>
+	<view class="container">
+		<view class="wrapper">
+			<view class="input-content">
+				<view class="cu-form-group" style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<view class="title text-black">手机号</view>
+					<input type="number" :value="phone" placeholder="请输入手机号" maxlength="11" data-key="phone" @input="inputChange" />
+				</view>
+				<view class="cu-form-group" style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">验证码</text>
+					<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange"
+					 @confirm="toLogin" />
+					<button class="send-msg" @click="sendMsg" :disabled="sending">{{sendTime}}</button>
+				</view>
+				<view class="cu-form-group" style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">设置密码</text>
+					<input type="password" :value="password" placeholder="请设置新密码" placeholder-class="input-empty" maxlength="20"
+					 minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
+				</view>
+			</view>
+			<button class="confirm-btn" @click="toLogin">立即找回</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: '',
+				phone: '',
+				password: '',
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+				logining: false
+			}
+		},
+
+		methods: {
+			sendMsg() {
+				const {
+					phone
+				} = this;
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (phone.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在发送验证码...");
+					this.$Request.getT("/app/Login/sendMsg/" + phone + "/forget").then(res => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast('验证码发送成功请注意查收');
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '短信发送失败',
+								content: res.msg ? res.msg : '请一分钟后再获取验证码'
+							});
+						}
+					});
+				}
+			},
+			countDown() {
+				const {
+					count
+				} = this;
+				if (count === 1) {
+					this.count = 60;
+					this.sending = false;
+					this.sendTime = '获取验证码'
+				} else {
+					this.count = count - 1;
+					this.sending = true;
+					this.sendTime = count - 1 + '秒后重新获取';
+					setTimeout(this.countDown.bind(this), 1000);
+				}
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+
+			navTo(url) {
+				uni.navigateTo({
+					url
+				})
+			},
+			toLogin() {
+				const {
+					phone,
+					password,
+					code
+				} = this;
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (!password) {
+					this.$queue.showToast("请设置密码");
+				} else if (password.length < 6) {
+					this.$queue.showToast("密码位数必须大于六位");
+				} else {
+					this.logining = true;
+					this.$queue.showLoading("正在修改密码中...");
+					this.$Request.post("/app/Login/forgetPwd", {
+						pwd: password,
+						phone: phone,
+						msg: code
+					}).then(res => {
+						uni.hideLoading();
+						if (res.code === 0) {
+							uni.navigateTo({
+								url: '/pages/publicThree/loginphone'
+							});
+						} else {
+
+							uni.showModal({
+								showCancel: false,
+								title: '密码找回失败',
+								content: res.msg,
+							});
+						}
+					});
+				}
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		background: #FFFFFF !important;
+	}
+
+	.send-msg {
+		color: #019c88;
+		height: 30px;
+		font-size: 29rpx;
+		line-height: 30px;
+		padding: 0 !important;
+	}
+	uni-button:after{
+		border: 0 !important;
+	}
+
+	.container {
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #FFFFFF;
+	}
+	.cu-form-group{
+		background-color: #f7f7f7;
+	}
+	.cu-form-group .title{
+		font-size: 29rpx;
+		color: #333;
+	}
+	.cu-form-group uni-input{
+		font-size: 29rpx;
+		color: #999999;
+	}
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #FFFFFF;
+		padding-bottom: 20px;
+	}
+
+
+	.input-content {
+		padding: 32upx 80upx;
+	}
+
+
+	.confirm-btn {
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60upx;
+		margin-top: 32upx;
+		background: linear-gradient(to right, #019c88, #2ebf93);
+		color: #fff;
+		font-size: 30upx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+</style>
diff --git a/pages/publicThree/login.vue b/pages/publicThree/login.vue
new file mode 100644
index 0000000..756f85d
--- /dev/null
+++ b/pages/publicThree/login.vue
@@ -0,0 +1,694 @@
+<template>
+	<view class="container">
+		<!-- <image @click="navBack" src="../../static/images/index/close.png" style="width: 32upx;height: 32upx;margin-left: 46upx;"></image> -->
+		<!-- 小程序状态下登录 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="mp_wxBox">
+			<view>
+				<view class="headers">
+					<image src="../../static/logo.png" style="border-radius: 50%;"></image>
+				</view>
+				<view class="content">
+					<view>申请获取以下权限</view>
+					<text>获得你的公开信息(昵称，头像、地区等)</text>
+				</view>
+				<button v-show="weixinPhone" style="background: #096f4b;color: #FFFFFF;" class="bottom"
+					open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+					授权手机号
+				</button>
+				<button v-show="!weixinPhone" style="background: #096f4b;color: #FFFFFF;" class='bottom'
+					bindtap="getUserProfile" @tap="wxGetUserInfo">
+					授权登录
+				</button>
+			</view>
+		</view>
+		<view style="text-align: center;">
+			<view class="footer">
+				<image v-if="showAgree" @tap="isShowAgree"
+					src="../../static/duihao.png"
+					style="width: 30upx;height: 30upx;"></image>
+				<image v-else @tap="isShowAgree"
+					src="https://api.shengqianxiong.com.cn/img/20201112/1e9102fc891f4d86a13c7b2ba6921cba.png"
+					style="width: 30upx;height: 30upx;"></image>
+				<text style="margin-left: 10upx;margin-right: 0;">同意</text>
+				<!-- 协议地址 -->
+				<navigator url="/my/setting/mimi" open-type="navigate">《隐私政策》</navigator>
+				和
+				<navigator url="/my/setting/xieyi" open-type="navigate">《用户协议》</navigator>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef MP-WEIXIN -->
+		<!-- <view style="font-size: 44upx;margin: 32upx;color: #333333;">欢迎登录盛安到家</view> -->
+		<view style="text-align: center;">
+			<image style="width: 200upx;height: 200upx;margin-top: 200upx;"
+				src="../../static/logo.png"></image>
+			<view style="font-size: 34upx;margin: 30upx;color: #333333;font-weight: 500;">盛安到家专业 O2O服务平台</view>
+			<!-- #ifdef APP-PLUS -->
+			<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>
+			<button v-if="weixinLogin" class='confirm-btn-weixin' @click="register">手机号登录</button>
+			<!-- <button v-if="!weixinLogin" class='confirm-btn' @click="register">手机号登录</button> -->
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<button class='confirm-btn' v-if="isopen" @click="bingwx">微信一键登录</button>
+			<button v-if="!isopen" class='confirm-btn' @click="register">登录</button>
+			<!-- <button class='confirm-btn' @click="register">登录</button> -->
+			<!-- #endif -->
+			<view v-if="!isopen"
+				style="width: 100%;text-align: center;margin-top: 20upx; font-size: 12px;color: #019c88;text-decoration:underline;"
+				@tap="msgRegister">验证码登录</view>
+			<!-- 底部信息 -->
+			<view class="footer">
+				<image v-if="showAgree" @tap="isShowAgree"
+					src="../../static/duihao.png"
+					style="width: 30upx;height: 30upx;"></image>
+				<image v-else @tap="isShowAgree"
+					src="https://api.shengqianxiong.com.cn/img/20201112/1e9102fc891f4d86a13c7b2ba6921cba.png"
+					style="width: 30upx;height: 30upx;"></image>
+				<text style="margin-left: 10upx;margin-right: 0;">同意</text>
+				<!-- 协议地址 -->
+				<navigator url="/my/setting/mimi" open-type="navigate" style="color: #019c88;">《隐私政策》</navigator>
+				和
+				<navigator url="/my/setting/xieyi" open-type="navigate" style="color: #019c88;">《用户协议》</navigator>
+			</view>
+		</view>
+		<!-- #endif -->
+
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				mobile: '',
+				code: '',
+				showAgree: false, //协议是否选择
+				isopen: false,
+				weixinLogin: false,
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+				weixinPhone: false,
+				sendDataList: {},
+				sessionkey: '',
+				phoneNum: false,
+			};
+		},
+		onLoad(e) {
+			if (e.inviterCode) {
+				this.$queue.setData('inviterCode', e.inviterCode);
+			}
+			if (e.bindingConsortiaId) {
+				this.$queue.setData('bindingConsortiaId', e.bindingConsortiaId);
+			}
+			this.$Request.get('/app/common/type/237').then(res => {
+				if (res.code == 0) {
+					if (res.data && res.data.value && res.data.value == '是') {
+						// #ifdef H5
+						let ua = navigator.userAgent.toLowerCase();
+						if (ua.indexOf('micromessenger') !== -1) {
+							this.isopen = true;
+						} else {
+							this.isopen = false;
+						}
+						// #endif
+					}
+				}
+			});
+			//微信登录开启
+			this.$Request.getT('/app/common/type/53').then(res => {
+				if (res.code == 0) {
+					if (res.data && res.data.value && res.data.value == '是') {
+						// this.weixinLogin = true;
+					}
+				}
+			});
+			this.$Request.getT('/app/common/type/188').then(res => {
+				if (res.code == 0) {
+					if (res.data && res.data.value && res.data.value == '是') {
+						this.phoneNum = true;
+					}
+				}
+			});
+			// #ifdef H5
+			this.selbindwx();
+			// #endif
+		},
+		methods: {
+			isShowAgree() {
+				//是否选择协议
+				this.showAgree = !this.showAgree;
+			},
+			selbindwx() {
+				let ua = navigator.userAgent.toLowerCase();
+				if (ua.indexOf('micromessenger') !== -1) {
+					let openid = uni.getStorageSync('openid');
+					let userId = uni.getStorageSync('userId');
+					let that = this;
+					if (window.location.href.indexOf('?code=') !== -1 || window.location.href.indexOf('&code=') !==
+						-1) {
+						let code;
+						if (window.location.href.indexOf('?code=') !== -1) {
+							code = window.location.href.split('?code=')[1].split('&')[0];
+						} else {
+							code = window.location.href.split('&code=')[1].split('&')[0];
+						}
+						this.$Request.get('/app/Login/getOpenId?code=' + code).then(ret => {
+							uni.setStorageSync('openid', ret.data.openid)
+							uni.setStorageSync('openidheadimgurl', ret.data.headimgurl)
+							uni.setStorageSync('openidnickname', ret.data.nickname)
+
+							this.$Request.get('/app/Login/openid/login?openId=' + ret.data.openid).then(res => {
+								if (res.code == 0) {
+									this.$queue.setData("phone", res.user.phone);
+									this.$queue.setData("userId", res.user.userId);
+									this.$queue.setData("token", res.token);
+									this.$queue.setData("userName", res.user.userName);
+									this.$queue.setData("avatar", res.user.avatar);
+									this.$queue.setData("invitationCode", res.user.invitationCode);
+									this.$queue.setData("inviterCode", res.user.inviterCode);
+									this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId);
+									uni.navigateTo({
+										url: '/pages/my/hehuo'
+									});
+									
+									// uni.switchTab({
+									// 	url: '/pages/index/index'
+									// })
+								} else {
+									uni.navigateTo({
+										url: '/pages/publicThree/bind'
+									});
+								}
+							});
+						});
+					}
+				}
+			},
+			bingwx() {
+				if (this.showAgree == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请同意《用户协议》和《隐私政策》'
+					});
+					return false;
+				}
+				let ua = navigator.userAgent.toLowerCase();
+				if (ua.indexOf('micromessenger') !== -1) {
+					let openid = uni.getStorageSync('openid');
+					let userId = uni.getStorageSync('userId');
+					let that = this;
+					if (!openid) {
+						if (window.location.href.indexOf('?code=') !== -1 || window.location.href.indexOf('&code=') !==
+							-1) {
+							let code;
+							if (window.location.href.indexOf('?code=') !== -1) {
+								code = window.location.href.split('?code=')[1].split('&')[0];
+							} else {
+								code = window.location.href.split('&code=')[1].split('&')[0];
+							}
+							this.$Request.get('/app/Login/getOpenId?code=' + code).then(ret => {
+								uni.setStorageSync('openid', ret.data.openid)
+								uni.setStorageSync('openidheadimgurl', ret.data.headimgurl)
+								uni.setStorageSync('openidnickname', ret.data.nickname)
+
+								this.$Request.get('/app/Login/openid/login?openId=' + ret.data.openid).then(res => {
+									if (res.code == 0) {
+										this.$queue.setData("phone", res.user.phone);
+										this.$queue.setData("userId", res.user.userId);
+										this.$queue.setData("token", res.token);
+										this.$queue.setData("userName", res.user.userName);
+										this.$queue.setData("avatar", res.user.avatar);
+										this.$queue.setData("invitationCode", res.user.invitationCode);
+										this.$queue.setData("inviterCode", res.user.inviterCode);
+										this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId);
+										uni.navigateTo({
+											url: '/pages/my/hehuo'
+										});
+										// uni.switchTab({
+										// 	url: '/pages/index/index'
+										// })
+									} else {
+										uni.navigateTo({
+											url: '/pages/publicThree/bind'
+										});
+									}
+								});
+							});
+						} else {
+							window.location.href =
+								'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
+								that.$queue.getWxAppid() +
+								'&redirect_uri=' +
+								window.location.href.split('#')[0] +
+								'&response_type=code&scope=snsapi_userinfo#wechat_redirect';
+						}
+					} else {
+						this.$Request.get('/app/Login/openid/login?openId=' + openid).then(res => {
+							if (res.code == 0) {
+								this.$queue.setData("phone", res.user.phone);
+								this.$queue.setData("userId", res.user.userId);
+								this.$queue.setData("token", res.token);
+								this.$queue.setData("userName", res.user.userName);
+								this.$queue.setData("avatar", res.user.avatar);
+								this.$queue.setData("invitationCode", res.user.invitationCode);
+								this.$queue.setData("inviterCode", res.user.inviterCode);
+								uni.navigateTo({
+									url: '/pages/my/hehuo'
+								});
+								// uni.switchTab({
+								// 	url: '/pages/index/index'
+								// })
+							} else {
+								uni.navigateTo({
+									url: '/pages/publicThree/bind'
+								});
+							}
+						});
+					}
+				}
+			},
+			wxGetUserInfo(e) {
+				if (this.showAgree == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请同意《用户协议》和《隐私政策》'
+					});
+					return false;
+				}
+				wx.getUserProfile({
+					desc: '业务需要',
+					success: infoRes => {
+						console.log("infoRes.encryptedData__________:" + JSON.stringify(infoRes.userInfo))
+						let nickName = infoRes.userInfo.nickName; //昵称
+						let avatarUrl = infoRes.userInfo.avatarUrl; //头像
+						let sex = infoRes.userInfo.gender; //头像
+						try {
+							this.$queue.showLoading('正在登录中...');
+							this.login(nickName, avatarUrl, sex);
+						} catch (e) {}
+					}
+				})
+			},
+			//登录
+			login(nickName, avatarUrl, sex) {
+				if (this.showAgree == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请同意《用户协议》和《隐私政策》'
+					});
+					return false;
+				}
+				let that = this;
+				// 1.wx获取登录用户code
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log(loginRes, '************')
+						let data = {
+							code: loginRes.code,
+						}
+						that.$Request.get('/app/Login/wxLogin', data).then(res => {
+							if (res.code == 0) {
+								uni.hideLoading()
+								uni.setStorageSync('openId', res.data.open_id)
+								uni.setStorageSync('unionId', res.data.unionId)
+								that.sessionkey = res.data.session_key;
+
+								let inviterCode = '';
+								if (uni.getStorageSync('inviterCode')) {
+									inviterCode = uni.getStorageSync('inviterCode')
+								}
+                let bindingConsortiaId = '';
+								if (uni.getStorageSync('bindingConsortiaId')) {
+									bindingConsortiaId = uni.getStorageSync('bindingConsortiaId')
+								}
+								let sendData = {
+									openId: uni.getStorageSync('openId'),
+									unionId: uni.getStorageSync('unionId'),
+									userName: nickName,
+									avatar: avatarUrl,
+									sex: sex, //性别
+									inviterCode: inviterCode, //别人登录进来携带你的邀请码
+                  bindingConsortiaId: bindingConsortiaId,
+								};
+								that.sendDataList = sendData;
+								that.flag = res.data.flag;
+								// 第一次登录获取手机号
+								console.log(that.phoneNum)
+								if (that.flag == '1' && that.phoneNum) {
+									that.weixinPhone = true;
+								} else {
+									that.getWeixinInfo(sendData);
+								}
+							} else {
+								uni.showToast({
+									icon: 'none',
+									title: res.msg,
+									duration: 2000
+								});
+								console.log(res, '失败')
+							}
+						})
+
+					}
+				});
+			},
+			//小程序微信登录后获取手机号
+			getPhoneNumber: function(e) {
+				if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
+					console.log('用户拒绝提供手机号');
+				} else {
+					console.log('用户同意提供手机号');
+					console.log(e)
+					this.setPhoneByInsert(e.detail.encryptedData, e.detail.iv);
+				}
+			},
+			//小程序微信登录后获取手机号
+			setPhoneByInsert(decryptData, iv) {
+				let data = {
+					decryptData: decryptData,
+					key: this.sessionkey,
+					iv: iv
+				};
+
+				this.$Request.postJson('/app/Login/selectPhone', data).then(res => {
+					if (res.code == 0) {
+						this.phone = res.data.phoneNumber;
+						this.getWeixinInfo(this.sendDataList);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//获取个人信息
+			getWeixinInfo(sendData) {
+				let that = this;
+				uni.showLoading({
+					title: '登录中...'
+				});
+				let postData = {
+					openId: sendData.openId, //小程序openId
+					unionId: sendData.unionId, //unionId
+					userName: sendData.userName, //微信名称
+					avatar: sendData.avatar, //头像
+					sex: sendData.sex, //性别
+					phone: that.phone,
+					inviterCode: sendData.inviterCode,
+          bindingConsortiaId: sendData.bindingConsortiaId,
+				};
+				that.$Request.postJson('/app/Login/insertWxUser', postData).then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.setStorageSync('token', res.token)
+						uni.setStorageSync('userName', res.user.userName)
+						uni.setStorageSync('avatar', res.user.avatar)
+						uni.setStorageSync('phone', res.user.phone)
+						uni.setStorageSync('invitationCode', res.user.invitationCode)
+						uni.setStorageSync('sex', res.user.sex)
+						uni.setStorageSync('userId', res.user.userId)
+						uni.setStorageSync('openId', res.user.openId)
+
+						this.$Request.get("/app/UserVip/isUserVip").then(res => {
+							if (res.code == 0 && res.data && res.data.isVip == 2) {
+								uni.setStorageSync('isVIP', true)
+							} else {
+								uni.setStorageSync('isVIP', false)
+							}
+						});
+						uni.navigateBack();
+					} else {
+						uni.showModal({
+							showCancel: false,
+							title: '登录失败',
+							content: res.msg,
+						});
+					}
+				})
+			},
+
+			weixinLo() {
+				let that = this;
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						that.$queue.showLoading('正在登录中...');
+						console.error(loginRes.authResult);
+						that.$queue.setData('weixinToken', loginRes.authResult.access_token);
+						that.$queue.setData('unionid', loginRes.authResult.unionid);
+						that.$queue.setData('weixinOpenid', loginRes.authResult.openid);
+						that.$Request.postJson('/app/login/loginApp', {
+							token: loginRes.authResult.access_token,
+							unionid: loginRes.authResult.unionid,
+							openid: loginRes.authResult.openid
+						}).then(res => {
+							console.log(JSON.stringify(res))
+							if (res.code === 0) {
+								if (uni.getSystemInfoSync().platform == "android") {
+									let clientid = plus.push.getClientInfo().clientid;
+									that.$Request.postT('/app/login/updateClientId?clientId=' +
+										clientid + '&userId=' + res.userId).then(res => {
+
+									});
+								}
+								that.$queue.setData("token", res.uuid);
+								that.$queue.setData("userId", res.userId);
+								that.getUserInfo(res.userId, res.token);
+							} else {
+								uni.hideLoading();
+								uni.navigateTo({
+									url: '/pages/publicThree/wxmobile?text='+this.textName
+								});
+							}
+						});
+
+
+					}
+				});
+			},
+
+			forget() {
+				uni.navigateTo({
+					url: '/pages/publicThree/pwd'
+				});
+			},
+			msgRegister() {
+				if (this.showAgree == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请同意《用户协议》和《隐私政策》'
+					});
+					return false;
+				}
+				uni.navigateTo({
+					url: '/pages/publicThree/loginmsg'
+				});
+			},
+			register() {
+				if (this.showAgree == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请同意《用户协议》和《隐私政策》'
+					});
+					return false;
+				}
+				uni.navigateTo({
+					url: '/pages/publicThree/loginphone'
+				});
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			getUserInfo(userId, token) {
+				this.$Request.postJson('/app/selectUserById?userId=' + userId).then(res => {
+					if (res.code === 0) {
+						this.$queue.setData('token', res.data.uuid);
+						this.$queue.setData('image_url', res.data.imageUrl ? res.data.imageUrl :
+							'/static/img/common/logo.jpg');
+						this.$queue.setData('inviterCode', res.data.inviterCode);
+						this.$queue.setData('invitationCode', res.data.invitationCode);
+						this.$queue.setData('bindingConsortiaId', res.data.bindingConsortiaId);
+						this.$queue.setData('grade', res.data.grade);
+						this.$queue.setData('mobile', res.data.mobile);
+						this.$queue.setData('isInvitation', res.data.isInvitation);
+						this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
+						uni.navigateTo({
+							url: '/pages/my/hehuo'
+						});
+						this.$queue.setData('gender', parseInt(res.data.gender));
+					// 	uni.switchTab({
+					// 		url: '/pages/index/index'
+					// 	});
+					// } else {
+						uni.showModal({
+							showCancel: false,
+							title: '登录失败',
+							content: res.msg
+						});
+						this.$queue.logout();
+					}
+					uni.hideLoading();
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		background: #FFFFFF !important;
+	}
+
+	
+
+
+	.container {
+		top: 0;
+		padding-top: 50px;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #fcfcfc !important;
+		color: #FFF;
+	}
+
+
+
+	.confirm-btn-weixin {
+		width: 200px;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60px;
+		margin-top: 100upx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		font-size: 30upx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+
+	.headers {
+		text-align: center;
+	}
+
+	.headers>image {
+		width: 400upx;
+		height: 400upx;
+	}
+	
+	
+	.footer {
+		margin-top: 17px;
+		font-size: 12px;
+		color: #666666;
+		text-align: center;
+		display: flex;
+		align-items: inherit;
+		position: fixed;
+		width: 100%;
+		bottom: 32px;
+		justify-content: center;
+	}
+
+	page {
+		background: #fff;
+	}
+
+	.send-msg {
+		border-radius: 30px;
+		color: black;
+		background: white;
+		height: 30px;
+		font-size: 14px;
+		line-height: 30px;
+	}
+
+	.container {
+		top: 0;
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #f3f3f3;
+		color: #FFF;
+
+		.mp_wxBox {
+			.headers {
+				margin: 35% auto 50rpx;
+				text-align: center;
+				border-radius: 60rpx;
+				width: 650rpx;
+				height: 300rpx;
+				line-height: 450rpx;
+
+				image {
+					width: 300rpx;
+					height: 300rpx;
+				}
+			}
+
+			.content {
+				text-align: center;
+			}
+
+			text {
+				display: block;
+				color: #9d9d9d;
+				margin-top: 40rpx;
+			}
+
+			.bottom {
+				line-height: 80upx;
+				border-radius: 80upx;
+				margin: 70rpx 50rpx;
+				height: 80upx;
+				font-size: 35rpx;
+			}
+		}
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #fff;
+		padding-bottom: 20px;
+	}
+
+	.input-content {
+		padding: 0 20px;
+	}
+
+	.confirm-btn {
+		width: 500rpx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 10px;
+		margin-top: 300rpx;
+		border-radius: 60px;
+		font-size: 32rpx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		// font-size: $font-lg;
+
+	}
+</style>
diff --git a/pages/publicThree/loginmsg.vue b/pages/publicThree/loginmsg.vue
new file mode 100644
index 0000000..733af23
--- /dev/null
+++ b/pages/publicThree/loginmsg.vue
@@ -0,0 +1,234 @@
+<template>
+	<view class="container">
+		<!-- <view class="cu-form-group" style="margin: 30upx;border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+			<view class="title">手机号</view>
+			<input type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile" @input="inputChange" />
+		</view>
+		 <view class="cu-form-group" style="margin: 30upx;border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+		 	<text class="title">验证码</text>
+		 	<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code" @input="inputChange"
+		 	 @confirm="toLogin" />
+		 	<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
+		 </view> -->
+		
+		<view class="input-content">
+			<!-- <view class="" style="font-size: 40upx;margin: 30upx 0 50upx 0;font-weight: bold;">验证码登录</view> -->
+		 	<view class="cu-form-group"
+		 		style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+		 		<view class="title text-black">手机号</view>
+		 		<input type="number" :value="mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
+		 			@input="inputChange" />
+		 	</view>
+		 	<view class="cu-form-group" style="border: 2upx solid whitesmoke;border-radius: 30px">
+		 		<view class="title text-black">验证码</view>
+		 		<input type="number" placeholder="请输入验证码" maxlength="6" :value="code" data-key="code"
+		 			@input="inputChange" @confirm="toLogin" />
+		 		<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
+		 	</view>
+		</view>
+		 
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+	</view>
+	</view>
+</template>
+
+<script>
+	import listCell from '@/components/com-input';
+	export default {
+		components: {
+			listCell
+		},
+		data() {
+			return {
+				mobile: '',
+				code: '',
+				logining: false,
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+			}
+		},
+
+		methods: {
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			countDown() {
+				const {
+					count
+				} = this;
+				if (count === 1) {
+					this.count = 60;
+					this.sending = false;
+					this.sendTime = '获取验证码'
+				} else {
+					this.count = count - 1;
+					this.sending = true;
+					this.sendTime = count - 1 + '秒后重新获取';
+					setTimeout(this.countDown.bind(this), 1000);
+				}
+			},
+			sendMsg() {
+				const {
+					mobile
+				} = this;
+				if (!mobile) {
+					this.$queue.showToast("请输入手机号");
+				} else if (mobile.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在发送验证码...");
+					this.$Request.getT('/app/Login/sendMsg/' + mobile + '/gzg').then(res => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast('验证码发送成功请注意查收');
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '短信发送失败',
+								content: res.msg ? res.msg : '请一分钟后再获取验证码'
+							});
+						}
+					});
+				}
+			},
+			toLogin() {
+				const {
+					mobile,
+					code
+				} = this;
+				let userId = this.$queue.getData("userId");
+				if (!mobile) {
+					this.$queue.showToast("请输入手机号");
+				} else if (mobile.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else if (!code) {
+					this.$queue.showToast("请输入验证码");
+				} else {
+					this.$queue.showLoading("正在登录中...");
+					let openId = this.$queue.getData('openid') ? this.$queue.getData('openid') : '';
+					let invitation = this.$queue.getData('inviterCode') ? this.$queue.getData('inviterCode') : '';
+					this.$Request.post(`/app/Login/registerCode`, {
+						phone: mobile,
+						openId: openId,
+						inviterCode: invitation,
+						msg: code
+					}).then(res => {
+						if (res.code === 0) {
+							this.$queue.setData("token", res.token);
+							this.$queue.setData('userId', res.user.userId);
+							this.$queue.setData('userName', res.user.userName);
+							this.$queue.setData('phone', res.user.phone);
+							this.$queue.setData('avatar', res.user.avatar?res.user.avatar: '../../static/logo.png');
+							this.$queue.showToast('登录成功');
+							this.getIsVip('624')
+							uni.navigateTo({
+								url: '/pages/my/hehuo'
+							});
+							// setTimeout(function() {
+							// 	uni.switchTab({
+							// 		url:'/pages/index/index'
+							// 	})
+							// },1000)
+						} else {
+							uni.showModal({
+								showCancel: false,
+								title: '登录失败',
+								content: res.msg,
+							});
+						}
+						uni.hideLoading();
+					});
+				}
+			},
+			getIsVip(id) {
+				var data={
+					userId:id
+				}
+				this.$Request.get("/app/VipDetails/getVipDetailByUser",data).then(res => {
+					if (res.code == 0) {
+						// this.isVip = res.data
+						// this.$queue.setData("isVip", res.data);
+						this.$queue.setData("vipName", res.data.vipName);
+						this.$queue.setData("rate", res.data.rate);
+						this.$queue.setData("rate", res.data.endTime);
+					}
+				});
+			}
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+
+	.send-msg {
+		color: #096f4b;
+		height: 30px;
+		font-size: 29rpx;
+		line-height: 30px;
+		padding: 0 !important;
+	}
+	uni-button:after{
+		border: 0 !important;
+	}
+	.container {
+		top: 0;
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #FFFFFF !important;
+	}
+	.cu-form-group{
+		background-color: #f7f7f7;
+	}
+	.cu-form-group .title{
+		font-size: 29rpx;
+		color: #333;
+	}
+	.cu-form-group uni-input{
+		font-size: 29rpx;
+		color: #999999;
+	}
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #FFFFFF;
+		padding-bottom: 32upx;
+	}
+	
+	
+	.input-content {
+		/* margin-top: 300upx; */
+		/* padding-top: 300upx; */
+		padding: 32upx 80upx;
+	
+	}
+	
+	
+	.confirm-btn {
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60upx;
+		margin-top: 32upx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		font-size: 30upx;
+	
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+
+</style>
diff --git a/pages/publicThree/loginphone.vue b/pages/publicThree/loginphone.vue
new file mode 100644
index 0000000..f096c9b
--- /dev/null
+++ b/pages/publicThree/loginphone.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="container">
+		<view class="wrapper">
+			<!-- <view style="text-align: center;">
+				<image src="../../static/logo.png" style="border-radius: 64upx;"></image>
+			</view>
+ -->
+			<view class="input-content">
+				<view class="cu-form-group"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<view class="title text-black">账号</view>
+					<input type="number" :value="phone" placeholder="请输入手机号" maxlength="11" data-key="phone"
+						@input="inputChange" />
+				</view>
+				<view class="cu-form-group" style="border: 2upx solid whitesmoke;border-radius: 30px">
+					<view class="title text-black">密码</view>
+					<input type="password" placeholder="请输入密码" maxlength="20" :value="password" data-key="password"
+						@input="inputChange" @confirm="toLogin" />
+					<text class="send-msg" @click="forget">忘记密码</text>
+				</view>
+			</view>
+			<button class="confirm-btn" @click="toLogin">登录</button>
+
+			<view style="margin-top: 32rpx;text-align: center">
+				<view><text style="font-size: 28upx;">没有账号？</text>
+					<text style="color: #019c88" @click="register()">立即注册</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phone: '',
+				password: '',
+				banners: [],
+				invitation: '',
+				loginName: '',
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+			forget() {
+				uni.navigateTo({
+					url: '/pages/publicThree/forgetPwd'
+				});
+			},
+			register() {
+				uni.navigateTo({
+					url: '/pages/publicThree/register'
+				});
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			toLogin() {
+				this.$queue.loginClear();
+				let openid = this.$queue.getData("openid");
+				const {
+					phone,
+					password
+				} = this;
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (phone.length != 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else if (!password) {
+					this.$queue.showToast("请输入密码");
+				} else {
+					this.$queue.showLoading("正在登录中...");
+					this.$Request.post("/app/Login/loginApp", {
+						password: password,
+						phone: phone,
+						openId: this.$queue.getData('openid') ? this.$queue.getData('openid') : ''
+					}).then(res => {
+						if (res.code == 0) {
+							this.$queue.setData("userId", res.user.userId);
+							this.$queue.setData("token", res.token);
+							this.$queue.setData("phone", res.user.phone);
+							this.$queue.setData("userName", res.user.userName);
+							this.$queue.setData("avatar", res.user.avatar);
+							this.$queue.setData("invitationCode", res.user.invitationCode);
+							this.$queue.setData("inviterCode", res.user.inviterCode);
+
+							this.getIsVip('624')
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/my/hehuo'
+							});
+						} else {
+							uni.hideLoading();
+							this.$queue.showToast(res.msg);
+						}
+					});
+				}
+			},
+			getIsVip(id) {
+				var data={
+					userId:id
+				}
+				this.$Request.get("/app/VipDetails/getVipDetailByUser",data).then(res => {
+					if (res.code == 0) {
+						this.isVipData = res.data
+						this.$queue.setData("isVIP", this.isVipData);
+						console.log("isVIP",this.$queue.getData('isVIP'))
+					}
+				});
+			}
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	page {
+		height: 100%;
+		background: #F5F5F5 !important;
+	}
+
+	.bg {
+		background-color: #FFFFFF;
+	}
+
+	.send-msg {
+		color: #000000;
+		height: 30px;
+		font-size: 14px;
+		line-height: 30px;
+	}
+
+	.container {
+		top: 0;
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #FFFFFF !important;
+	}
+	.cu-form-group{
+		background-color: #f7f7f7;
+	}
+	.cu-form-group .title{
+		font-size: 29rpx;
+		color: #333;
+	}
+	.cu-form-group uni-input{
+		font-size: 29rpx;
+		color: #999999;
+	}
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #FFFFFF;
+		padding-bottom: 32upx;
+	}
+
+
+	.input-content {
+		/* margin-top: 300upx; */
+		/* padding-top: 300upx; */
+		padding: 32upx 80upx;
+
+	}
+
+
+	.confirm-btn {
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60upx;
+		margin-top: 32upx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		font-size: 30upx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+</style>
diff --git a/pages/publicThree/pwd.vue b/pages/publicThree/pwd.vue
new file mode 100644
index 0000000..781054b
--- /dev/null
+++ b/pages/publicThree/pwd.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="container">
+		<view class="wrapper">
+			<view class="input-content">
+				<view class="cu-form-group" style="padding: 30rpx 0;border-bottom: 1px #f7f7f7 solid;">
+					<text class="title">旧密码</text>
+					<input type="password" :value="oldPwd" placeholder="请输入旧密码" placeholder-class="input-empty" maxlength="20"
+					 minlength="6" data-key="oldpassword" @input="inputChange" @confirm="toLogin" />
+				</view>
+				
+				<view class="cu-form-group" style="padding: 30rpx 0;">
+					<text class="title">新密码</text>
+					<input type="password" :value="pwd" placeholder="请设置新密码" placeholder-class="input-empty" maxlength="20"
+					 minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
+				</view>
+			</view>
+			
+			<view class="pwd-btn">
+				<button class="confirm-btn" @click="toLogin">修改密码</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: '',
+				phone: '',
+				password: '',
+				oldpassword: '',
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+				logining: false,
+				oldPwd: '',
+				pwd: ''
+			}
+		},
+
+		methods: {
+			sendMsg() {
+				const {
+					phone
+				} = this;
+				if (!phone) {
+					this.$queue.showToast("请输入手机号");
+				} else if (phone.length !== 11) {
+					this.$queue.showToast("请输入正确的手机号");
+				} else {
+					this.$queue.showLoading("正在发送验证码...");
+					this.$Request.getT('/appLogin/sendMsg/' + mobile + '/forget').then(res => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast('验证码发送成功请注意查收');
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '短信发送失败',
+								content: res.msg ? res.msg : '请一分钟后再获取验证码'
+							});
+						}
+					});
+				}
+			},
+			countDown() {
+				const {
+					count
+				} = this;
+				if (count === 1) {
+					this.count = 60;
+					this.sending = false;
+					this.sendTime = '获取验证码'
+				} else {
+					this.count = count - 1;
+					this.sending = true;
+					this.sendTime = count - 1 + '秒后重新获取';
+					setTimeout(this.countDown.bind(this), 1000);
+				}
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			toLogin() {
+				const {
+					password,
+					oldpassword
+				} = this;
+				if (!oldpassword) {
+					this.$queue.showToast("请输入旧密码");
+				} else if (oldpassword.length < 6) {
+					this.$queue.showToast("旧密码位数必须大于六位");
+				} else if (!password) {
+					this.$queue.showToast("请设置新密码");
+				} else if (password.length < 6) {
+					this.$queue.showToast("新密码位数必须大于六位");
+				} else {
+					this.logining = true;
+					this.$queue.showLoading("正在修改密码中...");
+					this.$Request.post("/app/user/updatePwd", {
+						pwd : password,
+						oldPwd : oldpassword,
+					}).then(res => {
+						uni.hideLoading();
+						if (res.code === 0) {
+							this.$queue.showToast('密码修改成功！下次请使用新密码登录！')
+							setTimeout(function(){
+								uni.navigateBack()
+							},1000)
+						} else {
+							uni.showModal({
+								showCancel: false,
+								title: '密码修改失败',
+								content: res.msg,
+							});
+						}
+					});
+				}
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	.pwd-btn{
+		position: fixed;
+		bottom: 0rpx;
+		left: 0;
+		right: 0;
+		background: #FFFFFF;
+		height: 110rpx;
+		line-height: 110rpx;
+		z-index: 999;
+	}
+	page {
+		height: 100%;
+		background: #f7f7f7;
+	}
+
+	.container {
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		padding-bottom: 20px;
+	}
+
+
+	.input-content {
+		padding: 0 30rpx;
+		background-color: #ffffff;
+	}
+
+
+	.confirm-btn {
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		color: #FFFFFF;
+		margin: 16rpx 30upx;
+		position: fixed;
+		bottom: 0upx;
+		width: 90%;
+		border-radius: 50rpx;
+		height: 78rpx;
+		line-height: 78rpx;
+		font-size: 32rpx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+
+
+</style>
diff --git a/pages/publicThree/register.vue b/pages/publicThree/register.vue
new file mode 100644
index 0000000..e708290
--- /dev/null
+++ b/pages/publicThree/register.vue
@@ -0,0 +1,377 @@
+<template>
+	<view class="container">
+		<view class="wrapper">
+			<view class="input-content">
+				<!-- <view class="cu-form-group"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<view class="title text-black">用户名</view>
+					<input :value="userName" placeholder="请输入用户名" data-key="userName" @input="inputChange" />
+				</view> -->
+				<view class="cu-form-group"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<view class="title text-black">手机号</view>
+					<input type="number" :value="phone" placeholder="请输入手机号" maxlength="11" data-key="phone"
+						@input="inputChange" />
+				</view>
+				<view class="cu-form-group padding-right-xs"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">验证码</text>
+					<input type="number" :value="code" placeholder="请输入验证码" maxlength="6" data-key="code"
+						@input="inputChange" @confirm="toLogin" />
+					<button class="send-msg" @click="sendMsg" :disabled="sending">{{ sendTime }}</button>
+				</view>
+
+				<view class="cu-form-group"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">设置密码</text>
+					<input type="password" :value="password" placeholder="请设置密码" placeholder-class="input-empty"
+						maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
+				</view>
+				<view class="cu-form-group"
+					style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">邀请码</text>
+					<input type="" maxlength="6" :value="invitation" placeholder="请填写邀请码(选填)" data-key="invitation"
+						@input="inputChange" @confirm="toLogin" />
+				</view>
+				<view hidden class="cu-form-group" style="border: 2upx solid whitesmoke;margin-bottom: 20px;border-radius: 30px">
+					<text class="title text-black">绑定商家ID</text>
+					<input type="" disabled maxlength="6" :value="bindingConsortiaId" placeholder="绑定商家" data-key="bindingConsortiaId" @input="inputChange" @confirm="toLogin" />
+				</view>
+
+			</view>
+			<button class="confirm-btn" @click="toLogin">立即注册</button>
+			<view class="footer">
+				<text @tap="isShowAgree" class="cuIcon"
+					:class="showAgree ? 'cuIcon-radiobox' : 'cuIcon-round'">同意</text>
+				<!-- 协议地址 -->
+				<navigator url="/my/setting/mimi" open-type="navigate">《隐私政策》</navigator>
+				和
+				<navigator url="/my/setting/xieyi" open-type="navigate">《用户协议》</navigator>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				userName: '',
+				showAgree: false,
+				code: '',
+				phone: '',
+				password: '',
+				required: '否',
+				sending: false,
+				sendTime: '获取验证码',
+				count: 60,
+				relation: "",
+				state: '',
+				invitation: '',
+				platform: '',
+				scanning_channel: '',
+        bindingConsortiaId: '',
+			};
+		},
+		onLoad(e) {
+			this.bindingConsortiaId = this.$queue.getData('bindingConsortiaId') ? this.$queue.getData('bindingConsortiaId') : '';
+			this.invitation = this.$queue.getData('inviterCode') ? this.$queue.getData('inviterCode') : '';
+			// #ifdef APP-PLUS
+			this.platform = 'app'
+			//#endif
+			//#ifdef H5
+			this.platform = 'H5'
+			// #endif 
+			if (e.scanningChannel) {
+				this.scanning_channel = e.scanningChannel;
+				document.querySelector('.uni-page-head-hd').style.display = 'none'
+			}
+		},
+		methods: {
+			showMa() {
+				//查询官方邀请码
+				this.$Request.getT('/app/common/type/4').then(res => {
+					if (res.code == 0) {
+						this.invitationCode = res.data.value;
+
+					}
+				});
+			},
+			// 注册邀请码必填
+			invitationMa() {
+				this.$Request.getT('/app/common/type/3').then(res => {
+					if (res.code == 0) {
+						this.required = res.data.value;
+
+					}
+				});
+			},
+			// 获取新用户优惠券数量
+			newMa() {
+				this.$Request.getT('/app/common/type/119').then(res => {
+					if (res.code == 0) {
+						this.amount = res.data.value;
+					}
+				});
+			},
+			isShowAgree() {
+				//是否选择协议
+				this.showAgree = !this.showAgree;
+			},
+			sendMsg() {
+				const {
+					phone
+				} = this;
+				if (!phone) {
+					this.$queue.showToast('请输入手机号');
+				} else if (phone.length !== 11) {
+					this.$queue.showToast('请输入正确的手机号');
+				} else {
+					this.$queue.showLoading('正在发送验证码...');
+					this.$Request.getT('/app/Login/sendMsg/' + phone + '/gzg').then(res => {
+						if (res.code === 0) {
+							this.sending = true;
+							this.$queue.showToast('验证码发送成功请注意查收');
+							this.countDown();
+							uni.hideLoading();
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '短信发送失败',
+								content: res.msg ? res.msg : '请一分钟后再获取验证码'
+							});
+						}
+					});
+				}
+			},
+			countDown() {
+				const {
+					count
+				} = this;
+				if (count === 1) {
+					this.count = 60;
+					this.sending = false;
+					this.sendTime = '获取验证码';
+				} else {
+					this.count = count - 1;
+					this.sending = true;
+					this.sendTime = count - 1 + '秒后重新获取';
+					setTimeout(this.countDown.bind(this), 1000);
+				}
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+
+			navTo(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			toLogin() {
+				const {
+					scanning_channel,
+					userName,
+					phone,
+					password,
+					code,
+					showAgree,
+					invitation,
+				} = this;
+				// if (!userName) {
+				// 	this.$queue.showToast('请输入用户名');
+				// } else 
+				if (!phone) {
+					this.$queue.showToast('请输入手机号');
+				} else if (!code) {
+					this.$queue.showToast('请输入验证码');
+				} else if (!password) {
+					this.$queue.showToast('请设置密码');
+				} else if (password.length < 6) {
+					this.$queue.showToast('密码位数必须大于六位');
+				} else if (!showAgree) {
+					this.$queue.showToast('请同意《用户协议》和《隐私政策》');
+				} else {
+					
+					
+
+					let postData = {
+						userName: userName,
+						password: password,
+						phone: phone,
+						openId: this.$queue.getData('openid') ? this.$queue.getData('openid') : '',
+						inviterCode: this.invitation,
+            bindingConsortiaId: this.bindingConsortiaId,
+						platform: this.platform,
+						msg: code
+					}
+					
+					console.log(postData);
+
+					if (scanning_channel) {
+						this.$set(postData, 'scanningChannel', scanning_channel);
+					}
+					
+					console.log(postData);
+					
+					this.logining = true;
+					this.$queue.showLoading('注册中...');
+					this.$Request.post(`/app/Login/registerCode`,postData).then(res => {
+						if (res.code === 0) {
+							this.$queue.showToast('注册成功');
+
+							this.$queue.setData("token", res.token);
+							this.$queue.setData('userId', res.user.userId);
+							this.$queue.setData('userName', res.user.userName);
+							this.$queue.setData('phone', res.user.phone);
+							this.$queue.setData('avatar', res.user.avatar ? res.user.avatar :
+								'../../static/logo.png');
+							this.getUserInfo()
+							uni.navigateTo({
+								url: '/pages/my/hehuo'
+							});
+							// setTimeout(function() {
+							// 	uni.switchTab({
+							// 		url: '/pages/index/index'
+							// 	})
+							// }, 1000)
+						} else {
+							uni.hideLoading();
+							uni.showModal({
+								showCancel: false,
+								title: '注册失败',
+								content: res.msg
+							});
+						}
+					});
+				}
+			},
+			//获取用户信息
+			getUserInfo() {
+				this.$Request.get("/app/user/selectUserById").then(res => {
+					if (res.code == 0) {
+						uni.hideLoading()
+						this.$queue.setData('avatar', res.data.avatar ? res.data.avatar : '../../static/logo.png');
+						this.$queue.setData('userId', res.data.userId);
+						this.$queue.setData('userName', res.data.userName);
+						this.$queue.setData('phone', res.data.phone);
+						this.$queue.setData("invitationCode", res.user.invitationCode);
+						this.$queue.setData("inviterCode", res.user.inviterCode);
+
+						this.userName = res.data.userName
+						this.invitationCode = res.data.invitationCode
+						uni.setStorageSync('invitationCode', res.data.invitationCode)
+						uni.navigateTo({
+							url: '/pages/my/hehuo'
+						});
+						// setTimeout(function() {
+						// 	uni.switchTab({
+						// 		url: '/pages/index/index'
+						// 	})
+						// }, 1000)
+					} else {
+						uni.showModal({
+							showCancel: false,
+							title: '登录失败',
+							content: res.msg
+						});
+						this.$queue.logout();
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		background: #FFFFFF !important;
+	}
+	
+
+	.footer {
+		margin-top: 32upx;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.send-msg {
+		color: #019c88;
+		height: 30px;
+		font-size: 29rpx;
+		line-height: 30px;
+	}
+
+	uni-button:after {
+		border: 0 !important;
+	}
+
+	.cuIcon-round:before {
+		margin-right: 10rpx;
+		font-size: 30rpx;
+	}
+
+	.cuIcon-radiobox:before {
+		color: #096f4b;
+		margin-right: 10rpx;
+		font-size: 30rpx;
+	}
+
+	.container {
+		padding-top: 32upx;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		background: #ffffff !important;
+	}
+
+	.cu-form-group {
+		background-color: #f7f7f7;
+	}
+
+	.cu-form-group .title {
+		font-size: 29rpx;
+		color: #333;
+	}
+
+	.cu-form-group uni-input {
+		font-size: 29rpx;
+		color: #999999;
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #ffffff;
+		padding-bottom: 20px;
+	}
+
+
+	.input-content {
+		padding: 32upx 80upx;
+	}
+
+
+	.confirm-btn {
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 60upx;
+		margin-top: 32upx;
+		background: linear-gradient(to right, #019c88, #31c194);
+		color: #fff;
+		font-size: 30upx;
+
+		&:after {
+			border-radius: 60px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/publicTwo/bind.vue b/pages/publicTwo/bind.vue
index 287241f..47b7e21 100644
--- a/pages/publicTwo/bind.vue
+++ b/pages/publicTwo/bind.vue
@@ -35,7 +35,6 @@
 				count: 60,
 			}
 		},
-
 		methods: {
 			inputChange(e) {
 				const key = e.currentTarget.dataset.key;
@@ -120,11 +119,24 @@
 							this.$queue.setData('avatar', res.user.avatar ? res.user.avatar :
 								'../../static/logo.png');
 							this.$queue.showToast('绑定成功');
-							setTimeout(function() {
-								uni.switchTab({
-									url: '/pages/index/index'
-								})
-							}, 1000)
+							let data = {
+								userId: res.user.userId,
+								focusedUserId: '0',
+							}
+							this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {
+								if (res.data) {
+									let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
+									uni.navigateTo({
+										url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
+											'&byUserId=' + res.data.userId
+									})
+								}
+							})
+							// setTimeout(function() {
+							// 	uni.switchTab({
+							// 		url: '/pages/index/index'
+							// 	})
+							// }, 1000)
 						} else {
 							uni.showModal({
 								showCancel: false,
diff --git a/pages/publicTwo/login.vue b/pages/publicTwo/login.vue
index 9deaa45..bd212f0 100644
--- a/pages/publicTwo/login.vue
+++ b/pages/publicTwo/login.vue
@@ -171,9 +171,7 @@
 									let data = {
 										userId: res.user.userId,
 										focusedUserId: '0',
-										// userName:this.order.userName
 									}
-									// app/chat/insertChatConversation
 									this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {
 										if (res.data) {
 											let id = this.ordersId == res.data.userId ? res.data.focusedUserId : this.ordersId
@@ -183,6 +181,7 @@
 											})
 										}
 									})
+									
 									// uni.switchTab({
 									// 	url: '/pages/index/index'
 									// })
@@ -495,7 +494,7 @@
 							} else {
 								uni.hideLoading();
 								uni.navigateTo({
-									url: '/pages/publicTwo/wxmobile'
+									url: '/pages/publicTwo/wxmobile?text='+this.textName
 								});
 							}
 						});
@@ -558,7 +557,7 @@
 						this.$queue.setData('isInvitation', res.data.isInvitation);
 						this.$queue.setData('nickName', res.data.nickName ? res.data.nickName : res.data.phone);
 						let data = {
-							userId: userId,
+							userId: res.user.userId,
 							focusedUserId: '0',
 						}
 						this.$Request.postJson('/app/chat/insertChatConversation', data).then(res => {