diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.js b/sourcecode/alipay/default/pages/goods-search/goods-search.js index a4665c531..3250cda69 100755 --- a/sourcecode/alipay/default/pages/goods-search/goods-search.js +++ b/sourcecode/alipay/default/pages/goods-search/goods-search.js @@ -75,7 +75,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -88,14 +88,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding my.showLoading({ content: "加载中..." }); @@ -113,47 +106,21 @@ Page({ my.hideLoading(); my.stopPullDownRefresh(); if (res.data.code == 0) { - var data = res.data.data; - - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) - { + var data = res.data.data; this.setData({ - search_map_info: data.search_map_info || [], - brand_list: data.brand_list || [], - category_list: data.category_list || [], - screening_price_list: data.screening_price_list || [], - goods_params_list: data.goods_params_list || [], - goods_spec_list: data.goods_spec_list || [], + search_map_info: data.search_map_info || [], + search_map_list: { + brand_list: data.brand_list || [], + category_list: data.category_list || [], + screening_price_list: data.screening_price_list || [], + goods_params_list: data.goods_params_list || [], + goods_spec_list: data.goods_spec_list || [] + }, + plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data }); - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); - } - } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } + + // 获取数据列表 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -184,6 +151,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + my.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + my.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + my.request({ + url: app.get_request_url("datalist", "search"), + method: "POST", + data: post_data, + dataType: "json", + headers: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + my.hideLoading(); + my.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + my.hideLoading(); + my.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/alipay/default/pages/plugins/shop/search/search.js b/sourcecode/alipay/default/pages/plugins/shop/search/search.js index 5701782bb..3914c42d6 100755 --- a/sourcecode/alipay/default/pages/plugins/shop/search/search.js +++ b/sourcecode/alipay/default/pages/plugins/shop/search/search.js @@ -65,7 +65,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -78,14 +78,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding my.showLoading({content: "加载中..." }); @@ -104,67 +97,27 @@ Page({ my.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + this.setData({ + search_map_info: data.search_map_info || [], + category_list: data.shop_goods_category || [], + }); - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) + // 指定分类id选中处理 + if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) { - this.setData({ - search_map_info: data.search_map_info || [], - category_list: data.shop_goods_category || [], - }); - - // 指定分类id选中处理 - if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) + var temp = this.data.category_list; + for(var i in temp) { - var temp = this.data.category_list; - for(var i in temp) + if(temp[i]['id'] == this.data.params.category_id) { - if(temp[i]['id'] == this.data.params.category_id) - { - temp[i]['active'] = 1; - } - } - this.setData({category_list: temp}); - } - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + temp[i]['active'] = 1; } } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } + this.setData({category_list: temp}); } + + // 获取列表数据 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -184,6 +137,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + my.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + my.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + my.request({ + url: app.get_request_url("datalist", "search", "shop"), + method: "POST", + data: post_data, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + my.hideLoading(); + my.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + my.hideLoading(); + my.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.js b/sourcecode/baidu/default/pages/goods-search/goods-search.js index 7aab19f40..f807553ec 100755 --- a/sourcecode/baidu/default/pages/goods-search/goods-search.js +++ b/sourcecode/baidu/default/pages/goods-search/goods-search.js @@ -74,7 +74,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -87,14 +87,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding swan.showLoading({ title: "加载中..." }); @@ -113,57 +106,20 @@ Page({ swan.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; - - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) - { - this.setData({ + this.setData({ search_map_info: data.search_map_info || [], - brand_list: data.brand_list || [], - category_list: data.category_list || [], - screening_price_list: data.screening_price_list || [], - goods_params_list: data.goods_params_list || [], - goods_spec_list: data.goods_spec_list || [], - }); - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); - } - } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } - } + search_map_list: { + brand_list: data.brand_list || [], + category_list: data.category_list || [], + screening_price_list: data.screening_price_list || [], + goods_params_list: data.goods_params_list || [], + goods_spec_list: data.goods_spec_list || [] + }, + plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data + }); + + // 获取数据列表 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0 @@ -183,6 +139,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + swan.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + swan.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + swan.request({ + url: app.get_request_url("datalist", "search"), + method: "POST", + data: post_data, + dataType: "json", + headers: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + swan.hideLoading(); + swan.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + swan.hideLoading(); + swan.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/baidu/default/pages/plugins/shop/search/search.js b/sourcecode/baidu/default/pages/plugins/shop/search/search.js index 30a4694b9..0967a44c5 100755 --- a/sourcecode/baidu/default/pages/plugins/shop/search/search.js +++ b/sourcecode/baidu/default/pages/plugins/shop/search/search.js @@ -89,7 +89,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -102,15 +102,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } // 加载loding - - + get_data() { swan.showLoading({ title: "加载中..." }); // 参数 @@ -130,71 +122,28 @@ Page({ swan.stopPullDownRefresh(); if (res.data.code == 0) { - var data = res.data.data; // 仅首次请求赋值条件数据 + var data = res.data.data; + this.setData({ + search_map_info: data.search_map_info || [], + category_list: data.shop_goods_category || [], + }); - if (this.data.data_list_loding_status == 1) { - this.setData({ - search_map_info: data.search_map_info || [], - category_list: data.shop_goods_category || [] - }); // 指定分类id选中处理 - - if ((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) { - var temp = this.data.category_list; - - for (var i in temp) { - if (temp[i]['id'] == this.data.params.category_id) { - temp[i]['active'] = 1; - } - } - - this.setData({ - category_list: temp - }); - } - } // 列表数据处理 - - - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + // 指定分类id选中处理 + if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) + { + var temp = this.data.category_list; + for(var i in temp) + { + if(temp[i]['id'] == this.data.params.category_id) + { + temp[i]['active'] = 1; } } - - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); // 是否还有数据 - - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } - } else { - this.setData({ - data_list_loding_status: 0 - }); - - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false - }); - } + this.setData({category_list: temp}); } + + // 获取列表数据 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -214,6 +163,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + swan.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + swan.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + swan.request({ + url: app.get_request_url("datalist", "search", "shop"), + method: "POST", + data: post_data, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + swan.hideLoading(); + swan.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + swan.hideLoading(); + swan.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.js b/sourcecode/qq/default/pages/goods-search/goods-search.js index 78237aadb..80232affc 100755 --- a/sourcecode/qq/default/pages/goods-search/goods-search.js +++ b/sourcecode/qq/default/pages/goods-search/goods-search.js @@ -75,7 +75,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -88,14 +88,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding qq.showLoading({title: "加载中..." }); @@ -114,57 +107,20 @@ Page({ qq.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; - - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) - { - this.setData({ + this.setData({ search_map_info: data.search_map_info || [], - brand_list: data.brand_list || [], - category_list: data.category_list || [], - screening_price_list: data.screening_price_list || [], - goods_params_list: data.goods_params_list || [], - goods_spec_list: data.goods_spec_list || [], - }); - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); - } - } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } - } + search_map_list: { + brand_list: data.brand_list || [], + category_list: data.category_list || [], + screening_price_list: data.screening_price_list || [], + goods_params_list: data.goods_params_list || [], + goods_spec_list: data.goods_spec_list || [] + }, + plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data + }); + + // 获取数据列表 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0 @@ -184,6 +140,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + qq.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + qq.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + qq.request({ + url: app.get_request_url("datalist", "search"), + method: "POST", + data: post_data, + dataType: "json", + headers: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + qq.hideLoading(); + qq.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + qq.hideLoading(); + qq.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/qq/default/pages/plugins/shop/search/search.js b/sourcecode/qq/default/pages/plugins/shop/search/search.js index 6666e5710..8b6915602 100755 --- a/sourcecode/qq/default/pages/plugins/shop/search/search.js +++ b/sourcecode/qq/default/pages/plugins/shop/search/search.js @@ -65,7 +65,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -78,14 +78,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding qq.showLoading({title: "加载中..." }); @@ -104,67 +97,27 @@ Page({ qq.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + this.setData({ + search_map_info: data.search_map_info || [], + category_list: data.shop_goods_category || [], + }); - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) + // 指定分类id选中处理 + if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) { - this.setData({ - search_map_info: data.search_map_info || [], - category_list: data.shop_goods_category || [], - }); - - // 指定分类id选中处理 - if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) + var temp = this.data.category_list; + for(var i in temp) { - var temp = this.data.category_list; - for(var i in temp) + if(temp[i]['id'] == this.data.params.category_id) { - if(temp[i]['id'] == this.data.params.category_id) - { - temp[i]['active'] = 1; - } - } - this.setData({category_list: temp}); - } - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + temp[i]['active'] = 1; } } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } + this.setData({category_list: temp}); } + + // 获取列表数据 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -184,6 +137,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + qq.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + qq.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + qq.request({ + url: app.get_request_url("datalist", "search", "shop"), + method: "POST", + data: post_data, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + qq.hideLoading(); + qq.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + qq.hideLoading(); + qq.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.js b/sourcecode/toutiao/default/pages/goods-search/goods-search.js index d3ce2a5d3..c5fcd419c 100755 --- a/sourcecode/toutiao/default/pages/goods-search/goods-search.js +++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.js @@ -74,7 +74,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -87,14 +87,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding tt.showLoading({title: "加载中..." }); @@ -113,57 +106,20 @@ Page({ tt.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; - - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) - { - this.setData({ + this.setData({ search_map_info: data.search_map_info || [], - brand_list: data.brand_list || [], - category_list: data.category_list || [], - screening_price_list: data.screening_price_list || [], - goods_params_list: data.goods_params_list || [], - goods_spec_list: data.goods_spec_list || [], - }); - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); - } - } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } - } + search_map_list: { + brand_list: data.brand_list || [], + category_list: data.category_list || [], + screening_price_list: data.screening_price_list || [], + goods_params_list: data.goods_params_list || [], + goods_spec_list: data.goods_spec_list || [] + }, + plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data + }); + + // 获取数据列表 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0 @@ -183,6 +139,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + tt.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + tt.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + tt.request({ + url: app.get_request_url("datalist", "search"), + method: "POST", + data: post_data, + dataType: "json", + headers: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + tt.hideLoading(); + tt.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + tt.hideLoading(); + tt.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/toutiao/default/pages/plugins/shop/search/search.js b/sourcecode/toutiao/default/pages/plugins/shop/search/search.js index 47acd9103..2ec1ba4d5 100755 --- a/sourcecode/toutiao/default/pages/plugins/shop/search/search.js +++ b/sourcecode/toutiao/default/pages/plugins/shop/search/search.js @@ -65,7 +65,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -78,14 +78,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding tt.showLoading({title: "加载中..." }); @@ -104,67 +97,27 @@ Page({ tt.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + this.setData({ + search_map_info: data.search_map_info || [], + category_list: data.shop_goods_category || [], + }); - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) + // 指定分类id选中处理 + if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) { - this.setData({ - search_map_info: data.search_map_info || [], - category_list: data.shop_goods_category || [], - }); - - // 指定分类id选中处理 - if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) + var temp = this.data.category_list; + for(var i in temp) { - var temp = this.data.category_list; - for(var i in temp) + if(temp[i]['id'] == this.data.params.category_id) { - if(temp[i]['id'] == this.data.params.category_id) - { - temp[i]['active'] = 1; - } - } - this.setData({category_list: temp}); - } - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + temp[i]['active'] = 1; } } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } + this.setData({category_list: temp}); } + + // 获取列表数据 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -184,6 +137,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + tt.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + tt.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + tt.request({ + url: app.get_request_url("datalist", "search", "shop"), + method: "POST", + data: post_data, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + tt.hideLoading(); + tt.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + tt.hideLoading(); + tt.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.js b/sourcecode/weixin/default/pages/goods-search/goods-search.js index 3521e733a..68e56b466 100755 --- a/sourcecode/weixin/default/pages/goods-search/goods-search.js +++ b/sourcecode/weixin/default/pages/goods-search/goods-search.js @@ -78,7 +78,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -91,14 +91,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding wx.showLoading({title: "加载中..." }); @@ -117,57 +110,20 @@ Page({ wx.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; - - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) - { - this.setData({ + this.setData({ search_map_info: data.search_map_info || [], - brand_list: data.brand_list || [], - category_list: data.category_list || [], - screening_price_list: data.screening_price_list || [], - goods_params_list: data.goods_params_list || [], - goods_spec_list: data.goods_spec_list || [], - }); - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); - } - } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } - } + search_map_list: { + brand_list: data.brand_list || [], + category_list: data.category_list || [], + screening_price_list: data.screening_price_list || [], + goods_params_list: data.goods_params_list || [], + goods_spec_list: data.goods_spec_list || [] + }, + plugins_label_data: (data.plugins_label_data || null) == null || (data.plugins_label_data.base || null) == null || (data.plugins_label_data.data || null) == null || data.plugins_label_data.data.length <= 0 ? null : data.plugins_label_data + }); + + // 获取数据列表 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0 @@ -186,6 +142,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + wx.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + wx.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + wx.request({ + url: app.get_request_url("datalist", "search"), + method: "POST", + data: post_data, + dataType: "json", + headers: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params; diff --git a/sourcecode/weixin/default/pages/plugins/shop/search/search.js b/sourcecode/weixin/default/pages/plugins/shop/search/search.js index 9272c093a..086f2329b 100755 --- a/sourcecode/weixin/default/pages/plugins/shop/search/search.js +++ b/sourcecode/weixin/default/pages/plugins/shop/search/search.js @@ -68,7 +68,7 @@ Page({ // 获取数据 init() { // 获取数据 - this.get_data_list(); + this.get_data(); }, // 搜索 @@ -81,14 +81,7 @@ Page({ }, // 获取数据列表 - get_data_list(is_mandatory) { - // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data.data_bottom_line_status == true) { - return false; - } - } - + get_data() { // 加载loding wx.showLoading({title: "加载中..." }); @@ -107,67 +100,27 @@ Page({ wx.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + this.setData({ + search_map_info: data.search_map_info || [], + category_list: data.shop_goods_category || [], + }); - // 仅首次请求赋值条件数据 - if(this.data.data_list_loding_status == 1) + // 指定分类id选中处理 + if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) { - this.setData({ - search_map_info: data.search_map_info || [], - category_list: data.shop_goods_category || [], - }); - - // 指定分类id选中处理 - if((this.data.params.category_id || 0) != 0 && this.data.category_list.length > 0) + var temp = this.data.category_list; + for(var i in temp) { - var temp = this.data.category_list; - for(var i in temp) + if(temp[i]['id'] == this.data.params.category_id) { - if(temp[i]['id'] == this.data.params.category_id) - { - temp[i]['active'] = 1; - } - } - this.setData({category_list: temp}); - } - } - - // 列表数据处理 - if (data.data.length > 0) { - if (this.data.data_page <= 1) { - var temp_data_list = data.data; - } else { - var temp_data_list = this.data.data_list; - var temp_data = data.data; - for (var i in temp_data) { - temp_data_list.push(temp_data[i]); + temp[i]['active'] = 1; } } - this.setData({ - data_list: temp_data_list, - data_total: data.total, - data_page_total: data.page_total, - data_list_loding_status: 3, - data_page: this.data.data_page + 1 - }); - - // 是否还有数据 - if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) - { - this.setData({ data_bottom_line_status: true }); - } else { - this.setData({data_bottom_line_status: false}); - } - } else { - this.setData({ - data_list_loding_status: 0, - }); - if (this.data.data_page <= 1) { - this.setData({ - data_list: [], - data_bottom_line_status: false, - }); - } + this.setData({category_list: temp}); } + + // 获取列表数据 + this.get_data_list(1); } else { this.setData({ data_list_loding_status: 0, @@ -187,6 +140,85 @@ Page({ }); }, + // 获取数据列表 + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + wx.stopPullDownRefresh(); + return false; + } + } + + // 获取数据 + wx.showLoading({ + title: "加载中...", + mask: true + }); + var post_data = this.request_map_handle(); + wx.request({ + url: app.get_request_url("datalist", "search", "shop"), + method: "POST", + data: post_data, + dataType: "json", + header: { 'content-type': 'application/x-www-form-urlencoded' }, + success: res => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + if (res.data.code == 0) { + var data = res.data.data; + if (data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: data.total, + data_page_total: data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1 + }); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_total: 0 + }); + if (this.data_page <= 1) { + this.setData({ + data_list: [], + data_bottom_line_status: false + }); + } + } + } else { + this.setData({ + data_list_loding_status: 0 + }); + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + wx.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2 + }); + app.showToast("服务器请求出错"); + } + }); + }, + // 搜索条件处理 request_map_handle() { var params = this.data.params;