diff --git a/packkey/combining.html b/packkey/combining.html
index ef5117c..7a6143b 100644
--- a/packkey/combining.html
+++ b/packkey/combining.html
@@ -167,7 +167,7 @@
/* ******************************************** 官方领取 ******************************************** */
/* 直接领取 */
- directSubmit () {
+ directSubmit() {
/* 公众号打开 */
if (this.goods.group_info.channel == 2 && this.goods.group_info.is_webview == 1 && !this.openId) {
const linkId = localStorage.getItem('linkId');
@@ -209,7 +209,7 @@
},
/* 公众号领取 */
- publicCollection () {
+ publicCollection() {
let params = {
token: this.token,
code_batch_id: this.code_batch_id,
@@ -219,8 +219,19 @@
req.axiosPost("/voucher/groupVoucherGrant", params)
.then((res) => {
if (res.code == 200) {
+ // 领取成功结算 5
+ if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5) {
+ settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
+ }
+
+ // 使用结算 6
+ if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 6) {
+ settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
+ }
+
this.message = '领取成功';
this.getProductDetail();
+
} else {
this.axiosErrorFun(res.code, res.message);
}
@@ -230,6 +241,16 @@
/* 支付宝官方领取H5跳转 */
toLinkAlipay() {
+ // 领取成功结算 5
+ if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5) {
+ settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
+ }
+
+ // 使用结算 6
+ if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 6) {
+ settlementFun(bm_obj_data.token, bm_obj_data.settlement_data.settlement_type);
+ }
+
let self = this;
let banklink = encodeURIComponent(
window.location.origin +