Commit 152bf7b68c1444d19ce880ef24678eadb663e630
1 parent
59523df8
跳转的bug优化
Showing
3 changed files
with
9 additions
and
6 deletions
components/diy_pregoods/diy_pregoods.wxml
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | <view class='sp'> |
16 | 16 | <swiper-item class="s_it" wx:for="{{goods_array}}"> |
17 | 17 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
18 | - <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1"> | |
18 | + <navigator url="/packageC/pages/presell/{{aitem.goods_type==1?'cardInfo':'goodsInfo'}}}/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1"> | |
19 | 19 | <view class='one'> |
20 | 20 | <view class='sp_top'> |
21 | 21 | <view class='po'></view> |
... | ... | @@ -75,9 +75,12 @@ |
75 | 75 | </swiper> |
76 | 76 | |
77 | 77 | <view class="sp2" wx:if="{{object.style==2}}"> |
78 | + | |
79 | + | |
78 | 80 | <block wx:for="{{goods_array}}"> |
79 | 81 | <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> |
80 | - <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1"> | |
82 | + | |
83 | + <navigator url="/packageC/pages/presell/{{aitem.goods_type==1?'cardInfo':'goodsInfo'}}/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1"> | |
81 | 84 | <view class='one1'> |
82 | 85 | |
83 | 86 | <view class="o1_img"> | ... | ... |
components/diy_public/diy_public.js
... | ... | @@ -106,7 +106,7 @@ Component({ |
106 | 106 | if (this.data.prom_type==8) { //预售 |
107 | 107 | this.setData({ |
108 | 108 | prom_text:'已售', |
109 | - nav1:'/packageC/pages/presell/goodsInfo/goodsInfo?', | |
109 | + nav1:'/packageC/pages/presell/cardInfo/goodsInfo?', | |
110 | 110 | nav2:'/packageC/pages/presell/goodsInfo/goodsInfo?' |
111 | 111 | }) |
112 | 112 | } | ... | ... |
packageC/pages/presell/list/list.wxml
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | </navigator> |
34 | 34 | <view class="kill-cont"> |
35 | 35 | <navigator class="goods-name ellipsis-2" |
36 | - url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">{{item.goods_name}}</navigator> | |
36 | + url="/packageC/pages/presell/{{item.goods_type?'cardInfo':'goodsInfo'}}/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">{{item.goods_name}}</navigator> | |
37 | 37 | <view class="flex-vertical xc-strip-frame"> |
38 | 38 | <view class="xc-strip-blank rel"> |
39 | 39 | |
... | ... | @@ -66,9 +66,9 @@ |
66 | 66 | </view> |
67 | 67 | </view> |
68 | 68 | <view class="kill-btn "> |
69 | - <navigator wx:if="{{item.type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator> | |
69 | + <navigator wx:if="{{item.type==1}}" url="/packageC/pages/presell/{{item.goods_type?'cardInfo':'goodsInfo'}}/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator> | |
70 | 70 | <!-- <navigator wx:else url="/packageC/pages/presell/pregoodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator> --> |
71 | - <navigator wx:else url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator> | |
71 | + <navigator wx:else url="/packageC/pages/presell/{{item.goods_type?'cardInfo':'goodsInfo'}}/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}" style="background:#059de5;"><view style="color:#fff;">即将开始</view></navigator> | |
72 | 72 | </view> |
73 | 73 | |
74 | 74 | </view> | ... | ... |