0419

App.vue

@@ -1,9 +1,17 @@
 <script>
 	import '.env.js'
-	import 'font.js'
+	import 'font.js'
+	import * as loginApi from '@/apis/login.js'
+	import {provinceData,setCityData,getCityData} from '@/pagesB/components/mpvue-citypicker/city-data/province.js';
+	
 	export default {
 		onLaunch: function() { 
-			
+			loginApi.getCityList().then(function(data){
+ 
+				if(data.result &&  data.data){
+					setCityData(data.data); 
+				}
+			})
 		},
 		onShow: function() {
 			

pages/user/edit.vue

@@ -123,13 +123,8 @@
 			</u-button>
 		</view>
 		<view>
-			<!--
-			<u-popup :show="showSelfEvaluation" mode="bottom"  @close="close" @open="open">
-				<view>
-					<text>人生若只如初见，何事秋风悲画扇</text>
-				</view>
-			</u-popup>-->
-			<u-popup border-radius="20" v-model="showSelfEvaluation" @close="close"   mode="bottom" length="90%" height="600rpx">
+			
+			<u-popup  border-radius="20" v-model="showSelfEvaluation" @close="close"   mode="bottom" length="90%" height="600rpx">
 				<view style="display: flex; flex-direction: column;">
 					<view style="display:flex;flex-direction:row;margin-top: 50rpx;justify-content: space-between; ">
 						<view style="margin-left: 50rpx;font-weight: bold!important; font-size:30rpx;margin-bottom: 20rpx;">自我评价</view>
@@ -239,8 +234,9 @@
 
 <script>
 	import * as loginApi from '@/apis/login.js'
-	import mpvueCityPicker from "../../pagesB/components/mpvue-citypicker/mpvueCityPicker.vue";
-	import {provinceData,setCityData,getCityData} from '../../pagesB/components/mpvue-citypicker/city-data/province.js';
+	import mpvueCityPicker from "@/pagesB/components/mpvue-citypicker/mpvueCityPicker.vue";
+//	import mpvueCityPicker from "../../pagesB/components/mpvue-citypicker/mpvueCityPicker.vue";
+	import {provinceData,setCityData,getCityData} from '@/pagesB/components/mpvue-citypicker/city-data/province.js';
 	let _self;
 	export default {
 		components:{
@@ -468,7 +464,7 @@
 								if(_self.personal_info.hobby.indexOf(_self.base_dictionary.hobbyInfoList[i].id)>=0)
 								{
 									_self.base_dictionary.hobbyInfoList[i].isMemberSelect = true;
-									console.log('选中'+JSON.stringify(_self.base_dictionary.hobbyInfoList[i]))
+//									console.log('选中'+JSON.stringify(_self.base_dictionary.hobbyInfoList[i]))
 								} 
 							}
 						}

pagesB/components/mpvue-citypicker/mpvueCityPicker.vue

@@ -79,7 +79,7 @@ export default {
     pickerValueDefault: {
       type: Array,
       default(){
-				return [0, 0, 0]
+				return [16, 6, 0]
 			}
     },
     /* 主题色 */
@@ -96,7 +96,8 @@ export default {
 			//console.log('省'+JSON.stringify(provinceData));
 			//console.log('市'+JSON.stringify(cityData));
 			//console.log('区'+JSON.stringify(areaData));
-			//console.log('mpvueCityPicker init')
+			
+			console.log('mpvueCityPicker init'+JSON.stringify(this.pickerValueDefault))
 			if(this.pickerValueDefault.length == 0)
 				this.pickerValueDefault  = [16,6,0];
 			this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
@@ -199,6 +200,12 @@ export default {
       this.$emit(emitName, pickObj);
     },
     _getLabel() {
+		if(this.pickerValue[0]>=this.provinceDataList.length)
+			return;
+		if(this.pickerValue[1]>=this.cityDataList.length)
+			return;
+		if(this.pickerValue[2]>=this.areaDataList.length)
+			return;
       let pcikerLabel =
         this.provinceDataList[this.pickerValue[0]].label +
         '-' +
@@ -208,6 +215,12 @@ export default {
       return pcikerLabel;
     },
     _getCityCode() {
+	if(this.pickerValue[0]>=this.provinceDataList.length)
+		return;
+	if(this.pickerValue[1]>=this.cityDataList.length)
+		return;
+	if(this.pickerValue[2]>=this.areaDataList.length)
+		return;
       return this.areaDataList[this.pickerValue[2]].value;
     }
   }

pagesB/pages/login/step1.vue

@@ -135,11 +135,11 @@
 		},		
 		computed:{
 		 defaultvalue(){
-		 	console.log('heighs'+JSON.stringify(this.height_ranges_by_names))
+//		 	console.log('heighs'+JSON.stringify(this.height_ranges_by_names))
 			for(var i in this.height_ranges_by_names){
 		 			
 		 		if(this.height_ranges_by_names[i].value==this.form.height_val){
-		 			console.log('default'+JSON.stringify([i]))
+//		 			console.log('default'+JSON.stringify([i]))
 		 			return [i]
 		 		}
 		 	}

pagesB/pages/login/step2.vue

@@ -91,8 +91,8 @@
 
 <script>
 	import * as loginApi from '@/apis/login.js'
-	import mpvueCityPicker from "../../components/mpvue-citypicker/mpvueCityPicker.vue";
-	import {getCityData} from '../../components/mpvue-citypicker/city-data/province.js';
+	import mpvueCityPicker from '@/pagesB/components/mpvue-citypicker/mpvueCityPicker.vue';
+	import {getCityData} from '@/pagesB/components/mpvue-citypicker/city-data/province.js';
 	let _self;
 	export default {
 		components:{

pagesB/pages/login/step3.vue

@@ -62,8 +62,8 @@
 
 <script>
 	import * as loginApi from '@/apis/login.js'	
-	import mpvueCityPicker from "../../components/mpvue-citypicker/mpvueCityPicker.vue";
-	import {getCityData} from '../../components/mpvue-citypicker/city-data/province.js';
+	import mpvueCityPicker from '@/pagesB/components/mpvue-citypicker/mpvueCityPicker.vue';
+	import {getCityData} from '@/pagesB/components/mpvue-citypicker/city-data/province.js';
 //	import mpvueAgePicker from "../../components/mpvue-agepicker/mpvueAgePicker.vue"
 	let _self;
 	export default {