diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js
index 5851082..c445dfd 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)}}