Merge branch 'sit-Carl' into sit-Leung

rc-busness/components/addressInput.vue

@@ -81,6 +81,7 @@ export default {
 		},
 		pickValue(pickId,pickName){
 			let areaObj={id:pickId,name:pickName};
+			console.log(pickId,pickName);
 			this.returnValueArr[this.curDisplayingColIndex]=areaObj;
 			this.validatePickedValues();
 			
@@ -105,6 +106,9 @@ export default {
 		onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}];
 			//Support single choice only , index = 0 province, index = 1 city, index = 2 area
 			let curSelection={'province':'','city':'','area':''};
+			// console.log(picker,values);
+			this.$emit('getmenu',values)
+			this.$emit("closeDialog");
 			if(!values)
 				return;
 			let _self=this;
@@ -226,7 +230,7 @@ export default {
 			this.hideAddress();
 		},
 		onCancel() {
-			
+			  
 		},
 		fitlerValuesInArray(stringStartWith,dataColArea){
 			stringStartWith=stringStartWith+"-";