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

api/api.ts

@@ -17,5 +17,11 @@ export default {
 	//获取城市
 	provCityQry(params){
 		return request(`${baseURL}/api/metadata/provCityQry`, "POST", params)
+	},
+	
+	//购房能力测算
+	housePurchasePlanAnalysis(params){
+		return request(`${baseURL}/api/sfp/calcuteUtil/housePurchasePlanAnalysis`, "POST", params)
 	}
+	
 }

pages/housePurchase/housePurchase.vue

@@ -18,7 +18,7 @@
 							<text>几年后购房：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="nyear" />
+								 maxlength="3" v-model="housePurchaseInfo.nyear" />
 								 <label for="">年</label>
 							</view>
 						</view>
@@ -32,7 +32,7 @@
 							<text>预购面积：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="preOrderSize"
+								 maxlength="3" v-model="housePurchaseInfo.preOrderSize"
 								/><label for="">m²</label>
 							</view>
 						</view>
@@ -40,7 +40,7 @@
 							<text>预购房产现在市场单价：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="targetPrice"
+								 maxlength="3" v-model="housePurchaseInfo.targetPrice"
 								/><label for="">m²/元</label>
 							</view>
 						</view>
@@ -48,7 +48,7 @@
 							<text>首付款最低成数：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="downPaymentMin"
+								 maxlength="3" v-model="housePurchaseInfo.downPaymentMin"
 								/><label for="">m²</label>
 							</view>
 						</view>
@@ -56,7 +56,7 @@
 							<text>新房贷款年限：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="newLoanYear"
+								 maxlength="3" v-model="housePurchaseInfo.newLoanYear"
 								/><label for="">m²</label>
 							</view>
 						</view>
@@ -64,7 +64,7 @@
 							<text>新房贷款年利率：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="housePriceGrowthRate"
+								 maxlength="3" v-model="housePurchaseInfo.housePriceGrowthRate"
 								/><label for="">m²</label>
 							</view>
 						</view>
@@ -90,7 +90,7 @@
 							<text>已备首付：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="firstHouseAmount"
+								 maxlength="3" v-model="housePurchaseInfo.firstHouseAmount"
 								/><label for="">万元</label>
 							</view>
 						</view>
@@ -98,7 +98,7 @@
 							<text>年预备还房贷资金总额：</text>
 							<view class="inputContent">
 								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3" v-model="repaymentSpecial"
+								 maxlength="3" v-model="housePurchaseInfo.repaymentSpecial"
 								/><label for="">万元</label>
 							</view>
 						</view>
@@ -177,7 +177,7 @@
 						<button type="default" plain="true" form-type="reset"
 						>全部清空</button>
 						<button type="default" plain="true"
-						class="btn">开始计算</button>
+						class="btn" @click="startCount()">开始计算</button>
 					</view>
 			</form>
 			<!--测算结果-->
@@ -271,8 +271,8 @@
 			return{
 				isDisplace:false,
 				myChart:null,
+				housePurchaseInfo:{
 					nyear:null,//几年后购房
-				city:'',
 					provinceList: [],
 					provinceCode:null,
 					provinceName:null,
@@ -285,6 +285,7 @@
 					firstHouseAmount:null,//初期购房资金(单位万)
 					housePurchaseType:null,//购房用途
 					repaymentSpecial:null,//每年还贷专用款(单位万)
+				},
 				housePurchaseTypeList:[{id:1,name:'投资'},{id:2,name:'自住'},{id:3,name:'其他'}]
 			}
 		},
@@ -337,6 +338,21 @@
 			},
 			housePurchase(id){
 				this.housePurchaseType = id;
+			},
+			startCount(){
+				const param = {
+					...this.housePurchaseInfo,
+				}
+				// api.housePurchasePlanAnalysis().then((res)=>{
+					
+				// })
+			},
+			onchange(e) {
+			        const value = e.detail.value;
+					console.log(e)
+			      },
+			      onnodeclick(node) {
+					  console.log(node)
 			      }
 		},
 		mounted(){