Commit d582f224a9dad757f65c49e1bfea046d02e99f4a
1 parent
d18d66d2
上下架搜索框修改
Showing
2 changed files
with
9 additions
and
4 deletions
packageA/pages/distribution/goods/goods.js
@@ -327,21 +327,26 @@ Page({ | @@ -327,21 +327,26 @@ Page({ | ||
327 | */ | 327 | */ |
328 | search(callback) { | 328 | search(callback) { |
329 | let url = ''; | 329 | let url = ''; |
330 | + let currentTabIndex = 0; | ||
330 | let data = this.data.currentQuery; | 331 | let data = this.data.currentQuery; |
331 | if(data.orderField) delete data.orderField; | 332 | if(data.orderField) delete data.orderField; |
332 | if(data.orderType) delete data.orderType; | 333 | if(data.orderType) delete data.orderType; |
333 | - if(this.data.inputVal) { | 334 | + // if(this.data.inputVal) { |
334 | data.key_str = this.data.inputVal; | 335 | data.key_str = this.data.inputVal; |
335 | - }; | 336 | + |
337 | + // }; | ||
336 | if(this.data.isHiddenDropdown) { | 338 | if(this.data.isHiddenDropdown) { |
337 | if(data.nation_id) delete data.nation_id; | 339 | if(data.nation_id) delete data.nation_id; |
338 | if(data.brand_id) delete data.brand_id; | 340 | if(data.brand_id) delete data.brand_id; |
339 | if(data.startprice) delete data.startprice; | 341 | if(data.startprice) delete data.startprice; |
340 | if(data.endprice) delete data.endprice; | 342 | if(data.endprice) delete data.endprice; |
341 | }; | 343 | }; |
344 | + if(data.key_str != '') { | ||
345 | + currentTabIndex = 5; | ||
346 | + }; | ||
342 | this.setData({ | 347 | this.setData({ |
343 | list: null, | 348 | list: null, |
344 | - currentTabIndex: 5 | 349 | + currentTabIndex, |
345 | }); | 350 | }); |
346 | // console.log('data', data); | 351 | // console.log('data', data); |
347 | 352 |
packageA/pages/distribution/goods/goods.wxml
@@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
206 | </block> | 206 | </block> |
207 | </block> | 207 | </block> |
208 | <!-- <view class="money fs32 c-red">{{item.market_price}}</view> --> | 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 | </view> | 210 | </view> |
211 | </view> | 211 | </view> |
212 | </view> | 212 | </view> |