From 4eba47d7b08133992783391148bdef3c1ded8ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 11:02:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=8D=A1=E6=98=BE=E7=A4=BA=E7=9A=84=E9=80=BB=E8=BE=91=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          | 4 ++--
 components/diy/article-tabs.vue  | 8 ++++----
 components/diy/data-tabs.vue     | 8 ++++----
 components/diy/goods-tabs.vue    | 8 ++++----
 components/diy/tabs-carousel.vue | 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/App.vue b/App.vue
index 38ef28c9..ea539fd3 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://d1.shopxo.vip/',
+                request_url:'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://d1.shopxo.vip/',
+                static_url:'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index cfc71382..e3e974b6 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 文章列表 -->
-    <view class="article-tabs ou" :class="'article-tabs-' + propKey" :style="style_container">
-        <view class="ou" :style="style_img_container">
+    <view class="article-tabs" :class="'article-tabs-' + propKey" :style="style_container">
+        <view :style="style_img_container">
             <componentDiyModulesTabsView :propKey="propKey" :propValue="article_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsBackground="tabs_background" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
             <view :style="article_margin_top">
                 <view :style="article_container">
@@ -203,8 +203,8 @@
                     top_up: new_content.tabs_top_up,
                     sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),
                     article_tabs: new_data,
-                    style_container: common_styles_computer(common_style),
-                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    style_container: common_styles_computer(common_style) + (new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
+                    style_img_container: common_img_computer(common_style, this.propIndex) + radius_computer(common_style) +(new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
                     tabs_style: new_tabs_style,
                     article_margin_top:  'margin-top:' + (new_style?.article_content_spacing || 0) * 2 + 'rpx',
                     tabs_sliding_fixed_bg: gradient_computer(tabs_data),
diff --git a/components/diy/data-tabs.vue b/components/diy/data-tabs.vue
index a1eccfe7..cc141faa 100644
--- a/components/diy/data-tabs.vue
+++ b/components/diy/data-tabs.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="data-tabs ou" :class="'data-tabs-' + propKey" :style="style_container">
-        <view class="ou" :style="style_img_container">
+    <view class="data-tabs" :class="'data-tabs-' + propKey" :style="style_container">
+        <view :style="style_img_container">
             <componentDiyModulesTabsView :propKey="propKey" :propValue="data_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" :propTabsBackground="tabs_background" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
             <view :style="data_margin_top">
                 <view :style="data_container">
@@ -259,8 +259,8 @@
                     data_tabs: new_data,
                     // 自定义需要做等比缩放，因此宽度需要减去 外层通用的宽度和内容区域的宽度
                     outer_container_width: common_style.margin_left + common_style.margin_right + common_style.padding_left + common_style.padding_right + new_style.data_content_margin.margin_left + new_style.data_content_margin.margin_right + new_style.data_content_padding.padding_left + new_style.data_content_padding.padding_right,
-                    style_container: common_styles_computer(common_style),
-                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    style_container: common_styles_computer(common_style) + (new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
+                    style_img_container: common_img_computer(common_style, this.propIndex) + radius_computer(common_style) +(new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
                     tabs_style: new_tabs_style,
                     tabs_sliding_fixed_bg: gradient_computer(tabs_data),
                     tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(new_style?.tabs_margin || old_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + 'overflow: hidden;',
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 36998a89..b7e9ca4e 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="goods-tabs ou" :class="'goods-tabs-' + propKey" :style="style_container">
-        <view class="ou" :style="style_img_container">
+    <view class="goods-tabs" :class="'goods-tabs-' + propKey" :style="style_container">
+        <view :style="style_img_container">
             <componentDiyModulesTabsView :propKey="propKey" :propValue="goods_tabs" :propIsTop="top_up == '1'" :propTop="sticky_top" :propStyle="tabs_style" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propCustomNavHeight="propIsTabsUseSafeDistance ? (propCustomNavHeight * 2 + 'rpx') : '0rpx'" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" :propTabsBackground="tabs_background" @onTabsTap="tabs_click_event"></componentDiyModulesTabsView>
             <view :style="shop_margin_top">
                 <view :style="shop_container">
@@ -195,8 +195,8 @@
                     top_up: new_content.tabs_top_up,
                     sticky_top: this.propTop + (new_style?.tabs_margin?.margin_top || 0),
                     goods_tabs: new_data,
-                    style_container: common_styles_computer(common_style),
-                    style_img_container: common_img_computer(common_style, this.propIndex),
+                    style_container: common_styles_computer(common_style) + (new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
+                    style_img_container: common_img_computer(common_style, this.propIndex) + radius_computer(common_style) +(new_content.tabs_top_up == '1' ? 'overflow: unset;' : ''),
                     tabs_style: new_tabs_style,
                     tabs_sliding_fixed_bg: gradient_computer(tabs_data),
                     tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + margin_computer(new_style?.tabs_margin || old_margin) + border_computer(tabs_content) + box_shadow_computer(tabs_content) + 'overflow: hidden;',
diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue
index 22ec5672..1f1eebcd 100644
--- a/components/diy/tabs-carousel.vue
+++ b/components/diy/tabs-carousel.vue
@@ -1,7 +1,7 @@
 <template>
-    <view class="ou pr" :style="style_container + swiper_bg_style">
+    <view class="pr" :style="style_container + swiper_bg_style">
         <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
-        <view class="ou wh-auto" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? swiper_bg_img_style_null : '')">
+        <view class="wh-auto" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? swiper_bg_img_style_null : '')">
             <componentDiyTabs :propKey="propKey" :propContentPadding="propContentPadding" :propValue="propValue" :propTop="propTop" :propIsRotatingBackground="is_rotating_background" :propBgStyle="swiper_bg_style" :propBgImgStyle="swiper_bg_img_style" :propStickyTop="propStickyTop" :propIsImmersionModel="propIsImmersionModel" :propNewIsTabsSafeDistance="new_is_tabs_safe_distance" :propNavIsTop="propNavIsTop" :propTabsIsTop="propTabsIsTop" :propIsCommon="false" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propSpacingCommonStyle="spacing_common_style" :propTabsSlidingFixedBg="tabs_sliding_fixed_bg" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
             <view :style="carousel_margin_top">
                 <view :style="carousel_container">

From f75f2e0e10e204e7340687e66e0a56a8f3f9cd0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 10 Mar 2025 11:32:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=BA=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?=
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 ea539fd3..d25db4e2 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                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/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',