解决冲突

f4089f2a · Chao Sun · ea3994a7 · f4089f2a · f4089f2a
Commit f4089f2a authored Sep 27, 2022 by Chao Sun
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 63 deletions

pages/housePurchase/housePurchase.vue
+9 -56

pages/housePurchase/loanBalance.vue
+13 -7

No files found.
--- a/pages/housePurchase/housePurchase.vue
+++ b/pages/housePurchase/housePurchase.vue
@@ -110,58 +110,7 @@
 							@click="openLoan()"></view>
 							<text style="margin-left: 10rpx;">是否置换旧房{{isDisplace}}</text>
 						</view>
+						<loanBalance :getChildLoanInfo="getChildLoanInfo" :isShowTab="false"></loanBalance>
-							<view class="inputItem">
-								<text>旧房贷款余额：</text>
-								<view class="inputContent">
-									<input class="uni-input" type="number" placeholder="请输入" 
-									 maxlength="3"
-									/><label for="">万元</label>
-								</view>
-							</view>
-							<view class="inputItem">
-								<text>旧房贷款剩余月份：</text>
-								<view class="inputContent">
-									<input class="uni-input" type="number" placeholder="请输入" 
-									maxlength="3"
-									/><label for="">月</label>
-								</view>
-							</view>
-							<view class="inputItem">
-							<text>旧房贷款利率：</text>
-							<view class="inputContent">
-								<input class="uni-input" type="number" placeholder="请输入" 
-								 maxlength="3"
-								/><label for="">%</label>
-							</view>
-							</view>
-							<view class="inputItem">
-								<text style="flex: 0 0 35%;">旧房贷款方式：</text>
-								<view class="btn_wrapper">
-									<view class="btn_item" style="width: 120rpx;">
-										公积金
-									</view>
-									<view class="btn_item selected" style="width: 120rpx;">
-										商业贷
-									</view>
-									<view class="btn_item" style="width: 120rpx;">
-										组合贷
-									</view>
-								</view>
-							</view>
-							<view class="inputItem">
-								<text style="flex: 0 0 35%;">旧房还款方式：</text>
-								<view class="btn_wrapper">
-									<view class="btn_item" style="width: 140rpx;">
-										等额本金
-									</view>
-									<view class="btn_item selected" style="width: 140rpx;">
-										等额本息
-									</view>
-								</view>
-							</view>
 					</view>
 					<!--规划参数-->
 					<view class="parametersInfo">
@@ -261,11 +210,11 @@
 				<svg t="1663922894848" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2545" width="26" height="26"><path d="M557.311759 513.248864l265.280473-263.904314c12.54369-12.480043 12.607338-32.704421 0.127295-45.248112-12.512727-12.576374-32.704421-12.607338-45.248112-0.127295L512.127295 467.904421 249.088241 204.063755c-12.447359-12.480043-32.704421-12.54369-45.248112-0.063647-12.512727 12.480043-12.54369 32.735385-0.063647 45.280796l262.975407 263.775299-265.151458 263.744335c-12.54369 12.480043-12.607338 32.704421-0.127295 45.248112 6.239161 6.271845 14.463432 9.440452 22.687703 9.440452 8.160624 0 16.319527-3.103239 22.560409-9.311437l265.216826-263.807983 265.440452 266.240344c6.239161 6.271845 14.432469 9.407768 22.65674 9.407768 8.191587 0 16.352211-3.135923 22.591372-9.34412 12.512727-12.480043 12.54369-32.704421 0.063647-45.248112L557.311759 513.248864z" p-id="2546"></path></svg>
 			</div>
 			<!--旧房贷款余额组件-->
-			<loanBalance :getChildLoanInfo="getChildLoanInfo" v-if="isLoanSelected"></loanBalance>
+			<loanBalance :getChildLoanInfo="getChildLoanInfo" v-if="isLoanSelected" :isShowTab="true"></loanBalance>
 			<!--规划参数组件-->
 			<planningParameters v-if="paramsSelected"></planningParameters>
 		</view>
-	</view>
+		</view>
 </template>
 <script>
@@ -301,7 +250,8 @@
 					repaymentSpecial:null,//每年还贷专用款(单位万)
 					interestRate:null, //贷款年利率
 				},
-				housePurchaseTypeList:[{id:1,name:'投资'},{id:2,name:'自住'},{id:3,name:'其他'}]
+				housePurchaseTypeList:[{id:1,name:'投资'},{id:2,name:'自住'},{id:3,name:'其他'}],
+				houseLoanOldList:[]
 			}
 		},
 		components:{
@@ -415,7 +365,10 @@
 			closeBtn(){
 				this.isLoanSelected = this.paramsSelected = this.dialogIsShow = false;
 			},
-			getChildLoanInfo(houseLoanOldList){
+			getChildLoanInfo(houseLoanOldList,commercialLoansParams,accumulationFundParams){
+				console.log(commercialLoansParams,accumulationFundParams)
+				this.commercialLoansParams = commercialLoansParams;
+				this.accumulationFundParams = accumulationFundParams;
 				//获取旧房贷款信息
 				console.log(houseLoanOldList)
 				this.houseLoanOldList = houseLoanOldList;

--- a/pages/housePurchase/loanBalance.vue
+++ b/pages/housePurchase/loanBalance.vue
 <template>
 	<div class="mortgageCalculatorContainer">
-		<view class="tabTitle">
+		<view class="tabTitle" v-if="isShowTab">
 			<view v-for="item of loanTypeLists">
 				<text :class="{ actived: item.value===loanType }" @click="selectLoanType(item.value)">{{item.text}}</text>
 			</view>
@@ -48,16 +48,16 @@
 <script>
 	export default{
-		props: ['getChildLoanInfo'],
+		props: ['getChildLoanInfo','isShowTab'],
 		data(){
 			return{
-				accumulationFundParams:[
+				accumulationFundParams : [
 					{id:'00',text:'公积金贷款余额',value:null,type:'digit',unit:'元',alias:'oldHouseLoanBalance'},
 					{id:'01',text:'公积金还款方式',value:null,type:'select',unit:'',alias:'oldCalcuteType'},
 					{id:'02',text:'剩余月份',value:null,type:'number',unit:'月',alias:'oldHouseRepaymentMonth'},
 					{id:'03',text:'年利率',value:null,type:'digit',unit:'%',alias:'oldInterestRate'},
 				],
-				commercialLoansParams:[
+				commercialLoansParams : [
 					{id:'00',text:'商业贷款余额',value:null,type:'digit',unit:'元',alias:'oldHouseLoanBalance'},
 					{id:'01',text:'商业还款方式',value:null,type:'select',unit:'',alias:'oldCalcuteType'},
 					{id:'02',text:'剩余月份',value:null,type:'number',unit:'月',alias:'oldHouseRepaymentMonth'},
@@ -87,7 +87,9 @@
 		},
 		onLoad(){
+			if(this.isShowTab){
+			}
 		},
 		methods:{
 			selectLoanType(e){
@@ -236,8 +238,12 @@
 				// 旧房贷款信息集合
 				console.log(this.houseLoanOldList)
-				this.getChildLoanInfo(this.houseLoanOldList);
+				this.getChildLoanInfo(this.houseLoanOldList,this.commercialLoansParams,this.accumulationFundParams);
-			}
+			},
+			// closeBlan(){
+			// 	//向父组件发送关闭弹窗
+			// 	this.$emit('closeLoan')
+			// }
 		}
 	}