From fc42ce58955a0b18f0d5f3dca1a40407a25f12cc Mon Sep 17 00:00:00 2001 From: xindan <2499232802@qq.com> Date: Tue, 12 Oct 2021 00:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E9=9B=A8=E8=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/answer-list/answer-list.vue | 8 ++-- pages/goods-comment/goods-comment.vue | 23 +++------- pages/goods-search/goods-search.vue | 14 ++---- pages/index/index.vue | 39 ++++++---------- pages/message/message.vue | 16 +++---- pages/user-address/user-address.vue | 1 - pages/user-answer-list/user-answer-list.vue | 8 ++-- pages/user-favor/user-favor.vue | 15 +++---- pages/user-goods-browse/user-goods-browse.vue | 14 ++---- pages/user-integral/user-integral.css | 4 ++ pages/user-integral/user-integral.vue | 45 +++++++++---------- pages/user-order/user-order.vue | 14 ++---- pages/user/user.css | 9 ++-- pages/user/user.vue | 2 +- 14 files changed, 78 insertions(+), 134 deletions(-) create mode 100644 pages/user-integral/user-integral.css diff --git a/pages/answer-list/answer-list.vue b/pages/answer-list/answer-list.vue index 1855c4a3..bcd6f41f 100644 --- a/pages/answer-list/answer-list.vue +++ b/pages/answer-list/answer-list.vue @@ -107,11 +107,9 @@ }); // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } + 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 diff --git a/pages/goods-comment/goods-comment.vue b/pages/goods-comment/goods-comment.vue index e3eb074d..efa65497 100644 --- a/pages/goods-comment/goods-comment.vue +++ b/pages/goods-comment/goods-comment.vue @@ -175,34 +175,26 @@ } else { var temp_data_list = this.data_list; var temp_data = res.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: res.data.data.total, data_page_total: res.data.data.page_total, data_list_loding_status: 3, data_page: this.data_page + 1 - }); // 是否还有数据 - - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } + }); + + // 是否还有数据 + 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 }); - if (this.data_page <= 1) { this.setData({ data_list: [], @@ -214,7 +206,6 @@ this.setData({ data_list_loding_status: 0 }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { app.globalData.showToast(res.data.msg); } @@ -251,4 +242,4 @@ + \ No newline at end of file diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue index bc1ee3cb..f5326c8d 100644 --- a/pages/goods-search/goods-search.vue +++ b/pages/goods-search/goods-search.vue @@ -340,16 +340,10 @@ data_page: this.data_page + 1 }); - // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } + // 是否还有数据 + 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, diff --git a/pages/index/index.vue b/pages/index/index.vue index 85af8c12..7915f142 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -50,7 +50,6 @@ {{item.title}} {{currency_symbol}}{{item.min_price}} {{currency_symbol}}{{item.min_original_price}} - @@ -99,6 +98,10 @@ + + + + @@ -135,10 +138,7 @@ - - - - + @@ -262,16 +262,11 @@ this.setData({ currency_symbol: app.globalData.get_config('currency_symbol'), common_shop_notice: app.globalData.get_config('config.common_shop_notice'), - home_index_floor_data_type: app.globalData.get_config( - 'config.home_index_floor_data_type'), - common_app_is_enable_search: app.globalData.get_config( - 'config.common_app_is_enable_search'), - common_app_is_enable_answer: app.globalData.get_config( - 'config.common_app_is_enable_answer'), - common_app_is_header_nav_fixed: app.globalData.get_config( - 'config.common_app_is_header_nav_fixed'), - common_app_is_online_service: app.globalData.get_config( - 'config.common_app_is_online_service') + home_index_floor_data_type: app.globalData.get_config('config.home_index_floor_data_type'), + common_app_is_enable_search: app.globalData.get_config('config.common_app_is_enable_search'), + common_app_is_enable_answer: app.globalData.get_config('config.common_app_is_enable_answer'), + common_app_is_header_nav_fixed: app.globalData.get_config('config.common_app_is_header_nav_fixed'), + common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service') }); } else { app.globalData.is_config(this, 'init_config'); @@ -311,15 +306,9 @@ navigation: data.navigation || [], data_list: data.data_list, data_list_loding_status: data.data_list.length == 0 ? 0 : 3, - plugins_limitedtimediscount_data: data - .plugins_limitedtimediscount_data || null, - plugins_limitedtimediscount_is_valid: (data - .plugins_limitedtimediscount_data || null) != null && (data - .plugins_limitedtimediscount_data.is_valid || 0) == 1 ? 1 : - 0, - plugins_salerecords_data: (data.plugins_salerecords_data || null) == - null || data.plugins_salerecords_data.length <= 0 ? null : data - .plugins_salerecords_data + plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, + plugins_limitedtimediscount_is_valid: (data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1 ? 1 : 0, + plugins_salerecords_data: (data.plugins_salerecords_data || null) == null || data.plugins_salerecords_data.length <= 0 ? null : data.plugins_salerecords_data }); // 导航购物车处理 @@ -364,4 +353,4 @@ + \ No newline at end of file diff --git a/pages/message/message.vue b/pages/message/message.vue index 40848eae..459bf9d7 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -7,7 +7,7 @@ {{item.title}} {{item.add_time_time}} - {{item.detail}} + {{item.detail}} @@ -87,10 +87,6 @@ if (this.data_bottom_line_status == true) { return false; } - } else { - this.setData({ - data_bottom_line_status: false - }); } // 加载loding @@ -131,12 +127,10 @@ data_page: this.data_page + 1 }); - // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } + // 是否还有数据 + 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 diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue index e01fbb0d..f5ebdea8 100644 --- a/pages/user-address/user-address.vue +++ b/pages/user-address/user-address.vue @@ -132,7 +132,6 @@ if (data.data.length > 0) { // 获取当前默认地址 var is_default = 0; - for (var i in data.data) { if (data.data[i]['is_default'] == 1) { is_default = data.data[i]['id']; diff --git a/pages/user-answer-list/user-answer-list.vue b/pages/user-answer-list/user-answer-list.vue index 3e7e8e18..4cad341d 100644 --- a/pages/user-answer-list/user-answer-list.vue +++ b/pages/user-answer-list/user-answer-list.vue @@ -135,11 +135,9 @@ }); // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } + 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 diff --git a/pages/user-favor/user-favor.vue b/pages/user-favor/user-favor.vue index 16a2dd1b..8292f49b 100644 --- a/pages/user-favor/user-favor.vue +++ b/pages/user-favor/user-favor.vue @@ -146,19 +146,14 @@ data_total: res.data.data.total, data_page_total: res.data.data.page_total, data_list_loding_status: 3, - data_page: this.data_page + 1 + data_page: this.data_page + 1, + data_bottom_line_status: (this.data_page > 1 && this.data_page > this.data_page_total) }); // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } + 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 diff --git a/pages/user-goods-browse/user-goods-browse.vue b/pages/user-goods-browse/user-goods-browse.vue index 8a954e5a..72c90f92 100644 --- a/pages/user-goods-browse/user-goods-browse.vue +++ b/pages/user-goods-browse/user-goods-browse.vue @@ -149,16 +149,10 @@ data_page: this.data_page + 1 }); - // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } + // 是否还有数据 + 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 diff --git a/pages/user-integral/user-integral.css b/pages/user-integral/user-integral.css new file mode 100644 index 00000000..68acf277 --- /dev/null +++ b/pages/user-integral/user-integral.css @@ -0,0 +1,4 @@ +.item-value { + right: 20rpx; + bottom: 20rpx; +} \ No newline at end of file diff --git a/pages/user-integral/user-integral.vue b/pages/user-integral/user-integral.vue index aec82f91..264872a0 100644 --- a/pages/user-integral/user-integral.vue +++ b/pages/user-integral/user-integral.vue @@ -2,18 +2,18 @@ - + - {{item.type_text}} {{item.operation_integral}} - {{item.add_time_time}} + + 原始 + {{item.original_integral}} + 最新 + {{item.new_integral}} + + {{item.add_time_time}} - - 原始 - {{item.original_integral}} - 最新 - {{item.new_integral}} - - {{item.msg}} + {{item.msg}} + {{item.type == 1 ? '+' : '-'}} {{item.operation_integral}} @@ -85,14 +85,10 @@ get_data_list(is_mandatory) { // 分页是否还有数据 - if ((is_mandatory || 0) == 0) { - if (this.data_bottom_line_status == true) { - return false; - } - } else { - this.setData({ - data_bottom_line_status: false - }); + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + return false; + } } // 加载loding @@ -134,12 +130,10 @@ data_page: this.data_page + 1 }); - // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } + // 是否还有数据 + 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 @@ -172,5 +166,6 @@ } }; - \ No newline at end of file diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue index 5b4c4e9d..0b811db5 100644 --- a/pages/user-order/user-order.vue +++ b/pages/user-order/user-order.vue @@ -269,16 +269,10 @@ payment_list: res.data.data.payment_list || [] }); - // 是否还有数据 - if (this.data_page > 1 && this.data_page > this.data_page_total) { - this.setData({ - data_bottom_line_status: true - }); - } else { - this.setData({ - data_bottom_line_status: false - }); - } + // 是否还有数据 + 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, diff --git a/pages/user/user.css b/pages/user/user.css index b0c276ec..6e23b97b 100644 --- a/pages/user/user.css +++ b/pages/user/user.css @@ -67,9 +67,8 @@ width: 20%; } .nav-list-sub .item .item-icon { - width: 60rpx; - height: 60rpx; - margin-bottom: 6rpx; + width: 50rpx; + height: 50rpx; } .nav-list-sub .item .badge-icon { top: -2px; @@ -84,8 +83,8 @@ width: 25%; } .nav-box .nav-item .item-icon { - width: 50rpx; - height: 50rpx; + width: 45rpx; + height: 45rpx; } .nav-box .nav-item .item-desc { margin-right: 50rpx; diff --git a/pages/user/user.vue b/pages/user/user.vue index a1fa3ff7..48e3934b 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -55,7 +55,7 @@ - + {{items.name}}