diff --git a/frontend/app-user/api/login.js b/frontend/app-user/api/login.js
index f4a1d3f..f272be0 100644
--- a/frontend/app-user/api/login.js
+++ b/frontend/app-user/api/login.js
@@ -83,7 +83,7 @@ export function getUserInfo(params) {
 	})
 }
 
-
+// 微信获取openid
 export function getWechatOpenId(code) {
 	return request({
 		'url': '/sso/weixinPublic?code=' + code,
@@ -91,7 +91,13 @@ export function getWechatOpenId(code) {
 	})
 }
 
-
+// 绑定openid
+export function bindOpenId(params) {
+	return request({
+		'url': `/api/user/v1/user/bindOpenId?account=${params.account}&openid=${params.openId}`,
+		'method': 'get'
+	})
+}
 
 
 // 获取短信验证码
@@ -149,5 +155,6 @@ export default {
 	getPublicKey,
 	changUserPsd,
 	forgotPassword,
-	getWechatOpenId
+	getWechatOpenId,
+	bindOpenId
 }
diff --git a/frontend/app-user/common/config.js b/frontend/app-user/common/config.js
index 479d058..7d45ead 100644
--- a/frontend/app-user/common/config.js
+++ b/frontend/app-user/common/config.js
@@ -1,13 +1,14 @@
 module.exports = {
-	baseUrl: 'http://192.168.0.48:60011/api', //lst本地
-	// baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
+	// baseUrl: 'http://192.168.0.48:60011/api', //lst本地
 	// baseUrl: 'http://123.60.140.65:60011/api',// 会员端ip
+	baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
 	gaodeMapKey: "ec36eed040d5dad959e19711b83905d6", //高德逆地址解析key
 	// 超时
 	timeout: 30000,
 	// 禁用 Cookie 等信息
 	withCredentials: false,
 	isOpenTokenExpiration: false, //token过期弹窗
+	appid:'wxb619394476ca1888',
 	header: {
 		//租户ID
 		'tenant-id': 1
diff --git a/frontend/app-user/pages/jump/weChatOffAcc.vue b/frontend/app-user/pages/jump/weChatOffAcc.vue
index 7be45c3..0bb7191 100644
--- a/frontend/app-user/pages/jump/weChatOffAcc.vue
+++ b/frontend/app-user/pages/jump/weChatOffAcc.vue
@@ -1,125 +1,168 @@
 <template>
-  <view class="container">
-    <div>微信公众号-授权认证中</div>
-  </view>
+	<view class="container">
+		<div>微信公众号-授权认证中</div>
+	</view>
 </template>
 
 <script>
-
-const {Base64} = require('js-base64');
-export default {
-  data() {
-    return {
-      currentModeIndex: 2, //1账号密码 2验证码 3忘记密码
-      inputType: 'password',
-      codeDisabled: false,
-      codeTips: '',
-      formData: {
-        mobile: '',
-        password: '',
-      },
-      flag: true,
-      rules: {
-        mobile: [{
-          type: 'string',
-          required: true,
-          message: '请输入手机号',
-          trigger: ['blur', 'change']
-        },
-          // {
-          //   // 自定义验证函数，见上说明
-          //   validator: (rule, value, callback) => {
-          //     // 上面有说，返回true表示校验通过，返回false表示不通过
-          //     // uni.$u.test.mobile()就是返回true或者false的
-          //     return uni.$u.test.mobile(value)
-          //   },
-          //   message: '手机号码不正确',
-          //   // 触发器可以同时用blur和change
-          //   trigger: ['change', 'blur']
-          // }
-        ],
-        password: {
-          type: 'string',
-          min: 4,
-          max: 16,
-          required: true,
-          message: '密码长度4-16位密码',
-          trigger: ['blur', 'change']
-        },
-        code: {
-          type: 'integer',
-          len: 4,
-          required: true,
-          message: '请填写4位验证码',
-          trigger: ['blur', 'change']
-        }
-      },
-      isAutoLogin: [], //是否自动登录
-      hasForgot: false, //忘记密码
-      loginText: "短信登录",
-      btnText: "发送验证码",
-      checkValue: ['agree'],
-      accountTile: "短信验证码登录",
-      accountTip: "未注册手机号登录后自动生成账号",
-      accountPlaceholder: "请输入手机号",
-      appid: this.$config.appid,
-      openId: null
-    }
-  },
-  created() {
-    this.handleAuthorization();
-  },
-  methods: {
-    handleAuthorization() {
-      console.log("================================");
-      this.code = "";
-      let local = window.location.href;
-      console.log("local", local);
-      console.log("this.code", this.code);
-      let scope = "snsapi_base"; //静默授权 用户无感知
-      console.log("this.scope", scope);
-      this.code = this.getUrlCode().code;
-      console.log("this.code", this.code);
-
-      this.getOpenId(this.code);
-      console.log("================================");
-    },
-    getOpenId(code) {
-      let that = this;
-      this.$api.loginApi.getWechatOpenId(code).then(res => {
-        console.log("11111that.res ", res);
-        if (res.status == 1000) {
-          that.openId = res.data.openId;
-          console.log("that.openId ", that.openId);
-        } else {
-          Toast(res.message);
-        }
-      });
-
-    },
-    getUrlCode() {
-      let fullUrl = window.location.href;
-      console.log("fullUrl ", fullUrl);
-      let theRequest = new Object();
-      if (fullUrl.indexOf("?") != -1) {
-        var temp = fullUrl.split("?");
-        let str = temp[1];
-        let strs = str.split("&");
-        for (var i = 0; i < strs.length; i++) {
-          theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
-        }
-      }
-      return theRequest;
-    },
-  }
-};
+	const {
+		Base64
+	} = require('js-base64');
+	export default {
+		data() {
+			return {
+				currentModeIndex: 2, //1账号密码 2验证码 3忘记密码
+				inputType: 'password',
+				codeDisabled: false,
+				codeTips: '',
+				formData: {
+					mobile: '',
+					password: '',
+				},
+				flag: true,
+				rules: {
+					mobile: [{
+							type: 'string',
+							required: true,
+							message: '请输入手机号',
+							trigger: ['blur', 'change']
+						},
+						// {
+						//   // 自定义验证函数，见上说明
+						//   validator: (rule, value, callback) => {
+						//     // 上面有说，返回true表示校验通过，返回false表示不通过
+						//     // uni.$u.test.mobile()就是返回true或者false的
+						//     return uni.$u.test.mobile(value)
+						//   },
+						//   message: '手机号码不正确',
+						//   // 触发器可以同时用blur和change
+						//   trigger: ['change', 'blur']
+						// }
+					],
+					password: {
+						type: 'string',
+						min: 4,
+						max: 16,
+						required: true,
+						message: '密码长度4-16位密码',
+						trigger: ['blur', 'change']
+					},
+					code: {
+						type: 'integer',
+						len: 4,
+						required: true,
+						message: '请填写4位验证码',
+						trigger: ['blur', 'change']
+					}
+				},
+				isAutoLogin: [], //是否自动登录
+				hasForgot: false, //忘记密码
+				loginText: "短信登录",
+				btnText: "发送验证码",
+				checkValue: ['agree'],
+				accountTile: "短信验证码登录",
+				accountTip: "未注册手机号登录后自动生成账号",
+				accountPlaceholder: "请输入手机号",
+				appid: this.$config.appid,
+				openId: null
+			}
+		},
+		created() {
+			this.handleAuthorization();
+		},
+		methods: {
+			handleAuthorization() {
+				console.log("================================");
+				this.code = "";
+				console.log("window.location.href", window.location.href);
+				let local = window.location.href;
+				console.log("local", local);
+				let scope = "snsapi_base"; //静默授权 用户无感知
+				console.log("this.scope", scope);
+				this.code = this.getParameters('code');
+				console.log("this.code", this.code);
+				let jumpToUri =
+					`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${this.$config.appid}&redirect_uri=${encodeURIComponent(local)}&response_type=code&scope=${scope}&state=hotent#wechat_redirect`
+				console.log("jumpToUri", jumpToUri);
+				// var redirect_uri = decodeURIComponent(this.getParameters("redirect"));
+				// console.log("redirect_uri", redirect_uri);
+				// if (redirect_uri) {} else {
+				// }
+				if (this.code == null || this.code === "") {
+					window.location.href = jumpToUri;
+				} else {
+					this.getOpenId(this.code);
+				}
+				console.log("this.code", this.code);
+				// this.getOpenId(this.code);
+				console.log("================================");
+			},
+			getOpenId(code) {
+				let that = this;
+				this.$api.loginApi.getWechatOpenId(code).then(res => {
+					console.log("res", res);
+					if (res.openid) {
+						that.openId = res.openid;
+						//首次登录未绑定账号去登录页登录后触发绑定
+						console.log("获取openId", that.openId);
+						uni.setStorageSync('openId', this.openId)
+						uni.navigateTo({
+							url:'/pages/login'
+						})
+					} else {
+						//已经绑定直接缓存token 跳转到主页
+						this.$store.dispatch('wxAuthLogin', res).then(e => {
+							uni.switchTab({
+								url: '/pages/home/home'
+							});
+						}).catch(err => {
+							uni.$u.toast(err)
+						})
+					}
+				});
+			},
+			getUrlCode() {
+				let fullUrl = window.location.href;
+				console.log("fullUrl ", fullUrl);
+				let theRequest = new Object();
+				if (fullUrl.indexOf("?") != -1) {
+					var temp = fullUrl.split("?");
+					let str = temp[1];
+					let strs = str.split("&");
+					for (var i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
+					}
+				}
+				return theRequest;
+			},
+			//获取url中的参数
+			getParameters(name) {
+				var locUrl = decodeURI(window.location.search.substr(1))
+				var aryParams = locUrl.split('&')
+				var rtn = ''
+				for (var i = 0; i < aryParams.length; i++) {
+					var pair = aryParams[i]
+					var aryEnt = pair.split('=')
+					var key = aryEnt[0]
+					var val = aryEnt[1]
+					if (key != name) continue
+					if (rtn == '') {
+						rtn = val
+					} else {
+						rtn += ',' + val
+					}
+				}
+				return rtn
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100vh;
-}
-</style>
+	.container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100vh;
+	}
+</style>
\ No newline at end of file
diff --git a/frontend/app-user/pages/login.vue b/frontend/app-user/pages/login.vue
index 7922a23..dcf4e09 100644
--- a/frontend/app-user/pages/login.vue
+++ b/frontend/app-user/pages/login.vue
@@ -191,64 +191,56 @@
 				}, 1000)
 			}
 			// #endif
-			console.log(this.appid);
-			// 微信公众号自动登录（暂不做）
-			// let isWechatBrowser = this.isWechatBrowser();
-			// if (isWechatBrowser) {
-			// 	// console.log("微信浏览器环境", process);
-			// 	let openId = uni.getStorageSync("openId");
-			// 	var that = this;
-			// 	if (!openId) {
-			// 		this.getWxCode();
-			// 	} else {
-			// 		this.openId = openId;
-			// 	}
-			// }
+			console.log("appid", this.appid);
+			let isWechatBrowser = this.isWechatBrowser();
+			this.openId = uni.getStorageSync("openId");
+			console.log("openId", this.openId);
+			if (isWechatBrowser) {
+				if (!this.openId) {
+					uni.reLaunch({
+						url: '/pages/jump/weChatOffAcc'
+					})
+				}
+			}
 		},
 		onReady() {
 			// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
 			this.$refs.form.setRules(this.rules)
 		},
 		methods: {
-			//获取code
-			getWxCode() {
-				this.code = "";
-				let local = window.location.href;
-				console.log(local);
-				console.log(this.code);
-				let scope = "snsapi_base"; //静默授权 用户无感知
-				this.code = this.getUrlCode().code;
-				if (this.code == null || this.code === "") {
-					console.log(123);
-					window.location.href =
-						`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${this.appid}&redirect_uri=${encodeURIComponent(local)}&response_type=code&scope=${scope}#wechat_redirect`;
-				} else {
-					this.getOpenId(this.code);
+			//是否有openid
+			hasOpenId() {
+				this.openId = uni.getStorageSync('openId');
+				console.log("有openid", this.openId);
+				if (this.openId) {
+					this.bindWxOffAcc(this.openId)
+					// 默认静默绑定 
+					// this.$modal.confirm('是否绑定公众号，以便下次免登录', '温馨提示', )
+					// 	.then(() => {
+					// 		this.bindWxOffAcc(this.openId)
+					// 	})
+					// 	.catch(() => {
+					// 		console.log("不绑定");
+					// 		uni.removeStorageSync('openId');
+					// 		uni.switchTab({
+					// 			url: '/pages/home/home'
+					// 		});
+					// 	})
 				}
 			},
-			getUrlCode() {
-				let fullUrl = window.location.href;
-				let theRequest = new Object();
-				if (fullUrl.indexOf("?") != -1) {
-					var temp = fullUrl.split("?");
-					let str = temp[1];
-					let strs = str.split("&");
-					for (var i = 0; i < strs.length; i++) {
-						theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
-					}
-				}
-				return theRequest;
-			},
-			getOpenId(code) {
-				let that = this;
-				this.$api.loginApi.getWechatOpenId(code).then(res => {
-					if (res.status == 1000) {
-						that.openId = res.data.openId;
-						uni.setStorageSync("openId", that.openId);
-					} else {
-						Toast(res.message);
+			bindWxOffAcc(openId) {
+				this.$api.loginApi.bindOpenId({
+					account: this.formData.mobile,
+					openId
+				}).then((res) => {
+					if (res.state) {
+						// 绑定成功
+						uni.removeStorageSync('openId');
+						uni.switchTab({
+							url: '/pages/home/home'
+						});
 					}
-				});
+				})
 			},
 			isWechatBrowser() {
 				return /MicroMessenger/i.test(navigator.userAgent);
@@ -413,15 +405,21 @@
 				this.$store.dispatch('Login', data).then(res => {
 					this.$modal.closeLoading();
 					setTimeout(() => {
-						uni.$u.toast('登录成功');
+						// uni.$u.toast('登录成功');
 						uni.setStorageSync('myAvatorImg', '');
-						uni.switchTab({
-							url: '/pages/home/home'
-						});
-
+						// 只在微信浏览器环境生效并去绑定openid
+						if (this.isWechatBrowser()) {
+							this.hasOpenId();
+						}else{
+							// 非微信环境登录直接进入主页
+							uni.switchTab({
+								url: '/pages/home/home'
+							});
+						}
 					}, 300)
 				}).catch(err => {
-					// uni.$u.toast(err)
+					console.log("err", err);
+					uni.$u.toast(err.msg)
 				})
 			}
 		}
diff --git a/frontend/app-user/store/modules/user.js b/frontend/app-user/store/modules/user.js
index 2f77659..eaee65f 100644
--- a/frontend/app-user/store/modules/user.js
+++ b/frontend/app-user/store/modules/user.js
@@ -160,6 +160,20 @@ const user = {
 				})
 			})
 		},
+		wxAuthLogin({
+			commit
+		}, userInfo) {
+			return new Promise((resolve, reject) => {
+				console.log("微信userInfo",userInfo);
+				if(userInfo.token){
+					setToken(userInfo.token);
+					commit('SET_TOKEN', userInfo.token)
+					resolve()
+				}else{
+					reject('No Token')
+				}
+			})
+		},
 		SetAdsName({
 			commit
 		}, data) {
--
libgit2 0.21.2