合并

.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
-	//BASE_URL: 'https://charging.xiaoxinda.com/making-friends-server/',
-    BASE_URL: 'http://192.168.33.162:8086/making-friends-server/' ,
+	BASE_URL: 'https://charging.xiaoxinda.com/making-friends-server/',
+    //BASE_URL: 'http://192.168.33.162:8086/making-friends-server/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:false,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  

components/mpvue-citypicker/city-data/province.js

@@ -1,10 +1,8 @@
 /* eslint-disable */
-export var cityData =[]
- 
+export var cityData =[] 
 export var areaData =[]
- 
- 
 export var provinceData = []
+export var cityInfoList = []
 
 function appendProvinceData(province){
 	let index = findProvinceDataById(province.id);
@@ -158,9 +156,17 @@ function findAreaData(area){
 	}
 	return index;
 }
+export function getCityData(id){
+	let area = cityInfoList[id-1];
+	let city = cityInfoList[area.parentId-1];
+	let province = cityInfoList[city.parentId-1];
+ 	return province.name +'-'+city.name +'-'+area.name;
+}
 
 export function setCityData(cityList){
-	//console.log('设置城市'+JSON.stringify(cityList))
+//	console.log('设置城市'+JSON.stringify(cityList))
+	cityInfoList = cityList
+	
 	provinceData  = [];
 	cityData = [];
 	areaData = [];

components/mpvue-citypicker/mpvueCityPicker.vue

@@ -24,7 +24,8 @@
 </template>
 
 <script>
-import {provinceData,cityData,areaData} from './city-data/province.js';
+import {provinceData,cityData,areaData,cityInfoList,setCityData} from './city-data/province.js';
+import * as loginApi from '@/apis/login.js'
 //import cityData from './city-data/city.js';
 //import areaData from './city-data/area.js';
 //let provinceData =[];
@@ -46,8 +47,25 @@ export default {
   },
   created() {
 	  _self = this;
+	  if(provinceData.length<=0){
+		  loginApi.getCityList().then(function(data){
+		  	//console.log('获取城市成功'+JSON.stringify(data));
+		  	if(data.result &&  data.data){
+		  		setCityData(data.data);
+		  		//_self.$refs.mpvuebirtydayCityPicker.setCityData(data.data);		
+		  		//console.log('province data '+JSON.stringify(provinceData))
+		  	}
+			_self.init()
+			
+		  },function(err){
+		  	console.log('获取城市列表错误'+JSON.stringify(err))
+		  })		
+	  }else
+	  {
+		this.init()
+		  
+	  }
 	//console.log('mpvueCityPicker created')
-    this.init()
   },
   props: {
 	 
@@ -91,6 +109,16 @@ export default {
 			//console.log('area'+JSON.stringify(this.areaDataList))
 			this.pickerValue = this.pickerValueDefault;
 		},
+		getProvinceDataListLength(){
+			return this.provinceDataList.length;
+		},
+		getCityDataListLength(){
+			return this.cityDataList.length;
+		},
+		getAreaDataListLength(){
+			return this.areaDataList.length;
+		},
+		
     show() {
       setTimeout(() => {
         this.showPicker = true;

pages/index/main-zkx.vue

@@ -51,6 +51,7 @@
 						'X-Requested-With': 'XMLHttpRequest',
 					}
 				}).then((response) => {
+					console.log('findByOpenId')
 					let [error, res] = response;
 				  
 					if (res.data.code == 200&&res.data.result) {			

pages/user/index.vue

@@ -4,22 +4,23 @@
 		<view class="userHead">
 			<view class="userHead-left">
 				<view class="userHead-name">
-					<h2>孙祺芮</h2>
+					<h2>{{personalInfo.realName}}</h2>
 					<view class="userHead-icon">
 						<u-icon custom-prefix="custom-icon" name="shield-user-fill" color="#fff"></u-icon>
-						<span>认证会员</span>
+						<span v-show="personalInfo.status == 1">认证会员</span>
 					</view>
 				</view>
-				<p>查看/编辑个人资料</p>
+						
+				<view @click="viewPersonalInfo"><p>查看/编辑个人资料</p></view>
 			</view>
-			<u-avatar src="/static/img/sexMan.png" size="120"></u-avatar>
+			<u-avatar :src="personalInfo.faceImage" size="120"></u-avatar>
 		</view>
 		<view class="user-data">
-			<view class="user-data-tit">
+			<view class="user-data-tit" @click="improvePersonalInfo">
 				<h2>完善个人资料</h2><u-icon custom-prefix="custom-icon" name="youjiantou" color="#B3B3B3"></u-icon>
 			</view>
 			<p>添加您的个人资料、相亲简历和择偶条件，可以提高相亲成功率哦~</p>
-			<u-line-progress active-color="#2979ff" :percent="70" height="8" :show-percent="false"></u-line-progress>
+			<u-line-progress active-color="#2979ff" :percent="personalInfoProgress" height="8" :show-percent="false"></u-line-progress>
 		</view>
 		<view class="user-cell">
 			<view class="user-cell-item">
@@ -90,14 +91,167 @@
 		data() {
 			return {
 				checked: false,
+				personalInfo:{
+					realName:'',
+					status : 0,
+					faceImage:'/static/img/sexMan.png'
+				},
+				personalInfoProgress:0
 			}
  
 
+		},
+		methods:{
+			viewPersonalInfo(){
+				uni.navigateTo({
+					url:''
+				})
+			},
+			improvePersonalInfo(){
+				uni.navigateTo({
+					url:'../login/step1'
+				})
+			},
+			calcPersonalInfoProgress(){
+				if(this.personalInfo){
+					let personal_info = this.personalInfo;
+					let total_count = 24;
+					let count = 0;
+					if(personal_info)
+					{
+						if(personal_info.birthday && personal_info.birthday.length>0){
+							console.log('已填写birthday')
+							count++;
+						}
+						if(personal_info.height != null){
+							console.log('已填写height')
+							count++;
+						}
+						if(personal_info.weight != null){
+							console.log('已填写weight')
+							count++;
+						}
+						if(personal_info.gender != null){
+							console.log('已填写gender')
+							count++;
+						}
+						
+						////
+						if(personal_info.birthplace && personal_info.birthplace.length>0)
+						{ 
+							console.log('已填写birthplace')
+							count++;
+						}
+						//
+						if(personal_info.registeredResidence  && personal_info.registeredResidence .length>0)
+						{
+							console.log('已填写birthday')
+							count++;
+						}
+						///
+						if(personal_info.workplace && personal_info.workplace.length>0)
+						{ 
+							console.log('已填写workplace')
+							count++;
+						}
+						
+						if(personal_info.education && personal_info.education.length>0)
+						{ 
+							console.log('已填写education')
+							count++;
+						}
+						if(personal_info.workUnit && personal_info.workUnit.length>0)
+						{ 
+							console.log('已填写workUnit')
+							count++;
+						}
+						if(personal_info.post && personal_info.post.length>0)
+						{						 		
+							console.log('已填写post')
+							count++;
+						}
+						if(personal_info.industry && personal_info.industry.length>0)
+						{ 
+							console.log('已填写industry')
+							count++;
+						}
+						if(personal_info.salaryRange && personal_info.salaryRange.length>0)
+						{ 
+							console.log('已填写salaryRange')
+							count++;
+						}
+						if(personal_info.housingSituation && personal_info.housingSituation.length>0)
+						{ 
+							console.log('已填写housingSituation')
+							count++;
+						}
+						if(personal_info.maritalStatus && personal_info.maritalStatus.length>0)
+						{ 
+							console.log('已填写maritalStatus')
+							count++;
+						}
+						if(personal_info.childStatus && personal_info.childStatus.length>0)
+						{ 
+							console.log('已填写childStatus')
+							count++;
+						}
+						if(personal_info.selfEvaluation  && personal_info.selfEvaluation .length>0)
+						{ 
+							console.log('已填写selfEvaluation')
+							count++;
+						}
+						if(personal_info.taAgeRange.length>0)
+						{ 
+							console.log('已填写taAgeRange')
+							count++;
+						}
+						if(personal_info.taEdu && personal_info.taEdu.length>0)
+						{ 				
+							console.log('已填写taEdu')
+							count++;
+						}
+						if(personal_info.taIncomeRange && personal_info.taIncomeRange.length>0)
+						{ 
+							console.log('已填写taIncomeRange')
+							count++;
+						}
+						///
+						if(personal_info.taWorkplace  && personal_info.taWorkplace .length>0)
+						{ 
+							console.log('已填写taWorkplace')
+							count++;
+						}
+						
+						if(personal_info.taOccupation && personal_info.taOccupation.length>0)
+						{ 
+							console.log('已填写taOccupation')
+							count++;
+						}
+						if(personal_info.taOther && personal_info.taOther.length>0){ 
+							console.log('已填写taOther')
+							count++;
+						}
+						if(personal_info.faceImage && personal_info.faceImage.length>0)
+						{
+							console.log('已填写faceImage')
+							count++;
+						}
+						console.log('计数'+JSON.stringify(count))
+						this.personalInfoProgress = count/total_count*100;
+					}
+				} 
+			}
+			
 		},
 		onLoad(){
+			 
+		},
+		onReady(){
 			let personalInfo = this.carhelp.getPersonInfo();
 			console.log('个人信息'+JSON.stringify(personalInfo));
-			
+			this.personalInfo = personalInfo;
+			this.calcPersonalInfoProgress();
+			console.log('xxx')
 		}
 	}
 </script>