Commit ac7bb383d1210710fd3e535485a09da25d089b12
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
5 changed files
with
18 additions
and
13 deletions
packageA/pages/distribution/goods/goods.js
| ... | ... | @@ -327,21 +327,26 @@ Page({ |
| 327 | 327 | */ |
| 328 | 328 | search(callback) { |
| 329 | 329 | let url = ''; |
| 330 | + let currentTabIndex = 0; | |
| 330 | 331 | let data = this.data.currentQuery; |
| 331 | 332 | if(data.orderField) delete data.orderField; |
| 332 | 333 | if(data.orderType) delete data.orderType; |
| 333 | - if(this.data.inputVal) { | |
| 334 | + // if(this.data.inputVal) { | |
| 334 | 335 | data.key_str = this.data.inputVal; |
| 335 | - }; | |
| 336 | + | |
| 337 | + // }; | |
| 336 | 338 | if(this.data.isHiddenDropdown) { |
| 337 | 339 | if(data.nation_id) delete data.nation_id; |
| 338 | 340 | if(data.brand_id) delete data.brand_id; |
| 339 | 341 | if(data.startprice) delete data.startprice; |
| 340 | 342 | if(data.endprice) delete data.endprice; |
| 341 | 343 | }; |
| 344 | + if(data.key_str != '') { | |
| 345 | + currentTabIndex = 5; | |
| 346 | + }; | |
| 342 | 347 | this.setData({ |
| 343 | 348 | list: null, |
| 344 | - currentTabIndex: 5 | |
| 349 | + currentTabIndex, | |
| 345 | 350 | }); |
| 346 | 351 | // console.log('data', data); |
| 347 | 352 | ... | ... |
packageA/pages/distribution/goods/goods.wxml
| ... | ... | @@ -206,7 +206,7 @@ |
| 206 | 206 | </block> |
| 207 | 207 | </block> |
| 208 | 208 | <!-- <view class="money fs32 c-red">{{item.market_price}}</view> --> |
| 209 | - <view class="fs24 c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view> | |
| 209 | + <view class="fs24 c-a">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view> | |
| 210 | 210 | </view> |
| 211 | 211 | </view> |
| 212 | 212 | </view> | ... | ... |
packageA/pages/service_share/service_share.js
| ... | ... | @@ -167,9 +167,9 @@ Page({ |
| 167 | 167 | active2: !this.data.active2 |
| 168 | 168 | }); |
| 169 | 169 | }; |
| 170 | - if(this.data.orderField!="shop_price"){ | |
| 170 | + if(this.data.orderField!="money"){ | |
| 171 | 171 | this.setData({ |
| 172 | - active1: 1,orderField:'shop_price',orderType:'asc',is_no_data:0,is_no_more:0,list:[], | |
| 172 | + active1: 1,orderField:'money',orderType:'asc',is_no_data:0,is_no_more:0,list:[], | |
| 173 | 173 | }); |
| 174 | 174 | }else{ |
| 175 | 175 | |
| ... | ... | @@ -861,8 +861,8 @@ Page({ |
| 861 | 861 | |
| 862 | 862 | |
| 863 | 863 | goto:function(e) { |
| 864 | - var url = e.currentTarget.dataset.url; | |
| 865 | - app.goto(url); | |
| 864 | + var url = e.currentTarget.dataset.url; | |
| 865 | + app.goto(url); | |
| 866 | 866 | }, |
| 867 | 867 | |
| 868 | 868 | ... | ... |
packageA/pages/service_share/service_share.wxml
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | <view class="title"> |
| 13 | 13 | <view class="title-item f1" bindtap="sale_sort">销量</view> |
| 14 | 14 | |
| 15 | - <block wx:if="{{orderField=='shop_price'}}"> | |
| 15 | + <block wx:if="{{orderField=='money'}}"> | |
| 16 | 16 | <view class="title-item f1" bindtap="sort1">价格<text class="iconfont {{orderType=='asc'?'icon-shang':'icon-xia'}}"></text></view> |
| 17 | 17 | </block> |
| 18 | 18 | <block wx:else> |
| ... | ... | @@ -37,11 +37,11 @@ |
| 37 | 37 | > |
| 38 | 38 | <block wx:for="{{list}}"> |
| 39 | 39 | <!-- <view class class="list-item" bindtap="go_goods" data-index="{{index}}"> --> |
| 40 | - <view class class="list-item" bindtap="goto" data-index="{{index}}" data-url="{{'/packageA/pages/cardDetails/cardDetails?id=' + item.id}}"> | |
| 40 | + <view class class="list-item" bindtap="goto" data-index="{{index}}" data-url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id=' + item.id}}"> | |
| 41 | 41 | <view class="img-container"> |
| 42 | - <image src="{{url+item.original_img}}" style="width: 100%; height: 100%;" | |
| 42 | + <image src="{{url+item.imgUrl}}" style="width: 100%; height: 100%;" | |
| 43 | 43 | binderror="bind_bnerr2" lazy-load="true" |
| 44 | - data-errorimg="list[{{index}}].original_img"></image> | |
| 44 | + data-errorimg="list[{{index}}].imgUrl" mode="aspectFit"></image> | |
| 45 | 45 | </view> |
| 46 | 46 | <view class="details"> |
| 47 | 47 | <view class="ellipsis-2 fs28 name">{{item.serviceName}}</view> | ... | ... |