Commit b5ef82dc8b1a34792f435d5ef18d4269a092b61f
Merge branch 'test' into 'qa'
Test See merge request !447
Showing
2 changed files
with
21 additions
and
3 deletions
pages/goods/categoryList/categoryList.js
| @@ -599,11 +599,29 @@ Page({ | @@ -599,11 +599,29 @@ Page({ | ||
| 599 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 599 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 600 | 600 | ||
| 601 | }, | 601 | }, |
| 602 | + | ||
| 603 | + | ||
| 604 | + //图片失败，默认图片 | ||
| 605 | + bind_bnerr_t3: function (e) { | ||
| 606 | + var _errImg = e.target.dataset.errorimg; | ||
| 607 | + var _errObj = {}; | ||
| 608 | + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; | ||
| 609 | + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | ||
| 610 | + | ||
| 611 | + }, | ||
| 612 | + | ||
| 613 | + | ||
| 614 | + | ||
| 602 | // 新的版本分类点击一级分类 | 615 | // 新的版本分类点击一级分类 |
| 603 | click_classify:function(e){ | 616 | click_classify:function(e){ |
| 604 | let cur = e.currentTarget.dataset.current; | 617 | let cur = e.currentTarget.dataset.current; |
| 605 | - if (this.data.currentTab == cur) { | ||
| 606 | - return false; | 618 | + if (this.data.currentTab == cur ) { |
| 619 | + if(this.data.select_classify_on!=220&&this.data.select_classify_on!=223) { | ||
| 620 | + return false; | ||
| 621 | + } | ||
| 622 | + else if(cur!=0){ | ||
| 623 | + return false; | ||
| 624 | + } | ||
| 607 | } else { | 625 | } else { |
| 608 | wx.pageScrollTo({ | 626 | wx.pageScrollTo({ |
| 609 | scrollTop: 0 | 627 | scrollTop: 0 |
pages/goods/categoryList/categoryList.wxml
| @@ -405,7 +405,7 @@ | @@ -405,7 +405,7 @@ | ||
| 405 | <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}"> | 405 | <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}"> |
| 406 | <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}"> | 406 | <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}"> |
| 407 | <view class="img-wrap"> | 407 | <view class="img-wrap"> |
| 408 | - <image src="{{url+item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image> | 408 | + <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image> |
| 409 | </view> | 409 | </view> |
| 410 | <view class="item-cont"> | 410 | <view class="item-cont"> |
| 411 | <view class="title">{{item.goods_name}}</view> | 411 | <view class="title">{{item.goods_name}}</view> |