浏览代码

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

zhengkaixin 3 年之前
父节点
当前提交
efc92f42f1

+ 2 - 2
.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
-	
-    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:true,// 无视权限控制跳转页面   , 用于样式人员快速访问各种功能 ,快速测试等
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",//测试用openId  

+ 1 - 0
apis/login.js

@@ -5,6 +5,7 @@ import requestSon from '../utils/requestSon.js';
 
 export function getBaseDictionary(data ){
 	var url = '/mobile/member/baseDictionary'; 
+	
 	return requestSon({
 		method: 'post', 
 		header:{'Content-Type': 'application/json',

+ 3 - 3
components/mpvue-citypicker/mpvueCityPicker.vue

@@ -39,7 +39,7 @@ export default {
     };
   },
   created() {
-	console.log('mpvueCityPicker created')
+	//console.log('mpvueCityPicker created')
     this.init()
   },
   props: {
@@ -60,7 +60,7 @@ export default {
 	},
   methods: {
 		init() {
-			console.log('mpvueCityPicker init')
+			//console.log('mpvueCityPicker init')
 			if(this.pickerValueDefault.length == 0)
 				this.pickerValueDefault  = [0,0,0];
 			this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
@@ -95,7 +95,7 @@ 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))
 	  	  
       if (this.pickerValueDefault !== [0, 0, 0]) {

+ 2 - 2
components/mpvue-datepicker/mpvue-datepicker.vue

@@ -82,7 +82,7 @@ export default {
     };
   },
   created() {
-	console.log('mpvueCityPicker created')
+//	console.log('mpvueCityPicker created')
 	 
     this.init()
   },
@@ -104,7 +104,7 @@ export default {
 	},
   methods: {
 		init() {
-			console.log('mpvueCityPicker init')
+//			console.log('mpvueCityPicker init')
 			if(this.pickerValueDefault.length == 0)
 				this.pickerValueDefault  = [0,0, 0];
 			 

+ 13 - 9
pages/login/step1.vue

@@ -30,7 +30,8 @@
 				</view>
 				<u-form :model="form" ref="uForm">
 					<view class="jpLogin-input">
-						<u-form-item required="true"><u-input v-model="form.birthday" type="select" placeholder="请选择生日" @click="birthdayChange"/>
+						<u-form-item required="true">
+							<u-input v-model="form.birthday" type="select" placeholder="请选择生日" @click="birthdayChange"/>
  						</u-form-item>
 					</view>
 					<view class="jpLogin-input">
@@ -52,7 +53,8 @@
 				<view class="step-btn" @click="goHome">跳过</view>
 			</view>
 		</view>
- 		<mpvue-date-picker  themeColor="#007AFF" ref="mpvueDatePicker" :pickerValueDefault="agePickerValueDefault" @onConfirm="onDateConfirm"></mpvue-date-picker>
+		<!--:pickerValueDefault="agePickerValueDefault"-->
+ 		<mpvue-date-picker  themeColor="#007AFF" ref="mpvueDatePicker"  @onConfirm="onDateConfirm"></mpvue-date-picker>
 		 
 	</view>
 </template>
@@ -85,7 +87,7 @@
 		}
 	}
 	import mpvueDatePicker from "../../components/mpvue-datepicker/mpvue-datepicker.vue"
-	import * as loginApi from '@/apis/login.js'
+	
 	export default {
 		components:{ 
 			mpvueDatePicker
@@ -136,13 +138,15 @@
 			}, 2000)
 		},
 		onLoad(){
+			
 			_self = this;
-			let subject = {subject:'zfqkList'}
-			loginApi.getBaseDictionary(subject).then(function(data){
-				console.log('基础字典'+JSON.stringify(data));
-			},function(err){
-				console.log('获取基础字典错误'+JSON.stringify(err))
-			})
+			//#ifdef H5
+			_self.form.height = 150;
+			_self.form.weight = 66;
+			_self.form.birthday = '1990-10-11';
+			_self.form.sex = 'male'
+			//#endif
+			
 			for(let i = 130;i<=220;i++)
 			{
 				this.height_ranges.push(i.toString());

+ 160 - 12
pages/login/step2.vue

@@ -9,14 +9,19 @@
 			<view class="jpLogin-main">
 				<u-form :model="form" ref="uForm">
 					<view class="jpLogin-input">
-						<u-form-item required="true"><u-input v-model="form.address" type="select" placeholder="我的出生地" @click="birthdayAddressChange" />
+						<u-form-item required="true">
+							<u-input v-model="form.address" type="select" placeholder="我的出生地" @click="show_birthday_address = true" />
+							<u-select v-model="show_birthday_address" mode="single-column" :list="area_ranges_by_names" @confirm="birthdayAddressConfirm"></u-select>						
 						</u-form-item>
-					</view>
+					</view> 
 					<view class="jpLogin-input">
-						<u-form-item required="true"><u-input v-model="form.registered_residence" type="select" placeholder="我的的户口所在地" @click="registeredResidenceAddressChange"  /></u-form-item>
+						<u-form-item required="true"><u-input v-model="form.registered_residence" type="select" placeholder="我的的户口所在地" @click="show_registered_residence = true"  /></u-form-item>
+						<u-select v-model="show_registered_residence" mode="single-column" :list="area_ranges_by_names" @confirm="registeredResidenceConfirm"></u-select>						
 					</view>
 					<view class="jpLogin-input">
-						<u-form-item required="true"><u-input v-model="form.work_address" type="select" placeholder="我的工作所在地" @click="workAddressChange" /></u-form-item>
+						<u-form-item required="true"><u-input v-model="form.work_address" type="select" placeholder="我的工作所在地" @click="show_work_address = true" /></u-form-item>
+						<u-select v-model="show_work_address" mode="single-column" :list="area_ranges_by_names" @confirm="workAddressConfirm"></u-select>
+					
 					</view>
 					
 					<view class="jpLogin-input" style="margin-top: 38px;">
@@ -66,6 +71,10 @@
 						选中我的兴趣爱好(可多选)
 					</view>
 					<view class="jpLogin-interest">
+						<view class="interest-item" v-for="(item,index) in interests" :class="item.checked?'active':''" @click="selectInterest(item)">
+							{{item.name}}
+						</view>
+						<!--
 						<view class="interest-item active">摄影</view>
 						<view class="interest-item">烹饪</view>
 						<view class="interest-item">健身</view>
@@ -79,7 +88,7 @@
 						<view class="interest-item">看电影</view>
 						<view class="interest-item">旅行</view>
 						<view class="interest-item">打游戏</view>
-						<view class="interest-item">修身养性</view>
+						<view class="interest-item">修身养性</view>-->
 					</view>
 				</u-form>
 			</view>
@@ -95,6 +104,7 @@
 </template>
 
 <script>
+	import * as loginApi from '@/apis/login.js'
 	import mpvueCityPicker from "../../components/mpvue-citypicker/mpvueCityPicker.vue";
 	let _self;
 	export default {
@@ -118,17 +128,19 @@
 					children_status:'',
 					self_assess:'',
 				},
-				salary_ranges:['2000元以下','2000-5000元','5000-10000元','10000-20000元','20000-50000元','50000元以上'],
+				area_ranges:[],
+				salary_ranges:[],//['2000元以下','2000-5000元','5000-10000元','10000-20000元','20000-50000元','50000元以上'],
 				education_ranges:['高中中专及以下','大专','本科','双学士','硕士','博士'],
 				profession_ragnes:['在校学生','人力资源/行政/后勤','高级管理','生产/加工/制造','质控/安检','工程机械','技工','财会/审计/统计','金融/证券/投资/保险','房地产/装修/物业','仓储/物流','计算机/互联网/IT','普通劳动力/家政服务','普通服务行业','航空服务业','教育/培训','咨询/顾问','学术/科研','法律','设计/创意','文学/传媒/影视','餐饮/旅游','电子/半导体/仪表仪器','化工','能源/地质勘察','医疗/护理','保健/美容','生物/制药/医疗器械','体育工作者','翻译','公务员/国家干部','私营业主','农/林/牧/渔业','通信技术','自由职业者','其他'],
 				marriage_statuses:['未婚','离异','丧偶'],
-				house_statuses:['已购住房','与人合租','独自租房','与父母同住','住亲朋家','住单位房','需要时购房'],
+				house_statuses:[],//['已购住房','与人合租','独自租房','与父母同住','住亲朋家','住单位房','需要时购房'],
 				corportation_types:['世界500强','上市公司','国有企业','私营企业','自有公司'],
-				children_statuses:['没有孩子','有孩子跟着自己','有孩子跟着对方','有孩子但已独立'],
+				children_statuses:[],//['没有孩子','有孩子跟着自己','有孩子跟着对方','有孩子但已独立'],
 				value:'0',
 				customStyle: {
 					background: '#FF5E5E'
 				}, 
+				area_ranges_by_names:[],
 				salary_ranges_by_names:[],
 				education_ranges_by_names:[],
 				profession_ranges_by_names:[],
@@ -136,6 +148,9 @@
 				house_statuses_by_names:[],
 				corportation_types_by_names:[],
 				children_statuses_by_names:[],
+				show_birthday_address:false,
+				show_registered_residence:false,
+				show_work_address:false,
 				show_salary:false,
 				show_profession:false,
 				show_education:false,
@@ -145,11 +160,113 @@
 				
 				background:{
 					background: 'none'
-				} 
+				},
+				interests:[{name:'摄影',checked:true},
+				{name:'烹饪',checked:false},
+				{name:'健身',checked:false},
+				{name:'看电影',checked:true},
+				{name:'旅行',checked:false},
+				{name:'打游戏',checked:false},
+				{name:'修身养性',checked:false},
+				]
 			}
 		},
 		onLoad(){
 			_self = this;
+			let subject = {subject:''}			
+			loginApi.getBaseDictionary(subject).then(function(data){
+				//console.log('基础字典'+JSON.stringify(data));
+				if(data.data)
+				{
+					let zfqkList = data.data.zfqkList;
+					if(zfqkList){
+						//console.log('住房情况'+JSON.stringify(zfqkList));
+						_self.house_statuses = zfqkList;
+						for(let i = 0;i< _self.house_statuses.length;i++)
+						{
+							let house_range = {value:_self.house_statuses[i].value, label: _self.house_statuses[i].name};
+							_self.house_statuses_by_names.push(house_range);
+						}
+					}
+					let yxList = data.data.yxList;
+					if(yxList){
+						//console.log('月薪'+JSON.stringify(yxList));
+						_self.salary_ranges = yxList;
+						for(let i = 0;i< _self.salary_ranges.length;i++)
+						{
+							let salary_range = {value:_self.salary_ranges[i].value, label: _self.salary_ranges[i].name};
+							_self.salary_ranges_by_names.push(salary_range);
+						}
+					}
+					
+					let znqkList = data.data.znqkList;
+					if(znqkList){
+						//console.log('子女情况'+JSON.stringify(znqkList));
+						_self.children_statuses = znqkList;
+						for(let i = 0;i< _self.children_statuses.length;i++)
+						{
+							let children_status = {value:_self.children_statuses[i].value, label: _self.children_statuses[i].name};							
+							_self.children_statuses_by_names.push(children_status);
+						}
+					}
+					
+					
+					let qyList = data.data.qyList;
+					if(qyList){
+						console.log('区域'+JSON.stringify(qyList));
+						_self.area_ranges = qyList;
+						for(let i = 0;i< _self.area_ranges.length;i++)
+						{
+							let house_range = {value:_self.area_ranges[i].value, label: _self.area_ranges[i].name};							
+							_self.area_ranges_by_names.push(house_range);
+						}
+					} 
+					let xlList = data.data.xlList;
+					if(xlList){
+						console.log('学历'+JSON.stringify(xlList));
+						_self.education_ranges = xlList;
+						for(let i = 0;i< _self.education_ranges.length;i++)
+						{
+							let education ={value:_self.education_ranges[i].value, label: _self.education_ranges[i].name};							
+							_self.education_ranges_by_names.push(education);
+						}
+					}
+					let hyList = data.data.hyList;
+					if(hyList){
+						console.log('行业'+JSON.stringify(hyList));
+						_self.profession_ragnes = hyList;
+						for(let i = 0;i< _self.profession_ragnes.length;i++)
+						{
+							let profession = {value:_self.profession_ragnes[i].value, label: _self.profession_ragnes[i].name};							
+							_self.profession_ranges_by_names.push(profession);
+						}
+					} 
+					/*
+					let nlfwList = data.data.nlfwList;
+					if(nlfwList){
+						console.log('年龄范围'+JSON.stringify(nlfwList));
+						
+						for(let i = 0;i< _self.house_statuses.length;i++)
+						{
+							let house_range = {value:i, label: _self.house_statuses[i]};
+							_self.house_statuses_by_names.push(house_range);
+						}
+					}*/
+					let hyqkList = data.data.hyqkList;
+					if(hyqkList){
+						console.log('婚姻'+JSON.stringify(hyqkList));
+						_self.marriage_statuses = hyqkList;
+						for(let i = 0;i< _self.marriage_statuses.length;i++)
+						{
+							let marriage_status = {value:_self.marriage_statuses[i].value, label: _self.marriage_statuses[i].name};							
+							_self.marriage_statuses_by_names.push(marriage_status);
+						}
+					}
+				} 
+			},function(err){
+				console.log('获取基础字典错误'+JSON.stringify(err))
+			})
+			/*
 			for(let i = 0;i< _self.salary_ranges.length;i++)
 			{
 				let salary_range = {value:i, label: _self.salary_ranges[i]};
@@ -184,13 +301,18 @@
 			{
 				let children_range = {value:i, label: _self.children_statuses[i]};
 				_self.children_statuses_by_names.push(children_range);
-			}
+			}*/
 			_self.get_options();
 		},
 		onReady(){
 			_self.get_options();
 		},
 		methods:{
+			selectInterest(item){
+				if(item){
+					item.checked = !item.checked
+				}
+			},
 			get_options(){
 				console.log('get options')
 				// #ifdef APP-NVUE
@@ -230,8 +352,34 @@
 					let result = val.label
 					this.form.house_status  += result;
 				}) 
+			},			
+			registeredResidenceConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.registered_residence = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					this.form.registered_residence  += result;
+				}) 
+			},
+			workAddressConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.work_address = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					this.form.work_address  += result;
+				}) 
+			},
+			birthdayAddressConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.address = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					this.form.address  += result;
+				}) 
 			},
