wxd / MShopWeApp

Commit eff0a50cf02db5a95567e86b273a32de55920fd1

Authored by 后端研发-苏明海
2 parents bf6d3dba b031af4b

Merge branch 'test' into 'qa' 

Test

See merge request !906
Inline Side-by-side
Showing 5 changed files with 33 additions and 3 deletions
components/diy_goodsGroup/g_filter.wxs
  View file @eff0a50
... ... @@ -93,7 +93,11 @@ var g_filters = {
93 93 var url = '';
94 94 if(item.prom_type == 9) {
95 95 url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
96   - } else {
  96 + }
  97 + else if(item.prom_type==8){
  98 + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
  99 + }
  100 + else {
97 101 url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
98 102 };
99 103 return url;
... ... @@ -107,5 +111,5 @@ module.exports = {
107 111 is_has_rank:g_filters.is_has_rank,
108 112 get_card_price:g_filters.get_card_price,
109 113 get_border_type:g_filters.get_border_type,
110   - get_url_by_type: g_filters.get_url_by_type,
  114 + get_url_by_type: g_filters.get_url_by_type,
111 115 }
... ...
components/goods_list/g_filter.wxs
  View file @eff0a50
... ... @@ -62,8 +62,24 @@ var g_filters = {
62 62 if(min_name.length>4 ) min_name=min_name.substring(0, 8);
63 63 return min_name;
64 64 },
  65 +
  66 + get_url_by_type: function(item) {
  67 + var url = '';
  68 + if(item.prom_type == 9) {
  69 + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
  70 + }
  71 + else if(item.prom_type==8){
  72 + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
  73 + }
  74 + else {
  75 + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
  76 + };
  77 + return url;
  78 + },
  79 +
65 80 }
66 81 module.exports = {
67 82 is_has_rank:g_filters.is_has_rank,
68 83 get_card_price:g_filters.get_card_price,
  84 + get_url_by_type:g_filters.get_url_by_type,
69 85 }
70 86 \ No newline at end of file
... ...
components/goods_list/goods_list.wxml
  View file @eff0a50
... ... @@ -4,7 +4,9 @@
4 4 <view class="collects">
5 5 <view class="hang ">
6 6 <!-- 商品详情 -->
7   - <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">
  7 +
  8 + <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{get_url_by_type(item)}}">
  9 + <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">-->
8 10 <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> -->
9 11 <navigator url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}" hover-class="none">
10 12 <!-- 商品图⽚ -->
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @eff0a50
... ... @@ -2369,6 +2369,8 @@ Page({
2369 2369 });
2370 2370  
2371 2371  
  2372 +
  2373 +
2372 2374 that.check_is_youhui(gid, that.data.is_normal);
2373 2375  
2374 2376 this.get_sto(that.data.is_normal);
... ... @@ -3125,6 +3127,7 @@ Page({
3125 3127 this.get_sto();
3126 3128 this.get_sku(o.stoid, this.data.data, gid);
3127 3129 this.check_has_flash();
  3130 + this.data.is_normal=1;
3128 3131 this.check_is_youhui(gid,1);
3129 3132 return false;
3130 3133 }
... ...
pages/goods/goodsList/g_filter.wxs
  View file @eff0a50
... ... @@ -79,9 +79,14 @@ var g_filters = {
79 79 if(min_name.length>4) min_name=min_name.substring(0, 8);
80 80 return min_name;
81 81 },
  82 +
82 83 //跳转的接口
83 84 get_goods_url:function(item){
84 85 var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
  86 +
  87 + if(item.prom_type == 9) {
  88 + url1 = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
  89 + }
85 90 if(item.prom_type==8){
86 91 url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
87 92 }
... ...