diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js index e3c1588..466737a 100644 --- a/packageA/pages/distribution/goods/goods.js +++ b/packageA/pages/distribution/goods/goods.js @@ -327,21 +327,26 @@ Page({ */ search(callback) { let url = ''; + let currentTabIndex = 0; let data = this.data.currentQuery; if(data.orderField) delete data.orderField; if(data.orderType) delete data.orderType; - if(this.data.inputVal) { + // if(this.data.inputVal) { data.key_str = this.data.inputVal; - }; + + // }; if(this.data.isHiddenDropdown) { if(data.nation_id) delete data.nation_id; if(data.brand_id) delete data.brand_id; if(data.startprice) delete data.startprice; if(data.endprice) delete data.endprice; }; + if(data.key_str != '') { + currentTabIndex = 5; + }; this.setData({ list: null, - currentTabIndex: 5 + currentTabIndex, }); // console.log('data', data); diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index d30dabd..aa6f6a3 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -206,7 +206,7 @@ - 分成金额:{{item.commission}} + 分成金额:{{filter.toFix(item.commission, 2)}} diff --git a/packageA/pages/service_share/service_share.js b/packageA/pages/service_share/service_share.js index ded4795..0c7f8c5 100644 --- a/packageA/pages/service_share/service_share.js +++ b/packageA/pages/service_share/service_share.js @@ -167,9 +167,9 @@ Page({ active2: !this.data.active2 }); }; - if(this.data.orderField!="shop_price"){ + if(this.data.orderField!="money"){ this.setData({ - active1: 1,orderField:'shop_price',orderType:'asc',is_no_data:0,is_no_more:0,list:[], + active1: 1,orderField:'money',orderType:'asc',is_no_data:0,is_no_more:0,list:[], }); }else{ @@ -861,8 +861,8 @@ Page({ goto:function(e) { - var url = e.currentTarget.dataset.url; - app.goto(url); + var url = e.currentTarget.dataset.url; + app.goto(url); }, diff --git a/packageA/pages/service_share/service_share.wxml b/packageA/pages/service_share/service_share.wxml index 1282ef9..b1319a4 100644 --- a/packageA/pages/service_share/service_share.wxml +++ b/packageA/pages/service_share/service_share.wxml @@ -12,7 +12,7 @@ 销量 - + 价格 @@ -37,11 +37,11 @@ > - + - + data-errorimg="list[{{index}}].imgUrl" mode="aspectFit"> {{item.serviceName}} diff --git a/packageA/pages/service_share/service_share.wxss b/packageA/pages/service_share/service_share.wxss index 969bd02..dd8b17b 100644 --- a/packageA/pages/service_share/service_share.wxss +++ b/packageA/pages/service_share/service_share.wxss @@ -67,7 +67,7 @@ page { } .img-container { background-color: #f0f0f0; - width: 280rpx; + width: 248rpx; height: 248rpx; display: flex; align-items: center;