Commit 8be79450c79e7a5a94577594cc66ceb0a0a94813
Merge branch 'dev' into 'test'
Dev See merge request !681
Showing
2 changed files
with
3 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -4070,7 +4070,7 @@ Page({ | @@ -4070,7 +4070,7 @@ Page({ | ||
| 4070 | } | 4070 | } |
| 4071 | 4071 | ||
| 4072 | var share_title=th.data.data.goods_name; | 4072 | var share_title=th.data.data.goods_name; |
| 4073 | - if(th.data.prom_type==1 || th.data.prom_type==4){ | 4073 | + if(th.data.prom_type==1 || th.data.prom_type==6){ |
| 4074 | share_title=th.data.prom_act.share_title; | 4074 | share_title=th.data.prom_act.share_title; |
| 4075 | if(!share_title) share_title=th.data.prom_act.title; | 4075 | if(!share_title) share_title=th.data.prom_act.title; |
| 4076 | } | 4076 | } |
pages/user/index/filter.wxs
| @@ -15,6 +15,8 @@ var is_close = function (name,c_list) { | @@ -15,6 +15,8 @@ var is_close = function (name,c_list) { | ||
| 15 | map['我的评价']="13"; | 15 | map['我的评价']="13"; |
| 16 | map['我的礼包']="14"; | 16 | map['我的礼包']="14"; |
| 17 | map['助力活动']="15"; | 17 | map['助力活动']="15"; |
| 18 | + map['充值有礼']="16"; | ||
| 19 | + map['幸运大转盘']="17"; | ||
| 18 | var index=map[name]; | 20 | var index=map[name]; |
| 19 | 21 | ||
| 20 | //我的权益要判断5，和11 | 22 | //我的权益要判断5，和11 |