Merge branch 'master' into optimize_2.0.6
* master: style:删除无效包结构 fix:修复线上白名单兑换token值有误
This commit is contained in:
commit
2f9939e719
|
@ -338,8 +338,8 @@
|
|||
sessionStorage.setItem('goodsCount', goodsArr.length);
|
||||
if (goodsArr && goodsArr.length == 1 && goodsArr[0].available == 1) {
|
||||
sessionStorage.setItem('goodsInfo', JSON.stringify(goodsArr[0]));
|
||||
sessionStorage.setItem('key', goodsArr[0].key);
|
||||
sessionStorage.setItem('token', goodsArr[0].token);
|
||||
localStorage.setItem('key', goodsArr[0].key);
|
||||
localStorage.setItem('token', goodsArr[0].token);
|
||||
window.location.replace(goodsArr[0].type == 1 ? "./exchange.html" : "./reduce.html?v=2");
|
||||
return false;
|
||||
} else if (goodsArr && goodsArr.length >= 1) {
|
||||
|
@ -439,8 +439,8 @@
|
|||
if (gstatus == 1) {
|
||||
// 跳转商品详情页面
|
||||
if (this.showType == 1) { //白名单
|
||||
sessionStorage.setItem('token', row.token);
|
||||
sessionStorage.setItem('key', row.key);
|
||||
localStorage.setItem('token', row.token);
|
||||
localStorage.setItem('key', row.key);
|
||||
}
|
||||
sessionStorage.setItem('goodsInfo', JSON.stringify(row));
|
||||
//type :1 兑换码 2:立减金
|
||||
|
|
Loading…
Reference in New Issue