From 45175781dc8345a4f93fa2f30bf531523b443873 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 7 May 2024 11:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/article-category/article-category.vue | 3 + pages/goods-category/goods-category.vue | 17 +- pages/goods-search/goods-search.vue | 1410 +++++++++-------- pages/plugins/activity/index/index.vue | 5 +- pages/plugins/ask/index/index.vue | 5 +- pages/plugins/blog/search/search.vue | 3 + pages/plugins/coin/cash-list/cash-list.vue | 9 + .../coin/convert-list/convert-list.vue | 6 + .../coin/recharge-list/recharge-list.vue | 9 + .../transaction-list/transaction-list.vue | 12 + .../coin/transfer-list/transfer-list.vue | 3 + pages/plugins/delivery/order/order.vue | 3 + .../extraction-order/extraction-order.vue | 19 +- .../order-detail/order-detail.vue | 5 - pages/plugins/distribution/order/order.vue | 19 +- .../profit-detail/profit-detail.vue | 5 - pages/plugins/distribution/profit/profit.vue | 19 +- .../promotion-order/promotion-order.vue | 19 +- .../promotion-user/promotion-user.vue | 19 +- .../recommend-detail/recommend-detail.vue | 5 - .../profit/profit.vue | 3 + pages/plugins/invoice/invoice/invoice.vue | 3 + pages/plugins/label/detail/detail.vue | 23 +- .../membershiplevelvip/order/order.vue | 3 + .../membershiplevelvip/profit/profit.vue | 3 + .../batchorder-list/batchorder-list.vue | 3 + pages/plugins/realstore/detail/detail.vue | 6 +- .../frequencycard-list/frequencycard-list.vue | 3 + .../orderallot-list/orderallot-list.vue | 3 + pages/plugins/realstore/search/search.vue | 3 + pages/plugins/shop/index/index.vue | 3 + pages/plugins/shop/search/search.vue | 42 +- .../wallet/components/user-cash/user-cash.vue | 3 + .../user-recharge/user-recharge.vue | 3 + .../components/wallet-log/wallet-log.vue | 3 + .../weixinliveplayer/search/search.vue | 3 + pages/user-order/user-order.vue | 5 +- .../user-orderaftersale.vue | 3 + 38 files changed, 919 insertions(+), 794 deletions(-) diff --git a/pages/article-category/article-category.vue b/pages/article-category/article-category.vue index eb094f8d..4408121d 100644 --- a/pages/article-category/article-category.vue +++ b/pages/article-category/article-category.vue @@ -243,6 +243,9 @@ export default { this.setData({ nav_active_value: e.currentTarget.dataset.value || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue index ac551573..36ec9a3a 100644 --- a/pages/goods-category/goods-category.vue +++ b/pages/goods-category/goods-category.vue @@ -827,17 +827,14 @@ nav_active_item_three_index: three_index, data_content: temp_data_content, data_three_content: temp_data_three_content, + popup_status: false, data_page: 1, data_list: [], data_list_loding_status: 1, - popup_status: false, + data_bottom_line_status: false }); - - // 商品模式则读取商品 - if (this.category_show_level == 0) { - this.reset_scroll(); - this.get_goods_list(1); - } + this.reset_scroll(); + this.get_goods_list(1); }, // 打开弹窗 @@ -859,8 +856,9 @@ this.setData({ search_keywords_value: e || '', data_page: 1, - data_list_loding_status: 1, data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_goods_list(1); } else { @@ -1336,6 +1334,9 @@ search_nav_sort_index: index, search_nav_sort_list: temp_search_nav_sort, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.reset_scroll(); this.get_goods_list(1); diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue index afc2d02a..c9099e41 100644 --- a/pages/goods-search/goods-search.vue +++ b/pages/goods-search/goods-search.vue @@ -1,769 +1,775 @@ \ No newline at end of file diff --git a/pages/plugins/activity/index/index.vue b/pages/plugins/activity/index/index.vue index 816b3475..651264d7 100644 --- a/pages/plugins/activity/index/index.vue +++ b/pages/plugins/activity/index/index.vue @@ -260,6 +260,9 @@ this.setData({ nav_active_value: e.currentTarget.dataset.value || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -273,4 +276,4 @@ + \ No newline at end of file diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue index 495f1e7b..4e5387d0 100644 --- a/pages/plugins/ask/index/index.vue +++ b/pages/plugins/ask/index/index.vue @@ -161,7 +161,10 @@ } }, fail: () => { - app.globalData.showToast(this.$t('common.internet_error_tips')); + this.setData({ + data_list_loding_status: 2, + data_list_loding_msg: this.$t('common.internet_error_tips'), + }); }, }); }, diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue index a82dec6d..a7951169 100644 --- a/pages/plugins/blog/search/search.vue +++ b/pages/plugins/blog/search/search.vue @@ -289,6 +289,9 @@ this.setData({ nav_active_value: e.currentTarget.dataset.value || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/coin/cash-list/cash-list.vue b/pages/plugins/coin/cash-list/cash-list.vue index 46d5fadc..90e86549 100644 --- a/pages/plugins/coin/cash-list/cash-list.vue +++ b/pages/plugins/coin/cash-list/cash-list.vue @@ -362,6 +362,9 @@ accounts_name: e.currentTarget.dataset.name, popup_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -390,6 +393,9 @@ recharge_status_name: e.currentTarget.dataset.name, popup_recharge_status_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -418,6 +424,9 @@ network_name: e.currentTarget.dataset.name, popup_network_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue index 8c9135ba..709c6659 100644 --- a/pages/plugins/coin/convert-list/convert-list.vue +++ b/pages/plugins/coin/convert-list/convert-list.vue @@ -331,6 +331,9 @@ send_accounts_name: e.currentTarget.dataset.name, popup_send_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -358,6 +361,9 @@ receive_accounts_name: e.currentTarget.dataset.name, popup_receive_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue index a87f65e7..e2f23e83 100644 --- a/pages/plugins/coin/recharge-list/recharge-list.vue +++ b/pages/plugins/coin/recharge-list/recharge-list.vue @@ -363,6 +363,9 @@ accounts_name: e.currentTarget.dataset.name, popup_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -391,6 +394,9 @@ recharge_status_name: e.currentTarget.dataset.name, popup_recharge_status_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -419,6 +425,9 @@ network_name: e.currentTarget.dataset.name, popup_network_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue index 49a4ed2e..6a913906 100644 --- a/pages/plugins/coin/transaction-list/transaction-list.vue +++ b/pages/plugins/coin/transaction-list/transaction-list.vue @@ -394,6 +394,9 @@ accounts_name: e.currentTarget.dataset.name, popup_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -423,6 +426,9 @@ operate_type_name: e.currentTarget.dataset.name, popup_operate_type_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -452,6 +458,9 @@ business_type_name: e.currentTarget.dataset.name, popup_business_type_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -481,6 +490,9 @@ coin_type_name: e.currentTarget.dataset.name, popup_coin_type_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue index 0e81fdfe..b6b1a1ac 100644 --- a/pages/plugins/coin/transfer-list/transfer-list.vue +++ b/pages/plugins/coin/transfer-list/transfer-list.vue @@ -292,6 +292,9 @@ accounts_name: e.currentTarget.dataset.name, popup_accounts_status: false, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/delivery/order/order.vue b/pages/plugins/delivery/order/order.vue index 2741eb86..a9149693 100644 --- a/pages/plugins/delivery/order/order.vue +++ b/pages/plugins/delivery/order/order.vue @@ -470,6 +470,9 @@ this.setData({ nav_type_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/extraction-order/extraction-order.vue b/pages/plugins/distribution/extraction-order/extraction-order.vue index 47ab9d8d..350536d4 100644 --- a/pages/plugins/distribution/extraction-order/extraction-order.vue +++ b/pages/plugins/distribution/extraction-order/extraction-order.vue @@ -186,10 +186,10 @@ export default { }); // 加载loding - if(this.data_page > 1) { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); } // 参数 @@ -206,8 +206,8 @@ export default { }, dataType: "json", success: (res) => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); if (res.data.code == 0) { @@ -253,8 +253,8 @@ export default { } }, fail: () => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); this.setData({ @@ -276,6 +276,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/order-detail/order-detail.vue b/pages/plugins/distribution/order-detail/order-detail.vue index 7821c58d..f49e3a76 100644 --- a/pages/plugins/distribution/order-detail/order-detail.vue +++ b/pages/plugins/distribution/order-detail/order-detail.vue @@ -126,9 +126,6 @@ export default { methods: { init() { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); this.setData({ data_list_loding_status: 1, }); @@ -140,7 +137,6 @@ export default { }, dataType: "json", success: (res) => { - uni.hideLoading(); uni.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; @@ -173,7 +169,6 @@ export default { } }, fail: () => { - uni.hideLoading(); uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, diff --git a/pages/plugins/distribution/order/order.vue b/pages/plugins/distribution/order/order.vue index 63f6dff7..498667b3 100644 --- a/pages/plugins/distribution/order/order.vue +++ b/pages/plugins/distribution/order/order.vue @@ -149,10 +149,10 @@ export default { }); // 加载loding - if(this.data_page > 1) { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); } // 参数 @@ -169,8 +169,8 @@ export default { }, dataType: "json", success: (res) => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); if (res.data.code == 0) { @@ -216,8 +216,8 @@ export default { } }, fail: () => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); this.setData({ @@ -239,6 +239,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/profit-detail/profit-detail.vue b/pages/plugins/distribution/profit-detail/profit-detail.vue index 46814675..83ad9035 100644 --- a/pages/plugins/distribution/profit-detail/profit-detail.vue +++ b/pages/plugins/distribution/profit-detail/profit-detail.vue @@ -71,9 +71,6 @@ export default { methods: { init() { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); this.setData({ data_list_loding_status: 1, }); @@ -85,7 +82,6 @@ export default { }, dataType: "json", success: (res) => { - uni.hideLoading(); uni.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; @@ -119,7 +115,6 @@ export default { } }, fail: () => { - uni.hideLoading(); uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, diff --git a/pages/plugins/distribution/profit/profit.vue b/pages/plugins/distribution/profit/profit.vue index cec09abe..f8cd662f 100644 --- a/pages/plugins/distribution/profit/profit.vue +++ b/pages/plugins/distribution/profit/profit.vue @@ -146,10 +146,10 @@ export default { }); // 加载loding - if(this.data_page > 1) { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); } // 获取数据 @@ -164,8 +164,8 @@ export default { }, dataType: "json", success: (res) => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); if (res.data.code == 0) { @@ -211,8 +211,8 @@ export default { } }, fail: () => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); this.setData({ @@ -234,6 +234,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/promotion-order/promotion-order.vue b/pages/plugins/distribution/promotion-order/promotion-order.vue index ab724fa2..4c19775a 100644 --- a/pages/plugins/distribution/promotion-order/promotion-order.vue +++ b/pages/plugins/distribution/promotion-order/promotion-order.vue @@ -146,9 +146,11 @@ export default { }); // 加载loding - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); + } // 请求参数 var type = (this.nav_type_list[this.nav_type_index] || null) == null ? -1 : this.nav_type_list[this.nav_type_index]["value"]; @@ -163,7 +165,9 @@ export default { data: data, dataType: "json", success: (res) => { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); + } uni.stopPullDownRefresh(); if (res.data.code == 0) { if (res.data.data.data.length > 0) { @@ -208,7 +212,9 @@ export default { } }, fail: () => { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); + } uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, @@ -229,6 +235,9 @@ export default { this.setData({ nav_type_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/promotion-user/promotion-user.vue b/pages/plugins/distribution/promotion-user/promotion-user.vue index a66f4838..a3a526ed 100644 --- a/pages/plugins/distribution/promotion-user/promotion-user.vue +++ b/pages/plugins/distribution/promotion-user/promotion-user.vue @@ -173,9 +173,11 @@ export default { }); // 加载loding - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); + } // 请求参数 var type = (this.nav_type_list[this.nav_type_index] || null) == null ? 0 : this.nav_type_list[this.nav_type_index]["value"]; @@ -190,7 +192,9 @@ export default { data: data, dataType: "json", success: (res) => { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); + } uni.stopPullDownRefresh(); if (res.data.code == 0) { if (res.data.data.data.length > 0) { @@ -236,7 +240,9 @@ export default { } }, fail: () => { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); + } uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, @@ -276,6 +282,9 @@ export default { this.setData({ nav_type_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/distribution/recommend-detail/recommend-detail.vue b/pages/plugins/distribution/recommend-detail/recommend-detail.vue index 4b628e5b..5a349075 100644 --- a/pages/plugins/distribution/recommend-detail/recommend-detail.vue +++ b/pages/plugins/distribution/recommend-detail/recommend-detail.vue @@ -146,9 +146,6 @@ // 获取数据 get_data() { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); uni.request({ url: app.globalData.get_request_url('detail', 'recommend', 'distribution'), method: 'POST', @@ -157,7 +154,6 @@ }, dataType: 'json', success: (res) => { - uni.hideLoading(); uni.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; @@ -199,7 +195,6 @@ app.globalData.page_share_handle(this.share_info); }, fail: () => { - uni.hideLoading(); uni.stopPullDownRefresh(); this.setData({ data_bottom_line_status: false, diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.vue b/pages/plugins/excellentbuyreturntocash/profit/profit.vue index 678c1b88..0eb062ee 100644 --- a/pages/plugins/excellentbuyreturntocash/profit/profit.vue +++ b/pages/plugins/excellentbuyreturntocash/profit/profit.vue @@ -290,6 +290,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue index f7849924..d5d16ced 100644 --- a/pages/plugins/invoice/invoice/invoice.vue +++ b/pages/plugins/invoice/invoice/invoice.vue @@ -344,6 +344,9 @@ this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/label/detail/detail.vue b/pages/plugins/label/detail/detail.vue index 2eec0c80..c08ca897 100644 --- a/pages/plugins/label/detail/detail.vue +++ b/pages/plugins/label/detail/detail.vue @@ -216,12 +216,12 @@ export default { } this.setData({ data_is_loading: 1 }); - // 获取数据 - if(this.data_page > 1) { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - mask: true, - }); + // 获取数据 + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + mask: true, + }); } uni.request({ url: app.globalData.get_request_url("detailgoodslist", "index", "label"), @@ -232,9 +232,9 @@ export default { ov: this.search_nav_sort_value, }, dataType: "json", - success: (res) => { + success: (res) => { if(this.data_page > 1) { - uni.hideLoading(); + uni.hideLoading(); } uni.stopPullDownRefresh(); if (res.data.code == 0) { @@ -284,8 +284,8 @@ export default { } }, fail: () => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); this.setData({ @@ -324,6 +324,9 @@ export default { search_nav_sort_value: temp_search_nav_sort[index]["field"] + "-" + temp_sort, search_nav_sort_list: temp_search_nav_sort, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue index 46d44b22..bafa1fed 100644 --- a/pages/plugins/membershiplevelvip/order/order.vue +++ b/pages/plugins/membershiplevelvip/order/order.vue @@ -425,6 +425,9 @@ this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/membershiplevelvip/profit/profit.vue b/pages/plugins/membershiplevelvip/profit/profit.vue index aef9e4ed..9d65d65a 100644 --- a/pages/plugins/membershiplevelvip/profit/profit.vue +++ b/pages/plugins/membershiplevelvip/profit/profit.vue @@ -232,6 +232,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/realstore/batchorder-list/batchorder-list.vue b/pages/plugins/realstore/batchorder-list/batchorder-list.vue index a1a0df23..ed662332 100644 --- a/pages/plugins/realstore/batchorder-list/batchorder-list.vue +++ b/pages/plugins/realstore/batchorder-list/batchorder-list.vue @@ -248,6 +248,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); // 重新拉取数据 diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index 0906f36d..499e709a 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -861,6 +861,7 @@ data_page: 1, data_list: [], data_list_loding_status: 1, + data_bottom_line_status: false }); this.source_goods_remove(); this.reset_scroll(); @@ -912,7 +913,10 @@ this.setData({ search_nav_sort_index: index, search_nav_sort_list: temp_search_nav_sort, - data_page: 1 + data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.source_goods_remove(); this.reset_scroll(); diff --git a/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue b/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue index aa787484..7a60dd2a 100644 --- a/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue +++ b/pages/plugins/realstore/frequencycard-list/frequencycard-list.vue @@ -249,6 +249,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); // 重新拉取数据 diff --git a/pages/plugins/realstore/orderallot-list/orderallot-list.vue b/pages/plugins/realstore/orderallot-list/orderallot-list.vue index c84e1a50..38cd1301 100644 --- a/pages/plugins/realstore/orderallot-list/orderallot-list.vue +++ b/pages/plugins/realstore/orderallot-list/orderallot-list.vue @@ -493,6 +493,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); // 重新拉取数据 diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue index 2fff2ea7..e01ee361 100644 --- a/pages/plugins/realstore/search/search.vue +++ b/pages/plugins/realstore/search/search.vue @@ -299,6 +299,9 @@ export default { this.setData({ nav_active_value: e.currentTarget.dataset.value || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/shop/index/index.vue b/pages/plugins/shop/index/index.vue index 93de04c2..ddfb1157 100644 --- a/pages/plugins/shop/index/index.vue +++ b/pages/plugins/shop/index/index.vue @@ -285,6 +285,9 @@ this.setData({ nav_active_value: e.currentTarget.dataset.value || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue index 01cd1292..6c086b70 100644 --- a/pages/plugins/shop/search/search.vue +++ b/pages/plugins/shop/search/search.vue @@ -166,15 +166,6 @@ app.globalData.is_config(this, 'init_config'); } }, - - // 搜索 - search_event() { - this.setData({ - data_list: [], - data_page: 1 - }); - this.get_data_list(1); - }, // 初始化 get_data() { @@ -263,10 +254,10 @@ this.setData({data_is_loading: 1}); // 获取数据 - if(this.data_page > 1) { - uni.showLoading({ - title: this.$t('common.loading_in_text'), - }); + if(this.data_page > 1) { + uni.showLoading({ + title: this.$t('common.loading_in_text'), + }); } var post_data = this.request_map_handle(); uni.request({ @@ -275,8 +266,8 @@ data: post_data, dataType: 'json', success: res => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); if (res.data.code == 0) { @@ -326,8 +317,8 @@ } }, fail: () => { - if(this.data_page > 1) { - uni.hideLoading(); + if(this.data_page > 1) { + uni.hideLoading(); } uni.stopPullDownRefresh(); this.setData({ @@ -383,10 +374,13 @@ form_submit_event(e) { this.setData({ post_data: e.detail.value, - data_page: 1 + data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); - this.popup_form_event_close(); this.get_data_list(1); + this.popup_form_event_close(); }, // 筛选条件关闭 @@ -424,7 +418,10 @@ this.setData({ search_nav_sort_index: index, search_nav_sort_list: temp_search_nav_sort, - data_page: 1 + data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, @@ -485,7 +482,10 @@ is_show_popup_form: false, search_nav_sort_list: temp_search_nav_sort, search_nav_sort_index: 0, - data_page: 1 + data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/wallet/components/user-cash/user-cash.vue b/pages/plugins/wallet/components/user-cash/user-cash.vue index 4b7ceb15..2dc9c41a 100644 --- a/pages/plugins/wallet/components/user-cash/user-cash.vue +++ b/pages/plugins/wallet/components/user-cash/user-cash.vue @@ -220,6 +220,9 @@ this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/wallet/components/user-recharge/user-recharge.vue b/pages/plugins/wallet/components/user-recharge/user-recharge.vue index c21cb037..d47b57ff 100644 --- a/pages/plugins/wallet/components/user-recharge/user-recharge.vue +++ b/pages/plugins/wallet/components/user-recharge/user-recharge.vue @@ -363,6 +363,9 @@ this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/wallet/components/wallet-log/wallet-log.vue b/pages/plugins/wallet/components/wallet-log/wallet-log.vue index f286f922..2a7f1057 100644 --- a/pages/plugins/wallet/components/wallet-log/wallet-log.vue +++ b/pages/plugins/wallet/components/wallet-log/wallet-log.vue @@ -221,6 +221,9 @@ this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/plugins/weixinliveplayer/search/search.vue b/pages/plugins/weixinliveplayer/search/search.vue index 1cdac0b0..2b186f2b 100644 --- a/pages/plugins/weixinliveplayer/search/search.vue +++ b/pages/plugins/weixinliveplayer/search/search.vue @@ -272,6 +272,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); }, diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue index a29459f4..f3b64b29 100644 --- a/pages/user-order/user-order.vue +++ b/pages/user-order/user-order.vue @@ -620,9 +620,12 @@ // 导航事件 nav_event(e) { this.setData({ + order_select_ids: [], nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, - order_select_ids: [], + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); // 重新拉取数据 diff --git a/pages/user-orderaftersale/user-orderaftersale.vue b/pages/user-orderaftersale/user-orderaftersale.vue index c445e09a..afe8b3ed 100644 --- a/pages/user-orderaftersale/user-orderaftersale.vue +++ b/pages/user-orderaftersale/user-orderaftersale.vue @@ -269,6 +269,9 @@ export default { this.setData({ nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, + data_list: [], + data_list_loding_status: 1, + data_bottom_line_status: false }); this.get_data_list(1); },