Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy

pages/user/index.vue

@@ -1,7 +1,10 @@
 <template>
 	<view>
-		<u-navbar :is-back="false" :border-bottom="false"><view class="navbar-tit">我的</view></u-navbar>
-		<view class="userHead">
+		<u-navbar :is-back="false" :border-bottom="false">
+ 			<view v-if='logined' class="navbar-tit">我的</view>
+ 			<view v-else class="navbar-tit">个人中心</view>
+		</u-navbar>			
+		<view v-if='logined' class="userHead">
 			<view class="userHead-left">
 				<view class="userHead-name">
 					<h2>{{personalInfo.realName}}</h2>
@@ -17,6 +20,19 @@
 			</view>
 			<u-avatar :src="personalInfo.faceImage" size="120"></u-avatar>
 		</view>
+		<view v-else class="userHead">
+			<view class="userHead-left">
+				<view class="userHead-name">
+					<h2>注册/登录</h2>
+					<!-- <h2>注册/登录</h2> -->
+ 				</view>
+						
+				<view @click="login"><p>登录后即可体验更多服务</p></view>
+				<!-- <view><p>登录后即可体验更多服务</p></view> -->
+			</view>
+			<u-avatar :src="personalInfo.faceImage" size="120"></u-avatar>
+		</view>
+		
 		<view class="user-data">
 			<view class="user-data-tit" @click="improvePersonalInfo">
 				<h2>完善个人资料</h2><u-icon custom-prefix="custom-icon" name="youjiantou" color="#B3B3B3"></u-icon>
@@ -31,7 +47,8 @@
 					<h4>公开我的资料</h4>
 				</view>
 				<view class="user-cell-r">
-					<u-switch v-model="personalInfo.publicNot"></u-switch>
+					<u-switch v-if='logined' v-model="personalInfo.publicNot"></u-switch>
+					<u-switch v-else  ></u-switch>
 				</view>
 			</view>
 			<view class="user-cell-item" @click="changePhone">
@@ -40,8 +57,8 @@
 					<h4>更换手机号</h4>
 				</view>
 				<view class="user-cell-r">
-					<span>{{phone}}</span>
-					<u-icon custom-prefix="custom-icon" name="youjiantou" color="#B3B3B3"></u-icon>
+					<span v-if='logined'>{{phone}}</span>
+ 					<u-icon custom-prefix="custom-icon" name="youjiantou" color="#B3B3B3"></u-icon>
 				</view>
 			</view>
 			<view class="user-cell-item">
@@ -89,6 +106,7 @@
 </template>
 
 <script>
+	let _self;
 	export default {
 		data() {
 			return {
@@ -100,13 +118,16 @@
 					status : 0,
 					faceImage:'/static/img/sexMan.png'
 				},
-				personalInfoProgress:0
+				personalInfoProgress:0,
+				logined:false
 			}
  
 
 		},
 		methods:{
 			changePhone(){
+				if(!_self.logined)
+					return;
 				uni.navigateTo({
 					url:'../../pagesA/pages/login/change'
 				})
@@ -116,13 +137,22 @@
 					url:'../../pagesA/pages/login/agreement'
 				})
 			},
+			login(){
+				uni.navigateTo({
+					url:'../../pagesA/pages/login/index'
+				})
+			},
 			logoff(){
+				if(!_self.logined)
+					return;
 				console.log('注销')
 				uni.navigateTo({
 					url:'./logout'
 				})
 			},
 			logout(){
+				if(!_self.logined)
+					return;
 				this.carhelp.signOut()
 				uni.navigateTo({
 					url:'../../pagesA/pages/login/index'
@@ -134,11 +164,64 @@
 				})
 			},
 			improvePersonalInfo(){
+				if(!_self.logined)
+					return;
 				console.log('完善个人资料')
 				uni.navigateTo({
 					url: '../../pagesB/pages/login/step1'
 				})
 			},
+			findByOpenId(){
+				var openId=this.carhelp.getOpenId()
+				if(openId==""){
+					console.log("------------------")
+					setTimeout(()=>{
+						this.findByOpenId()
+					},1000)
+					return
+				}
+				uni.request({
+					method:'get',
+					url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
+					data: {
+						openId:openId,			
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						'X-Requested-With': 'XMLHttpRequest',
+					}
+				}).then((response) => {
+					console.log('findByOpenId')
+					let [error, res] = response;
+					console.log('res'+JSON.stringify(res))
+					if (res.data.code == 200 && res.data.result) {									 
+						var token = res ? res.data.data.token : '';			
+						
+						this.carhelp.setPersonInfo(res.data.data.memberInfo );
+						this.carhelp.setToken(token);
+						this.carhelp.setPersonInfoPlus(res.data.data);
+						_self.logined = true; 
+						_self.preparedPersonalData();
+					}else{
+						_self.logined = false;
+					}
+				}).catch(error => {
+					 
+				})
+			},
+			preparedPersonalData(){
+				let personalInfo = this.carhelp.getPersonInfo();
+				console.log('个人信息'+JSON.stringify(personalInfo));
+				this.personalInfo = personalInfo;
+				if(this.personalInfo.phone != null)
+				{
+					let phone = this.personalInfo.phone;
+					let prefix = phone.substr(0,3)
+					let suffix = phone.substr(phone.length-4,4)
+					this.phone = prefix +'****'+suffix;
+				}
+				this.calcPersonalInfoProgress();
+			},
 			calcPersonalInfoProgress(){
 				if(this.personalInfo){
 					let personal_info = this.personalInfo;
@@ -294,11 +377,13 @@
 			
 		}, 
 		onLoad(){
-			 
+			 _self = this;
+			 this.findByOpenId();
 		},
 		onReady(){
+			/*
 			let personalInfo = this.carhelp.getPersonInfo();
-			//console.log('个人信息'+JSON.stringify(personalInfo));
+			console.log('个人信息'+JSON.stringify(personalInfo));
 			this.personalInfo = personalInfo;
 			if(this.personalInfo.phone != null)
 			{
@@ -307,7 +392,7 @@
 				let suffix = phone.substr(phone.length-4,4)
 				this.phone = prefix +'****'+suffix;
 			}
-			this.calcPersonalInfoProgress();
+			this.calcPersonalInfoProgress();*/
 //			console.log('xxx')
 		}
 	}