-			
 			educationConfirm(e){
 				console.log('e'+JSON.stringify(e))
 				this.form.education = '';
@@ -264,7 +412,7 @@
 					deta:1
 				})
 			},
-			next(){
+			next(){ 
 				_self.personal_info.step2= _self.form;
 				uni.navigateTo({
 					url:'./step3',

+ 118 - 9
pages/login/step3.vue

@@ -10,7 +10,8 @@
 				<u-form :model="form" ref="uForm">
 					<view class="jpLogin-input">
 						<u-form-item required="true">
-							<u-input v-model="form.age_range" type="select" placeholder="Ta的年龄段范围" @click="ageChange"/>
+							<u-input v-model="form.age_range" type="select" placeholder="Ta的年龄段范围" @click="show_age_ranges = true"/>
+							<u-select v-model="show_age_ranges" mode="single-column" :list="age_ranges_by_names" @confirm="ageRangeConfirm"></u-select>						
 						</u-form-item>
 					</view>
 					<view class="jpLogin-input">
@@ -33,7 +34,8 @@
 					</view>
 					<view class="jpLogin-input">
 						<u-form-item>
-							<u-input v-model="form.work_address" type="select" placeholder="Ta的工作所在地" @click="workAddressChange"/>
+							<u-input v-model="form.work_address" type="select" placeholder="Ta的工作所在地" @click="show_work_address = true"/>
+							<u-select v-model="show_work_address" mode="single-column" :list="area_ranges_by_names" @confirm="workAddressConfirm"></u-select>						
 						</u-form-item>
 					</view>
 					<view class="form-tit">
@@ -52,19 +54,20 @@
 				<view class="step-btn" @click="previous">返回上一步</view>
 			</view>
 		</view>
-		<mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>
-		<mpvue-age-picker themeColor="#007AFF" ref="mpvueAgePicker" :pickerValueDefault="agePickerValueDefault" @onConfirm="onAgeConfirm"></mpvue-age-picker>
+<!--		<mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>
+		<mpvue-age-picker themeColor="#007AFF" ref="mpvueAgePicker" :pickerValueDefault="agePickerValueDefault" @onConfirm="onAgeConfirm"></mpvue-age-picker>-->
 	</view>
 </template>
 
 <script>
-	import mpvueCityPicker from "../../components/mpvue-citypicker/mpvueCityPicker.vue";
-	import mpvueAgePicker from "../../components/mpvue-agepicker/mpvueAgePicker.vue"
+	import * as loginApi from '@/apis/login.js'	
+//	import mpvueCityPicker from "../../components/mpvue-citypicker/mpvueCityPicker.vue";
+//	import mpvueAgePicker from "../../components/mpvue-agepicker/mpvueAgePicker.vue"
 	let _self;
 	export default {
 		components:{
-			mpvueCityPicker,
-			mpvueAgePicker
+//			mpvueCityPicker,
+//			mpvueAgePicker
 		},
 		data() {
 			return {
@@ -83,7 +86,10 @@
 					work_address:'',
 					other:'',
 				},
+				area_ranges:[],
+				area_ranges_by_names:[],
 				age_ranges:[],
+				age_ranges_by_names:[],
 				height_ranges:[],
 				education_ranges_by_names:[],
 				education_ranges:['不限','高中中专及以下','大专','本科','双学士','硕士','博士'],
@@ -100,6 +106,15 @@
 
 		},
 		methods:{
+			workAddressConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.work_address = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					this.form.work_address  += result;
+				}) 
+			},
 			get_options(){
 				console.log('get options')
 				// #ifdef APP-NVUE
@@ -141,6 +156,15 @@
 					this.form.salary_range  += result;
 				}) 
 			},
+			ageRangeConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.age_range = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					this.form.age_range  += result;
+				}) 
+			},
 			educationConfirm(e){
 				console.log('e'+JSON.stringify(e))
 				this.form.education = '';
@@ -170,6 +194,91 @@
 		},
 		onLoad(){
 			_self = this;
+			let subject = {subject:''}
+			loginApi.getBaseDictionary(subject).then(function(data){
+				//console.log('基础字典'+JSON.stringify(data));
+				if(data.data)
+				{
+					/*
+					let zfqkList = data.data.zfqkList;
+					if(zfqkList){
+						//console.log('住房情况'+JSON.stringify(zfqkList));
+						_self.house_statuses = zfqkList;
+						for(let i = 0;i< _self.house_statuses.length;i++)
+						{
+							let house_range = {value:_self.house_statuses[i].value, label: _self.house_statuses[i].name};
+							_self.house_statuses_by_names.push(house_range);
+						}
+					}*/
+					let yxList = data.data.yxList;
+					if(yxList){
+						//console.log('月薪'+JSON.stringify(yxList));
+						_self.salary_ranges = yxList;
+						for(let i = 0;i< _self.salary_ranges.length;i++)
+						{
+							let salary_range = {value:_self.salary_ranges[i].value, label: _self.salary_ranges[i].name};
+							_self.salary_ranges_by_names.push(salary_range);
+						}
+					}
+					/*
+					let znqkList = data.data.znqkList;
+					if(znqkList){
+						//console.log('子女情况'+JSON.stringify(znqkList));
+						_self.children_statuses = znqkList;
+						for(let i = 0;i< _self.children_statuses.length;i++)
+						{
+							let children_status = {value:_self.children_statuses[i].value, label: _self.children_statuses[i].name};							
+							_self.children_statuses_by_names.push(children_status);
+						}
+					}*/
+					
+					
+					let qyList = data.data.qyList;
+					if(qyList){
+						console.log('区域'+JSON.stringify(qyList));
+						_self.area_ranges = qyList;
+						for(let i = 0;i< _self.area_ranges.length;i++)
+						{
+							let house_range = {value:_self.area_ranges[i].value, label: _self.area_ranges[i].name};							
+							_self.area_ranges_by_names.push(house_range);
+						}
+					} 
+					let xlList = data.data.xlList;
+					if(xlList){
+						console.log('学历'+JSON.stringify(xlList));
+						_self.education_ranges = xlList;
+						for(let i = 0;i< _self.education_ranges.length;i++)
+						{
+							let education ={value:_self.education_ranges[i].value, label: _self.education_ranges[i].name};							
+							_self.education_ranges_by_names.push(education);
+						}
+					}
+					/*
+					let hyList = data.data.hyList;
+					if(hyList){
+						console.log('行业'+JSON.stringify(hyList));
+						_self.profession_ragnes = hyList;
+						for(let i = 0;i< _self.profession_ragnes.length;i++)
+						{
+							let profession = {value:_self.profession_ragnes[i].value, label: _self.profession_ragnes[i].name};							
+							_self.profession_ranges_by_names.push(profession);
+						}
+					}*/
+					let nlfwList = data.data.nlfwList;
+					if(nlfwList){
+						console.log('年龄范围'+JSON.stringify(nlfwList));
+						_self.age_ranges = nlfwList;
+						for(let i = 0;i< _self.age_ranges.length;i++)
+						{
+							let house_range =  {value:_self.age_ranges[i].value, label: _self.age_ranges[i].name};							
+							_self.age_ranges_by_names.push(house_range);
+						}
+					}  
+				} 
+			},function(err){
+				console.log('获取基础字典错误'+JSON.stringify(err))
+			})
+			/*
 			for(let i = 18;i<=99;i++)
 			{
 				this.age_ranges.push(i);
@@ -188,7 +297,7 @@
 				let salary_range = {value:i, label:_self.salary_ranges[i]};
 				_self.salary_ranges_by_names.push(salary_range);
 			}
-			console.log('salary ranges'+JSON.stringify(_self.salary_ranges_by_names))
+			console.log('salary ranges'+JSON.stringify(_self.salary_ranges_by_names))*/
 			_self.get_options();
 		},
 		onReady(){