Merge branch 'master' of http://139.224.139.2:9091/Sweet/sfp-program

api/api.ts

@@ -13,6 +13,9 @@ export default {
 	//增额寿和年金(单利复利)计算结果查询接口
 	//增额寿和年金(单利复利)计算结果查询接口
 	queryIrrAndSimple(params){
 	queryIrrAndSimple(params){
 		return request(`${baseURL}/api/sfp/calcuteUtil/queryIrrAndSimple`, "POST", params)
 		return request(`${baseURL}/api/sfp/calcuteUtil/queryIrrAndSimple`, "POST", params)
+	},
+	//获取城市
+	provCityQry(params){
+		return request(`${baseURL}/api/metadata/provCityQry`, "POST", params)
 	}
 	}
-	
 }
 }

index.html

@@ -17,7 +17,7 @@
     <div id="app"><!--app-html--></div>
     <div id="app"><!--app-html--></div>
     <script type="module" src="/main.js"></script>
     <script type="module" src="/main.js"></script>
 	  <!-- 移动端调试 -->
 	  <!-- 移动端调试 -->
-  <script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script>
-  <script>eruda.init();</script>
+ <!-- <script type="text/javascript" src="//cdn.jsdelivr.net/npm/eruda"></script>
+  <script>eruda.init();</script> -->
   </body>
   </body>
 </html>
 </html>

pages/housePurchase/housePurchase.vue

@@ -24,12 +24,15 @@
 						</view>
 						</view>
 						<view class="inputItem">
 						<view class="inputItem">
 							<text>预购城市：</text>
 							<text>预购城市：</text>
-							<view class="inputContent">
+							<!-- <view class="inputContent">
 								<select name="" id="">
 								<select name="" id="">
 									<option value="">上海</option>
 									<option value="">上海</option>
 									<option value="">深圳</option>
 									<option value="">深圳</option>
 								</select>
 								</select>
-							</view>
+							</view> -->
+							 <uni-data-picker placeholder="请选择地址" popup-title="请选择城市" collection="opendb-city-china" field="code as value, name as text" orderby="value asc" :step-searh="true" self-field="code" parent-field="parent_code"
+							 @change="onchange" @nodeclick="onnodeclick">
+							</uni-data-picker>
 						</view>
 						</view>
 						<view class="inputItem">
 						<view class="inputItem">
 							<text>预购面积：</text>
 							<text>预购面积：</text>
@@ -270,6 +273,7 @@
 	import head from '../header/header.vue';
 	import head from '../header/header.vue';
 	import foot from '../footer/footer.vue';
 	import foot from '../footer/footer.vue';
 	import * as echarts from 'echarts';
 	import * as echarts from 'echarts';
+	import api from '../../api/api';
 	
 	
 	export default{
 	export default{
 		data(){
 		data(){
@@ -277,7 +281,15 @@
 				isDisplace:false,
 				isDisplace:false,
 				myChart:null,
 				myChart:null,
 				nyear:null,
 				nyear:null,
-				city:null
+				city:'',
+				provinceList: [{
+						provinceName:'选项1',
+						provinceId:'1'
+					},
+					{
+						provinceName:'选项2',
+						provinceId:'2'
+					},],
 			}
 			}
 		},
 		},
 		components:{
 		components:{
@@ -287,15 +299,18 @@
 			foot
 			foot
 		},
 		},
 		onLoad(){
 		onLoad(){
-			this.echertWidth=300;
-			this.sHeight=300;
+			this.provCityQry();
 		},
 		},
 		methods:{
 		methods:{
+			onchange(e) {
+			    const value = e.detail.value
+			},
+			onnodeclick(node) {},
 			drawLine() {
 			drawLine() {
-			// 基于准备好的dom，初始化echarts实例
-			this.myChart = echarts.init(document.getElementById('myEcharts'));
-			// 绘制图表
-			this.myChart.setOption({
+				// 基于准备好的dom，初始化echarts实例
+				this.myChart = echarts.init(document.getElementById('myEcharts'));
+				// 绘制图表
+				this.myChart.setOption({
 					  xAxis: {
 					  xAxis: {
 					    data: ['A', 'B', 'C', 'D', 'E']
 					    data: ['A', 'B', 'C', 'D', 'E']
 					  },
 					  },
@@ -314,6 +329,14 @@
 					  ]
 					  ]
 			    });
 			    });
 			},
 			},
+			provCityQry(){
+				api.provCityQry({insurerId:888}).then((res)=>{
+					console.log(res)
+					if(res['success']){
+						// this.provinceList = res['data']['provinces'];
+					}
+				})
+			}
 		},
 		},
 		mounted(){
 		mounted(){
 			this.drawLine();
 			this.drawLine();