diff --git a/api/order.js b/api/order.js
index 89c5174..c01dbb1 100644
--- a/api/order.js
+++ b/api/order.js
@@ -111,3 +111,7 @@ export function cancelLocalOrder(data) {
export function localOrderList(data) {
return request.post('localStore/localOrderList', data)
}
+
+export function completeAudit(data) {
+ return request.post('gh/CompleteAudit', data)
+}
diff --git a/api/user.js b/api/user.js
index 2a275b0..aae6c70 100644
--- a/api/user.js
+++ b/api/user.js
@@ -412,4 +412,4 @@ export function getScheme() {
export function distributionPay(data) {
return request.post("pay/distributionPay", data)
-}
+}
\ No newline at end of file
diff --git a/bundle/pages/user_spread/user_spread.vue b/bundle/pages/user_spread/user_spread.vue
index 1dec711..5c875be 100644
--- a/bundle/pages/user_spread/user_spread.vue
+++ b/bundle/pages/user_spread/user_spread.vue
@@ -741,6 +741,7 @@
applyDistribute(params).then((res) => {
if (res.code == 1) {
+ const id = res.data.id
gh({
money,
partner_id: partner.id,
@@ -754,7 +755,9 @@
signType: result.data.signType,
timeStamp: result.data.timeStamp,
}
- this.handleWechatPay(pay, result.data.alog_id);
+ const alog_id = result.data.alog_id
+
+ this.handleWechatPay(pay, alog_id, id);
}
})
}
@@ -762,21 +765,22 @@
},
// 微信支付
- handleWechatPay(data, alog_id) {
+ handleWechatPay(data, alog_id, id) {
wxpay(data).then(res => {
console.log('res=', res)
- this.handPayResult(res, alog_id)
+ this.handPayResult(res, alog_id, id)
}).catch(err => {
console.log('err=', err)
})
},
// 支付后处理
- handPayResult(result, alog_id) {
+ handPayResult(result, alog_id, id) {
if (result === 'success') {
this.successPopup = true
checkReturn({
- alog_id
+ alog_id,
+ id
})
} else if (result === 'fail') {
this.cancelPopup = true
diff --git a/bundle_b/pages/subsidy_shop/components/subsidy-item.vue b/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
index b7d5eee..2ceea8f 100644
--- a/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
+++ b/bundle_b/pages/subsidy_shop/components/subsidy-item.vue
@@ -36,6 +36,16 @@
消费订单金额:
¥{{item.order_price}}
+
+
+ 提现金额:
+ ¥{{item.withdrawal_amount}}
+
+
+
+ 可使用金额:
+ ¥{{item.available_amount}}
+