Commit e7e5cd1171c8f87bd4fa122faab791dce2c8c671
1 parent
1e32e743
收藏夹、分类修改
Showing
3 changed files
with
15 additions
and
3 deletions
packageB/pages/user/collect_list/collect_list.js
| @@ -88,10 +88,14 @@ Page({ | @@ -88,10 +88,14 @@ Page({ | ||
| 88 | for (var e = 0; e < this.data.collects.length; e++) | 88 | for (var e = 0; e < this.data.collects.length; e++) |
| 89 | if (this.data.collects[e].collect_id == t) { | 89 | if (this.data.collects[e].collect_id == t) { |
| 90 | this.data.collects.splice(e, 1), this.setData({ | 90 | this.data.collects.splice(e, 1), this.setData({ |
| 91 | - collects: this.data.collects | 91 | + collects: this.data.collects, |
| 92 | }); | 92 | }); |
| 93 | break; | 93 | break; |
| 94 | } | 94 | } |
| 95 | + | ||
| 96 | + this.setData({ | ||
| 97 | + total_collects: this.data.collects.length, | ||
| 98 | + }); | ||
| 95 | }, | 99 | }, |
| 96 | //图片失败，默认图片 | 100 | //图片失败，默认图片 |
| 97 | bind_bnerr: function(e) { | 101 | bind_bnerr: function(e) { |
packageB/pages/user/collect_list/collect_list.wxml
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | <!-- 商品集合 --> | 22 | <!-- 商品集合 --> |
| 23 | <view class="{{editEd?'collects_max colls_max':'collects_max'}}"> | 23 | <view class="{{editEd?'collects_max colls_max':'collects_max'}}"> |
| 24 | <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}" | 24 | <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}" |
| 25 | - data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:''}}"> | 25 | + data-url="{{item.type == 1 ? '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + item.goods_id : (editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:'')}}"> |
| 26 | 26 | ||
| 27 | <view class="radioCheck iconClick" wx:if="{{editEd}}"> | 27 | <view class="radioCheck iconClick" wx:if="{{editEd}}"> |
| 28 | <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio> | 28 | <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio> |
| @@ -56,7 +56,12 @@ | @@ -56,7 +56,12 @@ | ||
| 56 | </view> | 56 | </view> |
| 57 | 57 | ||
| 58 | <view class="money_right flex line" wx:if="{{!editEd}}"> | 58 | <view class="money_right flex line" wx:if="{{!editEd}}"> |
| 59 | - <view class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}"> | 59 | + <!-- 卡项订单 --> |
| 60 | + <view wx:if="{{item.type == 1}}" class="similar flex-level fs22" catchtap="go_to" data-url="/packageA/pages/cardList/cardList?cat_id={{item.cat_id}}"> | ||
| 61 | + <view>找相似</view> | ||
| 62 | + </view> | ||
| 63 | + <!-- 其他 --> | ||
| 64 | + <view wx:elif="{{item.type == 0}}" class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}"> | ||
| 60 | <view>找相似</view> | 65 | <view>找相似</view> |
| 61 | </view> | 66 | </view> |
| 62 | <image src="{{url}}miniapp/images/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image> | 67 | <image src="{{url}}miniapp/images/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image> |
pages/goods/categoryList/categoryList.js
| @@ -706,6 +706,9 @@ Page({ | @@ -706,6 +706,9 @@ Page({ | ||
| 706 | // 新的版本分类点击一级分类 | 706 | // 新的版本分类点击一级分类 |
| 707 | click_classify:function(e){ | 707 | click_classify:function(e){ |
| 708 | // 在风格三的时候，才会有current | 708 | // 在风格三的时候，才会有current |
| 709 | + this.setData({ | ||
| 710 | + countDownNum: 3, | ||
| 711 | + }); | ||
| 709 | let cur = e.currentTarget.dataset.current; | 712 | let cur = e.currentTarget.dataset.current; |
| 710 | if(cur) { | 713 | if(cur) { |
| 711 | if (this.data.currentTab == cur) { | 714 | if (this.data.currentTab == cur) { |