From d46656c78f7068c5135cc817319a5038b2cf633f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 9 Oct 2024 10:33:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 04d22846..2ee7f622 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -248,7 +248,7 @@
             init() {
                 // tabs选项卡数据过滤
                 this.setData({
-                    hack_reset: true,
+                    hack_reset: false,
                     header_data: this.propValue.header,
                     footer_data: this.propValue.footer,
                     diy_data: this.propValue.diy_data,
@@ -258,6 +258,11 @@
                     temp_sticky_top: this.sticky_top,
                     temp_header_top: this.header_top,
                 });
+                this.$nextTick(() => {
+                    this.setData({
+                        hack_reset: true,
+                    });
+                });
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data);
             },
             // 顶部导航沉浸模式回调

From 483219758640876f468a8c5909a4cf407f2430ab Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 9 Oct 2024 10:50:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                  | 8 ++++----
 components/diy/video.vue | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/App.vue b/App.vue
index e3a9bff7..c0ae5a28 100644
--- a/App.vue
+++ b/App.vue
@@ -7,12 +7,12 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                // request_url: 'http://shopxo.com/',
-                request_url:'https://new.shopxo.vip/',
+                request_url: 'http://shopxo.com/',
+                // request_url:'https://new.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                // static_url: 'http://shopxo.com/',
-                static_url:'https://new.shopxo.vip/',
+                static_url: 'http://shopxo.com/',
+                // static_url:'https://new.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/diy/video.vue b/components/diy/video.vue
index 60ad57cb..04d1606c 100644
--- a/components/diy/video.vue
+++ b/components/diy/video.vue
@@ -41,6 +41,8 @@
             init() {
                 const new_content = this.propValue.content || {};
                 const new_style = this.propValue.style || {};
+                // 视频比例
+                this.get_video_height(new_content.video_ratio);
                 this.setData({
                     video_img: new_content.video_img.length > 0 ? new_content.video_img[0].url : '',
                     video: new_content.video.length > 0 ? new_content.video[0].url : '',