From 096b85b73ccc2b225bc6c4e71ed3294adae719b0 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 26 Dec 2024 16:31:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.diy=E6=BB=9A=E5=8A=A8=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy/diy.vue | 4 +++- components/diy/header.vue | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/diy/diy.vue b/components/diy/diy.vue index d6b8015f..4d46634f 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -567,9 +567,11 @@ // 页面滚动事件 on_scroll_event(e) { const scroll_num = e.detail.scrollTop; - if ((scroll_num - 20) / (this.sticky_top + 33) <= 1) { + if (scroll_num / (this.sticky_top + 33) <= 1) { // 更新数据的逻辑 this.scroll_top = scroll_num; + } else { + this.scroll_top = this.sticky_top + 100; } this.scroll_timer_compute(scroll_num); }, diff --git a/components/diy/header.vue b/components/diy/header.vue index c6003a48..e5f348c9 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -209,10 +209,10 @@ const gradient = { color_list: up_slide_background_color_list, direction: up_slide_background_direction }; // 背景图 const back = { background_img: up_slide_background_img, background_img_style: up_slide_background_img_style }; - const up_slide_opacity = 'opacity:' + ((newVal - 20) / (this.header_top + 33) > 1 ? 1 : ((newVal - 20) / (this.header_top + 33)).toFixed(2)) + ';'; + const up_slide_opacity = 'opacity:' + ((newVal - 20) / this.header_top > 1 ? 1 : ((newVal - 20) / this.header_top).toFixed(2)) + ';'; this.up_slide_opacity = up_slide_opacity; // 来的logo要比新的隐藏的快，所以要比原来的logo快一点 - this.up_slide_old_logo_style = 'opacity:' + ((newVal - 5) / (this.header_top + 33) > 1 ? 0 : (1 - (newVal - 5) / (this.header_top + 33)).toFixed(2)) + ';'; + this.up_slide_old_logo_style = 'opacity:' + ((newVal - 5) / this.header_top > 1 ? 0 : (1 - (newVal - 5) / this.header_top).toFixed(2)) + ';'; // =0是大小误差 this.up_slide_style = gradient_computer(gradient) + up_slide_opacity; this.up_slide_img_style = background_computer(back); From f8d5da258c050d63c56f044517ff1d67070d36fc Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 26 Dec 2024 17:07:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.diy=E6=BB=9A=E5=8A=A8=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 ++-- components/diy/diy.vue | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/App.vue b/App.vue index 72d1dd6c..48913d0e 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'https://d1.shopxo.vip/', + request_url:'https://new.shopxo.vip/', // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） - static_url:'https://d1.shopxo.vip/', + static_url:'https://new.shopxo.vip/', // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） system_type: 'default', diff --git a/components/diy/diy.vue b/components/diy/diy.vue index 4d46634f..b7d2876c 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -4,7 +4,7 @@ - + @@ -254,6 +254,7 @@ outer_container_padding: 0, // 滚动延迟器 + head_scroll_top: 0, scroll_throttle_timeout: null, }; }, @@ -569,10 +570,11 @@ const scroll_num = e.detail.scrollTop; if (scroll_num / (this.sticky_top + 33) <= 1) { // 更新数据的逻辑 - this.scroll_top = scroll_num; + this.head_scroll_top = scroll_num; } else { - this.scroll_top = this.sticky_top + 100; + this.head_scroll_top = this.sticky_top + 100; } + this.scroll_top = scroll_num; this.scroll_timer_compute(scroll_num); }, From 603fe8278de642a11415779917cf4ff8cf38f914 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 26 Dec 2024 17:11:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.diy=E6=BB=9A=E5=8A=A8=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy/article-tabs.vue | 2 +- components/diy/goods-tabs.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue index 987e6856..88ee69f5 100644 --- a/components/diy/article-tabs.vue +++ b/components/diy/article-tabs.vue @@ -1,7 +1,7 @@