From c52d9ff6cf81b1d5eb274efb777b981757d35ad2 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 26 Dec 2024 20:54:20 +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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index f7581d6a..b65e391e 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -1,7 +1,7 @@
 <template>
     <view :style="page_style">
         <view :style="page_img_style">
-            <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" lower-threshold="60" scroll-with-animation>
+            <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
                 <!-- 头部小程序兼容 -->
                 <view class="pr header">
                     <componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onImmersionModelCallBack="immersion_model_call_back" @onLocationBack="choice_location_back"></componentDiyHeader>
@@ -462,6 +462,10 @@
                     this.get_goods_list();
                 }
             },
+            // 滚动到顶部
+            on_scroll_upper_event() {
+                this.head_scroll_top = 0;
+            },
 
             // 查询商品
             get_goods_list(is_mandatory) {
@@ -567,7 +571,7 @@
 
             // 页面滚动事件
             on_scroll_event(e) {
-                const scroll_num = e.detail.scrollTop;
+                const scroll_num = parseInt(e.detail.scrollTop);
                 if (scroll_num <= 20) {
                     this.head_scroll_top = 0;
                 } else {
@@ -578,7 +582,6 @@
                         this.head_scroll_top = this.sticky_top + 100;
                     }
                 }
-                this.scroll_timer_compute(scroll_num);
 
                 // 判断顶部导航是否置顶
                 // #ifdef H5 || MP-TOUTIAO
@@ -594,6 +597,7 @@
                     }
                 }
                 // #endif
+                this.scroll_timer_compute(scroll_num);
             },
 
             scroll_timer_compute(scroll_num) {

From eed673722e873f47a8336c862206772e23ae4071 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 26 Dec 2024 21:10:06 +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

---
 components/diy/diy.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index b65e391e..58f98257 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -464,7 +464,9 @@
             },
             // 滚动到顶部
             on_scroll_upper_event() {
-                this.head_scroll_top = 0;
+                setTimeout(() => {
+                    this.head_scroll_top = 0;
+                });
             },
 
             // 查询商品

From 97ffbbb9e09fe8a0bf03fd9fcc90cbd0c87c6255 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 26 Dec 2024 21:10:23 +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

---
 App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index 48913d0e..72d1dd6c 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://new.shopxo.vip/',
+                request_url:'https://d1.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://new.shopxo.vip/',
+                static_url:'https://d1.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',