提交

api/modules/base.js

@@ -7,6 +7,10 @@ export default {
 	login(param) {
 		return req.post("index/login", param)
 	},
+	//小程序登录
+	mpproLogin(param){
+	    return 	req.post("index/login", param)
+	},
 	appLogin(param) {
 		return req.post("index/appLogin", param)
 	},

manifest.json

@@ -3,8 +3,8 @@
     "appid" : "__UNI__3303922",
     // "appid" : "__UNI__AE4A250",
     "description" : "希希到家",
-    "versionName" : "10.0.2",
-    "versionCode" : 1002,
+    "versionName" : "11.0.0",
+    "versionCode" : 1100,
     "transformPx" : false,
     "uniStatistics" : {
         "enable" : false //全局关闭  
@@ -217,9 +217,9 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为您编辑头像信息",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为您编辑头像信息",
                     "NSCameraUsageDescription" : "该应用需要你的相机，以便您拍摄上传头像信息",
-                    "NSLocationWhenInUseUsageDescription" : "需要同意获取您的位置信息才能展示附近信息",
-                    "NSLocationAlwaysUsageDescription" : "需要同意获取您的位置信息才能展示附近信息",
-                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "需要同意获取您的位置信息才能展示附近信息"
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要同意获取您的位置信息才能展示附近商家信息",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要同意获取您的位置信息才能展示附近商家信息",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要同意获取您的位置信息才能展示附近商家信息"
                 }
             },
             "splashscreen" : {

pages/login.vue

@@ -58,9 +58,9 @@
 				</text>
 			</view>
 		</view>
-		<u-button text="登录" :disabled="!phone||!code" @click="smsLogin" class="loginBtn"></u-button>
+		<button :disabled="!phone||!code" @click="smsLogin()" class="loginBtn">登录</button>
 		<!-- <view >登录</view> -->
-		 <!-- #ifndef H5 -->
+		 <!-- #ifdef APP-PLUS -->
 		<view class="otherLogin">
 			<view class="line"></view>
 			<view class="otext">其他登录</view>
@@ -97,6 +97,16 @@
 		</uni-popup>
 		<!-- #endif -->
 		
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="otherLogin">
+			<view class="line"></view>
+			<view class="otext">其他登录</view>
+			<view class="line"></view>
+		</view>
+		
+		<image src="@/static/wlogin.png" class="wlogin" @tap="miniProLogin" mode="widthFix"></image>
+		<!-- #endif -->
+
 	</view>
 </template>
 
@@ -124,12 +134,12 @@
 		async onLoad(option) {
 			// console.log('pages/login',"888")
 			// #ifdef H5
-			// var searchURL = window.location.search;
-			// searchURL = searchURL.substring(1, searchURL.length);
-			// var targetPageId = searchURL.split("&")[0].split("=")[1].split("?")[0];
-			// console.log(option,targetPageId.substring(-1,1))
-			// this.pid=targetPageId?targetPageId.substring(-1,1):''
-			// this.pid = targetPageId
+			var searchURL = window.location.search;
+			searchURL = searchURL.substring(1, searchURL.length);
+			var targetPageId = searchURL.split("&")[0].split("=")[1].split("?")[0];
+			console.log(option,targetPageId.substring(-1,1))
+			this.pid=targetPageId?targetPageId.substring(-1,1):''
+			this.pid = targetPageId
 			// #endif
 			let {
 				autograph = '',
@@ -138,7 +148,6 @@
 			console.log('autograph,appLogin', autograph, appLogin)
 			if (autograph && appLogin) {
 				if(appLogin.unionId){
-					console.log("999")
 					this.toLogin(appLogin)
 					return
 				}else{
@@ -229,9 +238,42 @@
 					});
 				}
 
+			},
+			//小程序微信登陆
+			miniProLogin(){
+				if(this.checked.length==0){
+					uni.$u.toast('请阅读并同意《隐私政策》');
+					 return false;
+				}
+				uni.getUserProfile({
+					desc: '用于您的页面展示用户头像与昵称',
+					lang: 'zh_CN',
+					success: (res) => {
+					    console.log(res,"jjj");
+						uni.login({
+							provider: 'weixin',
+							success:async(res) => {
+								console.log(res,"====");
+								let userLoginInfo = await this.$api.base.mpproLogin({
+									code: res.code
+								})
+								console.log(userLoginInfo)
+								this.$util.goUrl({
+									url: `/pages/service`,
+									openType: `reLaunch`
+								})
+							}
+						});
+						
+					},
+					fail: err => {
+						console.log(err.errMsg);
+					}
+				});
+				
 			},
 			async smsLogin(item){
-				console.log("短信登陆")
+				console.log("短信登陆",item)
 				if(this.checked.length==0){
 					uni.$u.toast('请阅读并同意《隐私政策》');
 					 return false;
@@ -251,6 +293,8 @@
 					title: "登录中..."
 				})
 				try {
+					console.log("111")
+					
 					// let user_info = await this.$api.base.appLogin({
 					// 	data: userInfo
 					// })
@@ -291,8 +335,13 @@
 						openType: `reLaunch`
 					})
 					// #endif
+					this.$util.goUrl({
+						url: phone ? `/pages/service` : `/user/pages/phone`,
+						openType: `reLaunch`
+					})
 					
 				} catch (e) {
+					console.log(e)
 					this.$util.hideAll()
 				}
 			},
@@ -393,7 +442,19 @@
 	page {
 		background: #fff;
 	}
-
+	.loginBtn{
+		// padding:30upx 0;
+		text-align: center;
+		background: #08BF77 !important;
+		border-radius: 10upx;
+		margin:50upx 54upx;
+		font-size: 34upx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		height: auto;
+		width: auto;
+	}
 	.pages-user-login {
 		height: calc(100vh);
 		.navbarText{
@@ -438,19 +499,7 @@
 				color: #08BF77;
 			}
 		}
-		.loginBtn{
-		    padding:30upx 0;
-			text-align: center;
-			background: #08BF77;
-			border-radius: 10upx;
-			margin:50upx 54upx;
-			font-size: 34upx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #FFFFFF;
-			height: auto;
-			width: auto;
-		}
+		
 		.otherLogin{
 			display: flex;
 			align-items: center;

pages/mine.vue

@@ -584,7 +584,7 @@
 					coach_status,
 					fx_status
 				} = this.mineInfo
-				
+				console.log(this.mineInfo,"===")
 				let val = this.$util.deepCopy(this.mineInfo)
 				val.is_fx = !fx_check || (fx_check && fx_status == 2)
 				this.updateUserItem({
@@ -674,11 +674,12 @@
 					console.log(err)
 				})
 				console.log(this.coach_info.user_id,location.address)
-				let address = await this.$api.service.getSeviceInfo({
-					c_id:this.coach_info.user_id
-				})
-				console.log(address,"mmmm")
-				this.coach_info.address = address.location;
+				// let address = await this.$api.service.getSeviceInfo({
+				// 	c_id:this.coach_info.user_id
+				// })
+				// console.log(address,"mmmm")
+				// this.coach_info.address = address.location;
+				this.coach_info.address = location.address
 			},
 			
 			// 更新用户信息

pages/service.vue

@@ -207,7 +207,8 @@
 					// {img:'../static/i.png',new:0,people:1},
 					// {img:'../static/i.png',new:0,people:0},
 					// {img:'../static/i.png',new:0,people:0},
-				]
+				],
+				banner:[]
 			}
 		},
 		computed: mapState({