From 763c4721af7a93e7cee92d2b113e43f56c630ed3 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 19 Apr 2021 11:47:58 +0800
Subject: [PATCH] 上下架商品默认降序排列，搜索框无法搜索问题修改

---
 packageA/pages/distribution/goods/goods.js   | 25 +++++++++++++++++--------
 packageA/pages/distribution/goods/goods.wxml |  4 ++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js
index aa18b73..264bb3d 100644
--- a/packageA/pages/distribution/goods/goods.js
+++ b/packageA/pages/distribution/goods/goods.js
@@ -102,6 +102,7 @@ Page({
 					// url = '/api/weshop/goods/page?dis_type=1';
 					// this.getData(true, '/api/weshop/goods/page?dis_type=1', this.data.currentQuery);
 				};
+				currentQuery.orderType = 'desc';
 				currentQuery.dis_type = 1;
 				this.getData(true, url, currentQuery);
 				
@@ -325,7 +326,7 @@ Page({
 		if(data.orderField) delete data.orderField;
 		if(data.orderType) delete data.orderType;
 		if(this.data.inputVal) {
-			data.key = this.data.inputVal;
+			data.key_str = this.data.inputVal;
 		};
 		if(this.data.isHiddenDropdown) {
 			if(data.nation_id) delete data.nation_id;
@@ -347,8 +348,8 @@ Page({
 			url = '/api/weshop/goods/page?searchtype=1';
 		};
 		this.getData(true, url, data)
-		.then(function() {
-			callback();
+		.then(function(callback) {
+			if(callback) callback();
 		});
 	},
 	
@@ -357,6 +358,7 @@ Page({
 	 */
 	clickSort() {
 		let data = this.data.currentQuery;
+		// if(data.orderType == 'desc') delete data.orderType;
 		if(!this.data.isSort) {
 			this.setData({
 				isSort: true,
@@ -401,8 +403,11 @@ Page({
 				isDescending = false;
 			};
 		};
+		
 		if(data.page) delete data.page;
 		if(data.key) delete data.key;
+		
+		// data.orderType = 'desc';
 		// if(data.nation_id) delete data.nation_id;
 		// if(data.brand_id) delete data.brand_id;
 		// if(data.startprice) delete data.startprice;
@@ -421,7 +426,8 @@ Page({
 		switch(currentIndex) {
 			case 0: {
 				if(data.orderField) delete data.orderField;
-				if(data.orderType) delete data.orderType;
+				// if(data.orderType) delete data.orderType;
+				data.orderType = 'desc';
 				if(options.index == 1) {//下架：已选
 					data.searchtype = 1;
 					data.dis_type = 1;
@@ -430,29 +436,32 @@ Page({
 			};
 			case 1: {
 				if(options.index == 0) {//上架：销量排序
-					if(data.orderType) delete data.orderType;
+					// if(data.orderType) delete data.orderType;
 					data.orderField = 'sales_sum';
 				} else {//下架：必营
 					if(data.searchtype) delete data.searchtype;
 					if(data.orderField) delete data.orderField;
-					if(data.orderType) delete data.orderType;
+					// if(data.orderType) delete data.orderType;
 					data.dis_type = 0;
 				};
+				data.orderType = 'desc';
 				break;
 			};
 			case 2: {
 				if(options.index == 0) {//上架：评论排序
-					if(data.orderType) delete data.orderType;
+					// if(data.orderType) delete data.orderType;
 					data.orderField = 'comment_count';
 				} else {//下架：销量排序
-					if(data.orderType) delete data.orderType;
+					// if(data.orderType) delete data.orderType;
 					data.orderField = 'sales_sum';
 					data.dis_type = 1;
 					data.searchtype = 1;
 				};
+				data.orderType = 'desc';
 				break;
 			};
 			case 3: {
+				// if(data.orderType) delete data.orderType;
 				data.orderField = 'shop_price';
 				data.dis_type = 1;
 				break;
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 5ceadbf..d30dabd 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -13,13 +13,13 @@
 			
 			<view class="dropdown {{isHiddenDropdown ? '':'show'}}" hidden="{{isHiddenDropdown}}">
 				<view class="dropdown-wrapper">
-					<view class="pd20 bsbb">
+					<view class="pd20 bsbb" wx:if="{{nationList.length != 0}}">
 						<view class="pdb20">国家</view>
 						<view class="flex wrap t-c" bindtap="select">
 							<view class="w25 pdt20" wx:for="{{nationList}}"><text class="label {{nationIndex == index ? 'selected':''}}" data-id="{{item.nation_id}}" data-name="nation" data-index="{{index}}">{{item.name}}</text></view>
 						</view>
 					</view>
-					<view class="pd20 bsbb" >
+					<view class="pd20 bsbb" wx:if="{{brandList.length != 0}}">
 						<view class="pdb20">品牌</view>
 						<view class="flex wrap t-c" bindtap="select">
 							<view class="w25 pdt20" wx:for="{{brandList}}"><text class="label {{brandIndex == index ? 'selected':''}}" data-id="{{item.brand_id}}" data-name="brand" data-index="{{index}}">{{item.name}}</text></view>
--
libgit2 0.21.4