From 428f08c4db9899280cd7870e72fc813b9c7e816c Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Sat, 14 Oct 2023 00:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/icon-nav/icon-nav.vue | 6 +- components/realstore-list/realstore-list.vue | 2 +- components/search/search.vue | 8 +- pages/goods-detail/goods-detail.css | 5 +- pages/goods-detail/goods-detail.vue | 98 ++++++++------------ pages/index/index.css | 8 +- pages/plugins/realstore/index/index.css | 12 --- pages/plugins/realstore/index/index.vue | 30 +++--- 8 files changed, 67 insertions(+), 102 deletions(-) diff --git a/components/icon-nav/icon-nav.vue b/components/icon-nav/icon-nav.vue index 1625d611..fb6fd387 100644 --- a/components/icon-nav/icon-nav.vue +++ b/components/icon-nav/icon-nav.vue @@ -70,9 +70,9 @@ } .icon-nav-list .item { - width: calc(20% - 40rpx); - float: left; - padding: 20rpx; + width: 20%; + float: left; + padding: 16rpx 0; /* #ifdef H5 */ cursor: pointer; /* #endif */ diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue index 84384598..005e810a 100644 --- a/components/realstore-list/realstore-list.vue +++ b/components/realstore-list/realstore-list.vue @@ -32,7 +32,7 @@ {{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }} - 距离您{{ item.distance }} + 距您{{ item.distance }} diff --git a/components/search/search.vue b/components/search/search.vue index e01ae0ff..8426ec83 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -177,14 +177,14 @@ font-size: 24rpx; padding: 0 32rpx 0 54rpx; box-sizing: border-box; - height: 58rpx; - line-height: 58rpx; + height: 56rpx; + line-height: 56rpx; } .search-content .search-btn { width: 106rpx; - height: 48rpx; - line-height: 48rpx; + height: 46rpx; + line-height: 46rpx; font-size: 28rpx; border-radius: 30rpx; padding: 0; diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css index c1804f7c..533435e8 100644 --- a/pages/goods-detail/goods-detail.css +++ b/pages/goods-detail/goods-detail.css @@ -30,7 +30,7 @@ } .top-nav { position: absolute; - bottom: 4rpx; + bottom: 0; width: calc(100% - 40rpx); /* #ifdef H5 || APP */ bottom: 6px; @@ -53,8 +53,7 @@ } .top-nav-content .nav-active { font-weight: 500; - padding-bottom: 5rpx; - padding-bottom: 5rpx; + padding-bottom: 2rpx; border-style: solid; border-width: 0 0 2px 0; /* #ifdef H5 || APP */ diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index bfd4cd68..efd4d307 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -7,7 +7,7 @@ - + @@ -630,7 +630,6 @@ export default { indicator_active_color: "#666", autoplay: true, circular: true, - load_status: 0, data_bottom_line_status: false, data_list_loding_status: 1, data_list_loding_msg: "", @@ -695,7 +694,7 @@ export default { top_nav_more_top_value: 50, top_nav_right_icon_left_value: win_width <= 800 ? win_width - 40 : win_width - (win_width - 800) / 2 - 40, // #endif - top_nav_height: 23, + top_nav_height: 20, top_nav_title_index: 0, top_nav_title_scroll: true, top_nav_title_timer: null, @@ -859,14 +858,6 @@ export default { // 获取数据 init() { - if (this.load_status == 0) { - uni.showLoading({ - title: "加载中...", - }); - } - this.setData({ - data_list_loding_status: 1, - }); uni.request({ url: app.globalData.get_request_url("detail", "goods"), method: "POST", @@ -874,55 +865,47 @@ export default { dataType: "json", success: (res) => { uni.stopPullDownRefresh(); - if (this.load_status == 0) { - uni.hideLoading(); - } if (res.data.code == 0) { var data = res.data.data; var goods = data.goods; - if (this.load_status == 1) { - this.setData({ quick_nav_cart_count: data.cart_total.buy_number || 0 }); - } else { - var price_text_arr = ["售价", "价格", "销售价"]; - var upd_data = { - data_bottom_line_status: true, - data_list_loding_status: 3, - load_status: 1, - goods: goods, - indicator_dots: goods.photo.length > 1, - autoplay: goods.photo.length > 1, - goods_photo: goods.photo, - nav_more_list: data.nav_more_list || [], - goods_content_app: goods.content_app || [], - nav_favor_button_info: { - text: (goods.is_favor == 1 ? "已" : "") + "收藏", - status: goods.is_favor, - }, - buy_button: data.buy_button || null, - top_nav_title_data: data.middle_tabs_nav || [], - goods_spec_base_price: goods.price, - goods_spec_base_original_price: goods.original_price || 0, - show_field_price_text: price_text_arr.indexOf(goods.show_field_price_text) != -1 ? null : goods.show_field_price_text.replace(/<[^>]+>/g, "") || null, - plugins_seckill_data: data.plugins_seckill_data || null, - plugins_coupon_data: data.plugins_coupon_data || null, - quick_nav_cart_count: data.cart_total.buy_number || 0, - plugins_salerecords_data: data.plugins_salerecords_data || null, - plugins_shop_data: data.plugins_shop_data || null, - plugins_wholesale_data: (data.plugins_wholesale_data || null) == null ? null : data.plugins_wholesale_data, - 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, - plugins_intellectstools_data: data.plugins_intellectstools_data || null, - plugins_chat_data: data.plugins_chat_data || null, - plugins_realstore_data: data.plugins_realstore_data || null, - plugins_binding_data: data.plugins_binding_data || null, - plugins_goodsservice_data: data.plugins_goodsservice_data || null, - plugins_batchbuy_data: data.plugins_batchbuy_data || null, - }; - // 导航首页按钮 - if ((data.nav_home_button_info || null) != null) { - upd_data["nav_home_button_info"] = data.nav_home_button_info; - } - this.setData(upd_data); + var price_text_arr = ["售价", "价格", "销售价"]; + var upd_data = { + data_bottom_line_status: true, + data_list_loding_status: 3, + goods: goods, + indicator_dots: goods.photo.length > 1, + autoplay: goods.photo.length > 1, + goods_photo: goods.photo, + nav_more_list: data.nav_more_list || [], + goods_content_app: goods.content_app || [], + nav_favor_button_info: { + text: (goods.is_favor == 1 ? "已" : "") + "收藏", + status: goods.is_favor, + }, + buy_button: data.buy_button || null, + top_nav_title_data: data.middle_tabs_nav || [], + goods_spec_base_price: goods.price, + goods_spec_base_original_price: goods.original_price || 0, + show_field_price_text: price_text_arr.indexOf(goods.show_field_price_text) != -1 ? null : goods.show_field_price_text.replace(/<[^>]+>/g, "") || null, + plugins_seckill_data: data.plugins_seckill_data || null, + plugins_coupon_data: data.plugins_coupon_data || null, + quick_nav_cart_count: data.cart_total.buy_number || 0, + plugins_salerecords_data: data.plugins_salerecords_data || null, + plugins_shop_data: data.plugins_shop_data || null, + plugins_wholesale_data: (data.plugins_wholesale_data || null) == null ? null : data.plugins_wholesale_data, + 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, + plugins_intellectstools_data: data.plugins_intellectstools_data || null, + plugins_chat_data: data.plugins_chat_data || null, + plugins_realstore_data: data.plugins_realstore_data || null, + plugins_binding_data: data.plugins_binding_data || null, + plugins_goodsservice_data: data.plugins_goodsservice_data || null, + plugins_batchbuy_data: data.plugins_batchbuy_data || null, + }; + // 导航首页按钮 + if ((data.nav_home_button_info || null) != null) { + upd_data["nav_home_button_info"] = data.nav_home_button_info; } + this.setData(upd_data); // 如果已默认开启购买弹窗，库存为0则不开启 if (this.popup_buy_status && parseInt(goods.inventory) > 0) { @@ -963,9 +946,6 @@ export default { }, fail: () => { uni.stopPullDownRefresh(); - if (this.load_status == 0) { - uni.hideLoading(); - } this.setData({ data_bottom_line_status: false, data_list_loding_status: 2, diff --git a/pages/index/index.css b/pages/index/index.css index 59ab9cab..a2d18b9d 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -71,12 +71,6 @@ width: 100%; } -.search-content-fixed-content { - background-repeat: no-repeat; - background-size: 100% auto; - padding-bottom: 20rpx; -} - .search-content-input { width: calc(100% - 320rpx); } @@ -85,7 +79,7 @@ background-repeat: no-repeat; background-size: 100% auto; background-position: top; - padding-bottom: 20rpx; + padding-bottom: 6px; /* #ifdef H5 || APP */ padding-top: 15rpx !important; padding-bottom: 15rpx !important; diff --git a/pages/plugins/realstore/index/index.css b/pages/plugins/realstore/index/index.css index 622dbed1..544c9276 100644 --- a/pages/plugins/realstore/index/index.css +++ b/pages/plugins/realstore/index/index.css @@ -17,18 +17,6 @@ margin-top: 80rpx; } -.nav-search /deep/ .search-icon { - left: 30rpx; - margin-top: 2rpx; -} - -.nav-search /deep/ input { - padding: 0 32rpx 0 82rpx; - font-size: 28rpx; - height: 80rpx; - line-height: 80rpx; -} - /** * 位置选择提示 */ diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue index dda3ad99..4699ce07 100644 --- a/pages/plugins/realstore/index/index.vue +++ b/pages/plugins/realstore/index/index.vue @@ -1,12 +1,8 @@