服务费bug修改

pages/cash/index.vue

@@ -303,7 +303,15 @@
 			 */
 			setServiceType(data) {
 				if (data && data.serviceType) {
-					return data.serviceType == 1 ? ('￥' + data.serviceCharge) : data.serviceCharge
+					if(data.serviceType == 1){
+						return ('￥' + data.serviceCharge)
+					}else {
+						let num1 = this.withdrawInfo.serviceCharge;
+						let num = isNaN(num1) ? 0 : (Number(num1) / 100)
+						let money = num ? this.moneyValue * num : Number(this.moneyValue)
+						return money
+						
+					}
 				}
 			},
 			/**
@@ -315,11 +323,11 @@
 					money = this.moneyValue - (isNaN(this.withdrawInfo.serviceCharge) ? 0 : this.withdrawInfo
 						.serviceCharge)
 				} else if (this.withdrawInfo.serviceType == 2) {
-					let num1 = this.withdrawInfo.serviceCharge.replace("%", '')
+					let num1 = this.withdrawInfo.serviceCharge;
 					let num = isNaN(num1) ? 0 : (Number(num1) / 100)
 					money = num ? this.moneyValue * num : Number(this.moneyValue)
 				}
-				this.moneyAccount = money < 0 ? '金额过小于零' : money.toFixed(2)
+				this.moneyAccount = money < 0 ? '金额过小于零' : this.moneyValue - money.toFixed(2) 
 			},
 			browserBack() {
 				console.log(1);

pages/passwordSet/index.vue

@@ -33,7 +33,7 @@
 				title: '这是我的',
 				statusBarHeight: 0, // 状态栏安全距离
 				value: "",
-				tip: ["输入当前密码，以确认身份","设置六位数数字密码","再次输入"],
+				tip: ["输入当前密码，用于确认身份","设置六位数数字密码","再次输入"],
 				actionIndex: 0,
 				password: '',
 				withdrawInfo: {}