diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 526aba3..5266553 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -104,7 +104,7 @@ Page({ this.resetData(), this.requestOrderList(t.currentTarget.id); }, resetData: function() { - s.resetConfig(), this.data.orderList = null, this.data.currentPage = 1; + s.resetConfig(),this.data.orderList = null, this.data.currentPage = 1; }, @@ -123,6 +123,9 @@ Page({ r += "&order_status=2"; break; } r+="&isdel=0"; + if(this.data.searchContent) { + r+="&keyWord=" + this.data.searchContent; + } this.setData({ activeCategoryId: t }); r = r + "&page=" + e.data.currentPage; s.request(r, function (t) { @@ -1385,6 +1388,7 @@ Page({ console.log('online',this.data.searchContent); if(this.data.searchContent) { console.log(this.data.searchContent); + this.resetData(), this.requestOrderList(this.data.activeCategoryId); } else { wx.showToast({ title: '您还没有输入搜索内容~', @@ -1403,6 +1407,7 @@ Page({ this.setData({ currentPage2: 1, list2: [], + is_no_data2: 0, });