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

pages/user/index.vue

@@ -146,6 +146,7 @@
 				if(!_self.logined)
 					return;
 				_self.logined = false;	
+				_self.personalInfo = {};
 				console.log('注销')
 				uni.navigateTo({
 					url:'./logout'
@@ -154,8 +155,14 @@
 			logout(){
 				if(!_self.logined)
 					return;
+				var openId=this.carhelp.getOpenId()
+				console.log('openId1'+openId)
 				this.carhelp.logoff()
+				openId=this.carhelp.getOpenId()
+				console.log('openId2'+openId)
 				_self.logined = false;
+				_self.personalInfo = {};
+				
 				uni.navigateTo({
 					url:'../../pagesA/pages/login/index'
 				})
@@ -380,9 +387,15 @@
 		}, 
 		onLoad(){
 			 _self = this;
+			
+		},
+		onShow(){
+			console.log('mylogined onShow');
 			 this.findByOpenId();
 		},
 		onReady(){
+			 console.log('mylogined onReady')
+			
 			/*
 			let personalInfo = this.carhelp.getPersonInfo();
 			console.log('个人信息'+JSON.stringify(personalInfo));

pagesB/components/mpvue-citypicker/mpvueCityPicker.vue

@@ -36,7 +36,7 @@ export default {
 	 
   data() {
     return {
-      pickerValue: [0, 0, 0],
+      pickerValue: [16,6,0],
       provinceDataList: [],
       cityDataList: [],
       areaDataList: [],
@@ -98,7 +98,7 @@ export default {
 			//console.log('区'+JSON.stringify(areaData));
 			//console.log('mpvueCityPicker init')
 			if(this.pickerValueDefault.length == 0)
-				this.pickerValueDefault  = [0,0,0];
+				this.pickerValueDefault  = [16,6,0];
 			this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
 			this.provinceDataList = provinceData;
 			//console.log('provinces'+JSON.stringify(this.provinceDataList))
@@ -141,8 +141,8 @@ export default {
     handPickValueDefault() {
 	
       //console.log('mpvueCityPicker handPickValueDefault')
-	  //console.log('默认树'+JSON.stringify(this.pickerValueDefault))
-	  //console.log('省'+JSON.stringify(this.pickerValueDefault))
+	  console.log('默认树'+JSON.stringify(this.pickerValueDefault))
+	  console.log('省'+JSON.stringify(this.pickerValue))
 	  
       if (this.pickerValueDefault !== [0, 0, 0]) {
         if (this.pickerValueDefault[0] > provinceData.length - 1) {

pagesB/pages/login/step2.vue

@@ -83,9 +83,9 @@
 			</view>
 		</view>
 		<!-- :pickerValueDefault="cityPickerValueDefault"-->
-		<mpvue-city-picker themeColor="#007AFF" ref="mpvuebirtydayCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onBirthdayCityConfirm"></mpvue-city-picker>		
-		<mpvue-city-picker themeColor="#007AFF" ref="mpvueRegisteredResidenceCityPicker" :pickerValueDefault="cityPickerValueDefault"  @onConfirm="onResidenceRegisteredCityConfirm"></mpvue-city-picker>		
-		<mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker"  :pickerValueDefault="cityPickerValueDefault" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvuebirtydayCityPicker" :pickerValueDefault="cityPickerValueDefault1" @onConfirm="onBirthdayCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvueRegisteredResidenceCityPicker" :pickerValueDefault="cityPickerValueDefault2"  @onConfirm="onResidenceRegisteredCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker"  :pickerValueDefault="cityPickerValueDefault3" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>		
 	</view>
 </template>
 
@@ -101,7 +101,9 @@
 		data() {
 			return {
 				 
-				cityPickerValueDefault:[16,6,0],
+				cityPickerValueDefault1:[16,6,0],
+				cityPickerValueDefault2:[16,6,0],
+				cityPickerValueDefault3:[16,6,0],
 				personal_info:{},
 				form: { 
 					address:'',
@@ -672,7 +674,12 @@
 			},
 			onBirthdayCityConfirm(e) {
 				_self.form.address = e.label;
-				_self.form.addressId = e.cityCode.toString();
+				_self.form.addressId = e.cityCode.toString();
+				_self.form.registered_residence = e.label;
+				_self.form.registered_residenceId = e.cityCode.toString();
+				
+				_self.form.work_address = e.label;
+				_self.form.work_addressId = e.cityCode.toString();
 				console.log('地址选择'+JSON.stringify(_self.form.addressId))
 			},
 			onResidenceRegisteredCityConfirm(e) {
@@ -682,16 +689,20 @@
 			},
 			onWorkCityConfirm(e) {
 				_self.form.work_address = e.label;
-				_self.form.work_addressId = e.cityCode.toString();
+				_self.form.work_addressId = e.cityCode.toString();
+				
 				console.log('地址选择'+JSON.stringify(_self.form.work_addressId))
 			},
-			birthdayAddressChange(){
+			birthdayAddressChange(){
+				console.log('pos1'+JSON.stringify(this.cityPickerValueDefault1));
 				this.$refs.mpvuebirtydayCityPicker.show()
 			},
 			registeredResidenceAddressChange(){
+				console.log('pos2'+JSON.stringify(this.cityPickerValueDefault1));
 				this.$refs.mpvueRegisteredResidenceCityPicker.show()
 			},
 			workAddressChange(){
+				console.log('pos3'+JSON.stringify(this.cityPickerValueDefault1));
 				this.$refs.mpvueWorkCityPicker.show()
 			}
 		}