冲突

pages/index/index.vue

@@ -10,7 +10,7 @@
 			<view class="banner">
 			<view class="banner">
 				<img src="/static/images/policyIrrBanner.png" alt="" srcset="">
 				<img src="/static/images/policyIrrBanner.png" alt="" srcset="">
 				<!-- 使用说明 -->
 				<!-- 使用说明 -->
-				<v-text>使用说明</v-text>
+				<text>使用说明</text>
 			</view>
 			</view>
 			<scroll-view scroll-y="true" class="formInfoContainer">
 			<scroll-view scroll-y="true" class="formInfoContainer">
 				<view class="tabTitle">
 				<view class="tabTitle">
@@ -270,15 +270,12 @@
 						this.yearWithdrawalInfos = [].concat([{withdrawalType:'1',
 						this.yearWithdrawalInfos = [].concat([{withdrawalType:'1',
 						withdrawalStart:null,
 						withdrawalStart:null,
 						yearWithdrawalAmount:null}]);
 						yearWithdrawalAmount:null}]);
-<<<<<<< HEAD
+					}else if(e=='1'){
+						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
 					}else{
 					}else{
 						//年金切换到增额时万能账户清空,提领信息清空
 						//年金切换到增额时万能账户清空,提领信息清空
 						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
 						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
 						this.yearWithdrawalInfos = [];
 						this.yearWithdrawalInfos = [];
-=======
-					}else if(e=='1'){
-						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
->>>>>>> 6c3581fb58cc1331532f1e352624a05e5ba80ba7
 					}
 					}
 					this.resultShowFlag = false;
 					this.resultShowFlag = false;
 				}
 				}