Merge branch 'master' into yz-outtime
This commit is contained in:
commit
f9bca525ff
|
@ -110,10 +110,8 @@
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
const { product_name, status, show_url, card_number, card_password, use_coupon, product } = res.data;
|
const { product_name, status, show_url, card_number, card_password, use_coupon, product, mask_card_password } = res.data;
|
||||||
|
card_look_pwd.value = mask_card_password;
|
||||||
card_look_pwd.value = card_password.substring(0, 16); // 只用于展示
|
|
||||||
|
|
||||||
goods.value = { product_name, time: res.data.goods.end_time, status, show_url, card_number, card_password, card_show: res.data.goods.card_show, use_coupon, detail_url: product.detail_url };
|
goods.value = { product_name, time: res.data.goods.end_time, status, show_url, card_number, card_password, card_show: res.data.goods.card_show, use_coupon, detail_url: product.detail_url };
|
||||||
// 领取成功结算 5
|
// 领取成功结算 5
|
||||||
if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5 && status === 2) {
|
if (bm_obj_data && !bm_obj_data.settlement_data.is_settlement && bm_obj_data.settlement_data.settlement_type === 5 && status === 2) {
|
||||||
|
@ -155,6 +153,7 @@
|
||||||
let key = sessionStorage.getItem('orderNumber')
|
let key = sessionStorage.getItem('orderNumber')
|
||||||
key = key.substring(0, 16);
|
key = key.substring(0, 16);
|
||||||
new_number = decrypt(number, key)
|
new_number = decrypt(number, key)
|
||||||
|
card_look_pwd.value = new_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
var aux = document.createElement("input");
|
var aux = document.createElement("input");
|
||||||
|
|
Loading…
Reference in New Issue