余额支付打通

mobile-code/src/pages/callback/index.vue

@@ -24,7 +24,7 @@
 						<span>￥</span>
 						<span class="app-size-36 app-bold">{{ option.totalPrice }}</span>
 					</div>
-					<div class="surplus app-color-3" v-if="!$util.isEmpty(shopUser)">剩余￥{{ shopUser.userAsset.balance }}</div>
+					<div class="surplus app-color-3" v-if="!$util.isEmpty(shopUser)">余额￥{{ shopUser.userAsset.balance }}</div>
 					<div class="order-num app-color-3">订单号: {{ option.orderSn }}</div>
 				</block>
 				<!-- 待支付 - 订单支付成功 -->
@@ -196,7 +196,7 @@
 					})
 					.catch(e => {
 						this.$msg(e.msg)
-						this.payFail(e)
+						return false
 					})
 			},
 			// 微信支付

mobile-code/src/pages/pay/index.vue

@@ -248,7 +248,8 @@
 					params = {
 						needSend: this.tabIndex == 0 ? '0' : '1',
 						prePrice: this.amount,
-						payWay: this.form.payWay
+						payWay: this.form.payWay,
+						payPassword:this.modalForm.payPassword
 						// sourceType: 1,
 						// shopId: 15680
 					}
@@ -328,7 +329,7 @@
 			},
 			// 余额支付
 			balancePayFn() {
-				if (this.$util.isEmpty(this.shopUser) && this.shopUser.hasPayPwd == 0) {
+				if (!this.$util.isEmpty(this.shopUser) && this.shopUser.hasPayPwd == 0) {
 					this.setPassModal = true
 				} else {
 					this.form.payWay = 2