Merge branch 'dev' into 'test'

Dev See merge request !681

Merge branch 'dev' into 'test'
Dev See merge request !681
后端研发-苏明海
2 parents 520b4ff8 6146166b
Showing 2 changed files with 3 additions and 1 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/user/index/filter.wxs
@@ -4070,7 +4070,7 @@ Page({
 		  }
  
 		  var share_title=th.data.data.goods_name;
-		  if(th.data.prom_type==1 || th.data.prom_type==4){
+		  if(th.data.prom_type==1 || th.data.prom_type==6){
              share_title=th.data.prom_act.share_title;
              if(!share_title) share_title=th.data.prom_act.title;
           }
@@ -15,6 +15,8 @@ var is_close = function (name,c_list) {
   map['我的评价']="13";
   map['我的礼包']="14";
   map['助力活动']="15";
+  map['充值有礼']="16";
+  map['幸运大转盘']="17";
   var index=map[name];
  
   //我的权益要判断5，和11