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

pages/housePurchase/housePurchase.vue

@@ -27,7 +27,7 @@
 						<view class="inputItem">
 							<text>预购城市：</text>
 							<uni-data-picker placeholder="请选择地区" popup-title="请选择所在地区" :localdata="provinceList"
-											@change="onchange" @nodeclick="onnodeclick">
+											@change="onchange" @nodeclick="onnodeclick" v-model="housePurchaseInfo.cityId">
 										</uni-data-picker>
 						</view>
 						<view class="inputItem">
@@ -134,7 +134,7 @@
 					<!-- 操作 -->
 					<view class="optionContent">
 						<button type="default" plain="true" form-type="reset"
-						>全部清空</button>
+						@click="resetData()" >全部清空</button>
 						<button type="default" plain="true"
 						class="btn" @click="startCount()">开始计算</button>
 					</view>
@@ -527,6 +527,26 @@
 						this.planningParams.housePriceGrowthRate = res['data']['priceInfo']['rateB'] / 100;
 					 }
 				 })
+			},
+			resetData(){
+				this.housePurchaseInfo = {
+					nyear:null,//几年后购房
+					provinceCode:null,
+					provinceName:null,
+					cityCode:null,
+					cityName:null,
+					preOrderSize:null,//预购面积
+					targetPrice:null,//目标价格(现值)
+					downPaymentMin:null,//首付款最低成数(百分位)
+					newLoanYear:null,//新房贷款年限【必须大于0】
+					firstHouseAmount:null,//初期购房资金(单位万)
+					housePurchaseType:null,//购房用途
+					repaymentSpecial:null,//每年还贷专用款(单位万)
+					interestRate:null, //贷款年利率
+				};
+				this.houseLoanOldList = [];
+				this.planningParams = {};
+				this.resultFlag = false;
 			}
 		},
 		mounted(){