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

pages/index/index.vue

@@ -322,6 +322,7 @@
 						yearWithdrawalAmount:null}]);
 					}else if(e=='1'){
 						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
+						this.yearWithdrawalInfos = [];
 					}
 					this.resultShowFlag = false;
 				}
@@ -522,8 +523,8 @@
 							return false;
 						}
 					}
-					if(!this.irrAndSimple.cashValue){
-						this.errorDialog(1,`${irrAndSimpleCalcuteParam.allFirstPayment > 0} ? '总生存利益（万能账户现价+现金价值）' :'现金价值'未输入！`);
+					if(!this.irrAndSimple.cashValue || this.irrAndSimple.cashValue<0){
+						this.errorDialog(1,'请输入现金价值且现金价值只能大于或等于0！');
 						return false;
 					}
 				}