Merge branch 'master' into hot-flx
This commit is contained in:
commit
9e08e0cb26
|
@ -236,7 +236,6 @@
|
||||||
};
|
};
|
||||||
req.axiosPost("/key/usage", data)
|
req.axiosPost("/key/usage", data)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.loading = false;
|
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
sessionStorage.setItem("lastid", self.goodInfo.product_id);
|
sessionStorage.setItem("lastid", self.goodInfo.product_id);
|
||||||
this.orderId = res.data.order_number;
|
this.orderId = res.data.order_number;
|
||||||
|
@ -254,6 +253,7 @@
|
||||||
if (this.goodInfo.entity.is_webview == 1) {
|
if (this.goodInfo.entity.is_webview == 1) {
|
||||||
this.publicCollection(res.data.order_number);
|
this.publicCollection(res.data.order_number);
|
||||||
} else {
|
} else {
|
||||||
|
this.loading = false;
|
||||||
//唤起微信福利官小程序
|
//唤起微信福利官小程序
|
||||||
window.location.replace(res.data.redirect_url);
|
window.location.replace(res.data.redirect_url);
|
||||||
}
|
}
|
||||||
|
@ -287,6 +287,7 @@
|
||||||
};
|
};
|
||||||
req.axiosPost("/voucher/grant", params)
|
req.axiosPost("/voucher/grant", params)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
this.loading = false;
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.openErrorDialog('领取成功');
|
this.openErrorDialog('领取成功');
|
||||||
this.goodInfo.available = 9;
|
this.goodInfo.available = 9;
|
||||||
|
|
Loading…
Reference in New Issue