diff --git a/api/community.js b/api/community.js index 054cd2b4..ac6172ff 100644 --- a/api/community.js +++ b/api/community.js @@ -52,4 +52,6 @@ export const apiArr = { tradeQuery: "/api/v2/wechat/community-order-pay/trade-query", //缴费查单 checkComm: "/api/v2/wechat/community/check-comm", //检查小区是否属于当前用户 + + delPay: "/api/v2/wechat/community-order-pay/del", //检查小区是否属于当前用户 }; diff --git a/packages/community/propertyPayment/index.vue b/packages/community/propertyPayment/index.vue index 55165131..f44fae20 100644 --- a/packages/community/propertyPayment/index.vue +++ b/packages/community/propertyPayment/index.vue @@ -401,7 +401,7 @@ export default { } }); }); - this.currentMoney = money; + this.currentMoney = money ? money.toFixed(2) : 0.00; }, //具体选择 itemsCheckChange(e, indes, index) { @@ -425,7 +425,7 @@ export default { } }); }); - this.currentMoney = money; + this.currentMoney = money ? money.toFixed(2) : 0.00; }, //切换支付方式 changePayType(e) { @@ -486,42 +486,42 @@ export default { await request(apiArr.OrderPay, "POST", { order_pay_id: this.payInfoId }).then( async (res) => { if (res && res.timeStamp && res.nonceStr && res.package && res.signType && res.paySign) { - // 调用微信支付 - uni.requestPayment({ - timeStamp: res.timeStamp, - nonceStr: res.nonceStr, - package: res.package, - signType: res.signType, - paySign: res.paySign, - success: (payRes) => { - const params = { - order_pay_id: this.payInfoId, - } - request(apiArr.tradeQuery, "POST", params).then(res => { - }) - }, - fail: (payErr) => { - uni.showToast({ - title: payErr.errMsg == 'requestPayment:fail cancel' ? '已取消支付' : '支付失败', - icon: 'none' - }) - const params = { - order_ids: orderId, - } - request(apiArr.cancelPay, "POST", params).then(res => { - }) - }, - complete: () => { - // 支付完成后的回调,无论成功失败都会执行 - } + // 调用微信支付 + uni.requestPayment({ + timeStamp: res.timeStamp, + nonceStr: res.nonceStr, + package: res.package, + signType: res.signType, + paySign: res.paySign, + success: (payRes) => { + const params = { + order_pay_id: this.payInfoId, + } + request(apiArr.tradeQuery, "POST", params).then(res => { }) - } else { - console.error("获取支付参数失败,缺少必要参数") + }, + fail: (payErr) => { uni.showToast({ - title: '获取支付信息失败', - icon: 'none' + title: payErr.errMsg == 'requestPayment:fail cancel' ? '已取消支付' : '支付失败', + icon: 'none' }) - } + const params = { + order_pay_id: this.payInfoId, + } + request(apiArr.delPay, "POST", params).then(res => { + }) + }, + complete: () => { + // 支付完成后的回调,无论成功失败都会执行 + } + }) + } else { + console.error("获取支付参数失败,缺少必要参数") + uni.showToast({ + title: '获取支付信息失败', + icon: 'none' + }) + } } ); }, diff --git a/packages/community/providentFund/index.vue b/packages/community/providentFund/index.vue index 02c6d07a..512e028c 100644 --- a/packages/community/providentFund/index.vue +++ b/packages/community/providentFund/index.vue @@ -10,7 +10,7 @@ 物业公积金 - ¥{{ moeny }} + ¥{{ getTotal(list.owners) }} total + owner.property_fund_balance, 0).toFixed(2); + }, headerConfirmClick(item) { this.defaultName = { ...item, diff --git a/packages/customerService/chattingRecords/index.vue b/packages/customerService/chattingRecords/index.vue index ca0ab2d3..8507d379 100644 --- a/packages/customerService/chattingRecords/index.vue +++ b/packages/customerService/chattingRecords/index.vue @@ -8,7 +8,7 @@ - + {{ record.contact_name }} @@ -23,7 +23,7 @@