修复登陆

pages/login/login.vue

@@ -337,15 +337,6 @@
 			// 一键登录
 			getinfo: async function(e) {
 				let that = this;
-<<<<<<< HEAD
-			 
-=======
-				uni.login({
-					success: (res) => {
-						console.log(res.code)
-					}
-				});
->>>>>>> 0530f742dc58ae69583346d2f2827decb87d8d2d
 				let meToken = user.loginByWeixin(e.detail.userInfo).then(res => {
 					console.log('返回的res',res)
 					if (res.status == 0) {