From 83069fd9b22ffb8cf9bcfee86a0abf0cc765ab8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 13 Sep 2024 14:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue     |  2 +-
 components/diy/diy.vue          |  5 ++++-
 components/diy/float-window.vue |  4 ++--
 components/diy/goods-list.vue   |  4 ++--
 components/diy/nav-group.vue    |  4 ++--
 components/diy/search.vue       | 10 +++++-----
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 7e21d370..c4867508 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -56,7 +56,7 @@
 <script>
     const app = getApp();
     import { common_styles_computer, radius_computer, isEmpty, gradient_computer, padding_computer } from '@/common/js/common/common.js';
-    import imageEmpty from './modules/image-empty.vue';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
     export default {
         components: {
             imageEmpty
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 32e6bb10..582c71d3 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -8,6 +8,7 @@
                 <componentCarousel v-if="item.key == 'carousel'" :value="item.com_data"></componentCarousel>
                 <componentNavGroup v-if="item.key == 'nav-group'" :value="item.com_data"></componentNavGroup>
                 <componentGoodsList v-if="item.key == 'goods-list'" :value="item.com_data"></componentGoodsList>
+                <componentGoodsTabs v-if="item.key == 'goods-tabs'" :value="item.com_data"></componentGoodsTabs>
                 <componentDiyUserInfo v-if="item.key == 'user-info'" :value="item.com_data"></componentDiyUserInfo>
                 <componentDiyVideo v-else-if="item.key == 'video'" :value="item.com_data"></componentDiyVideo>
                 <componentDiyArticleList v-else-if="item.key == 'article-list'" :value="item.com_data"></componentDiyArticleList>
@@ -44,6 +45,7 @@
     import componentAuxiliaryBlank from '@/components/diy/auxiliary-blank.vue';
     import componentNavGroup from '@/components/diy/nav-group.vue';
     import componentGoodsList from '@/components/diy/goods-list.vue';
+    import componentGoodsTabs from '@/components/diy/goods-tabs.vue'
     export default {
         name: 'diy',
         props: {
@@ -69,7 +71,8 @@
             componentTextTitle,
             componentAuxiliaryBlank,
             componentNavGroup,
-            componentGoodsList
+            componentGoodsList,
+            componentGoodsTabs
         },
         data() {
             return {
diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue
index bce7e801..e994e31b 100644
--- a/components/diy/float-window.vue
+++ b/components/diy/float-window.vue
@@ -14,8 +14,8 @@
 
 <script>
 const app = getApp();
-import { isEmpty } from '../../common/js/common/common';
-import imageEmpty from './modules/image-empty.vue';
+import { isEmpty } from '@/common/js/common/common.js';
+import imageEmpty from '@/components/diy/modules/image-empty.vue';
 export default {
     components: {
         imageEmpty
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 6125432a..e776a1ae 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -147,8 +147,8 @@
         gradient_handle,
         padding_computer,
         radius_computer
-    } from '../../common/js/common/common';
-    import imageEmpty from './modules/image-empty.vue';
+    } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
     export default {
         components: {
             imageEmpty
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
index ffa6ec02..013d5a89 100644
--- a/components/diy/nav-group.vue
+++ b/components/diy/nav-group.vue
@@ -31,8 +31,8 @@
         isEmpty,
         common_styles_computer,
         radius_computer
-    } from '../../common/js/common/common';
-    import imageEmpty from './modules/image-empty.vue';
+    } from '@/common/js/common/common.js';
+    import imageEmpty from '@/components/diy/modules/image-empty.vue';
     export default {
         components: {
             imageEmpty
diff --git a/components/diy/search.vue b/components/diy/search.vue
index 646a3dda..4c462b77 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -10,7 +10,7 @@
                             </view>
                         </template>
                         <template v-else>
-                            <iconfont :name="!is_obj_empty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-index-search'" size="'28rpx'" :color="new_style.icon_color"></iconfont>
+                            <iconfont :name="!isEmpty(form.icon_class) ? 'icon-' + form.icon_class : 'icon-index-search'" size="'28rpx'" :color="new_style.icon_color"></iconfont>
                         </template>
                     </template>
                     <span v-if="form.is_tips_show == '1'" :class="[isPageSettings ? 'text-size-xs text-line-1' : 'text-size-md text-line-1']" :style="'color:' + new_style.tips_color">{{ form.tips }}</span>
@@ -19,12 +19,12 @@
                     <template v-if="form.search_type === 'text'">
                         <view :class="['padding-vertical-xs text-size-xs', isPageSettings ? 'padding-horizontal' : 'padding-horizontal-lg']">{{ form.search_tips }}</view>
                     </template>
-                    <template v-else-if="!is_obj_empty(form.search_botton_img) && form.search_botton_img.length > 0">
+                    <template v-else-if="!isEmpty(form.search_botton_img) && form.search_botton_img.length > 0">
                         <image :src="form.search_botton_img[0].url" class="img" :style="search_button_radius" mode="aspectFill"></image>
                     </template>
                     <template v-else>
                         <view :class="['padding-vertical-xs text-size-xs', isPageSettings ? 'padding-horizontal' : 'padding-horizontal-lg']">
-                            <iconfont :name="!is_obj_empty(form.search_botton_icon) ? 'icon-' + form.search_botton_icon : ''" size="'28rpx'"></iconfont>
+                            <iconfont :name="!isEmpty(form.search_botton_icon) ? 'icon-' + form.search_botton_icon : ''" size="'28rpx'"></iconfont>
                         </view>
                     </template>
                 </view>
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-    import { background_computer, common_styles_computer, gradient_computer, radius_computer, is_obj_empty } from '@/common/js/common/common.js';
+    import { background_computer, common_styles_computer, gradient_computer, radius_computer, isEmpty } from '@/common/js/common/common.js';
     export default {
         props: {
             value: {
@@ -67,7 +67,7 @@
             this.init();
         },
         methods: {
-            is_obj_empty,
+            isEmpty,
             init() {
                 const { search_button_radius, common_style } = this.new_style;
                 this.setData({