From 15ca11c98f1415dce89fb2691312cfc775de7636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 22 Aug 2024 16:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/drag-group/index.vue    |  6 +++++-
 src/components/common/tabs-view/index.vue     |  2 +-
 .../components/product-list-show.vue          | 20 ++++---------------
 src/components/model-data-magic/index.vue     |  6 +++++-
 src/components/model-shop-list/index.vue      |  5 +++--
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/components/common/drag-group/index.vue b/src/components/common/drag-group/index.vue
index 7c5b26c8..b0a0e32c 100644
--- a/src/components/common/drag-group/index.vue
+++ b/src/components/common/drag-group/index.vue
@@ -13,7 +13,7 @@
                 <el-input v-model="row.new_title" placeholder="请输入链接" type="textarea" class="flex-1 do-not-trigger" :rows="2"></el-input>
             </template>
             <template v-else>
-                <div class="flex-1 flex-width text-line-2 size-12 self-s">{{ row.new_title }}</div>
+                <div class="flex-1 flex-width text-line-2 size-12 self-s do-not-trigger" @dblclick="double_click(index)">{{ row.new_title }}</div>
             </template>
         </template>
     </drag>
@@ -67,6 +67,10 @@ const edit = (index: number) => {
         edit_index.value = index;
     }
 }
+
+const double_click = (index: number) => {
+    edit_index.value = index;
+}
 </script>
 <style lang="scss" scoped>
 .img {
diff --git a/src/components/common/tabs-view/index.vue b/src/components/common/tabs-view/index.vue
index bfd92b4c..46a7a2c4 100644
--- a/src/components/common/tabs-view/index.vue
+++ b/src/components/common/tabs-view/index.vue
@@ -2,7 +2,7 @@
     <div class="tabs flex-row oh">
         <template v-for="(item, index) in tabs.content.tabs_list" :key="index">
             <div class="item nowrap flex-col jc-c gap-4" :class="tabs_style + (index == 0 ? ' active' : '')">
-                <img class="img" src="@/assets/images/components/model-user-info/avatar.png" />
+                <image-empty v-model="item.img[0]" class="img" error-img-style="width:2rem;height:2rem;"></image-empty>
                 <div class="title" :style="index == 0 ? tabs_style_style.tabs_title_checked : tabs_style_style.tabs_title">{{ item.title }}</div>
                 <div class="desc">{{ item.desc }}</div>
                 <icon name="checked-1" class="icon"></icon>
diff --git a/src/components/model-data-magic/components/product-list-show.vue b/src/components/model-data-magic/components/product-list-show.vue
index bee0bd79..049ca357 100644
--- a/src/components/model-data-magic/components/product-list-show.vue
+++ b/src/components/model-data-magic/components/product-list-show.vue
@@ -6,11 +6,8 @@
                     <template v-if="!isEmpty(item.new_url)">
                         <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
                     </template>
-                    <template v-else-if="!isEmpty(item.images)">
-                        <el-image :src="item.images" fit="contain" class="img" :style="contentImgRadius"></el-image>
-                    </template>
                     <template v-else>
-                        <image-empty :style="contentImgRadius"></image-empty>
+                        <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
                     </template>
                     <div v-if="!isEmpty(isShow)" class="flex-col w h tl gap-10">
                         <div v-if="isShow.includes('0')" class="text-line-2 size-14">{{ item.title }}</div>
@@ -29,11 +26,8 @@
                         <template v-if="!isEmpty(item.new_url)">
                             <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
                         </template>
-                        <template v-else-if="!isEmpty(item.images)">
-                            <el-image :src="item.images" fit="contain" class="img" :style="contentImgRadius"></el-image>
-                        </template>
                         <template v-else>
-                            <image-empty :style="contentImgRadius"></image-empty>
+                            <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
                         </template>
                         <div v-if="isShow.includes('1')" class="price-suspension text-line-1">
                             {{ item.show_price_symbol }}{{ item.min_price }}
@@ -50,11 +44,8 @@
                     <template v-if="!isEmpty(item.new_url)">
                         <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
                     </template>
-                    <template v-else-if="!isEmpty(item.images)">
-                        <el-image :src="item.images" fit="contain" class="img" :style="contentImgRadius"></el-image>
-                    </template>
                     <template v-else>
-                        <image-empty :style="contentImgRadius"></image-empty>
+                        <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
                     </template>
                     <div v-if="!isEmpty(isShow)" class="flex-col w tl gap-10" :style="`${ padding_computer(props.chunkPadding) }`">
                         <div v-if="isShow.includes('0')" class="text-line-2 size-14">{{ item.title }}</div>
@@ -76,11 +67,8 @@
                     <template v-if="!isEmpty(item.new_url)">
                         <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
                     </template>
-                    <template v-else-if="!isEmpty(item.images)">
-                        <el-image :src="item.images" fit="contain" class="img" :style="contentImgRadius"></el-image>
-                    </template>
                     <template v-else>
-                        <image-empty :style="contentImgRadius"></image-empty>
+                        <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
                     </template>
                     <div v-if="!isEmpty(isShow)" class="flex-col w h tl gap-20">
                         <div v-if="isShow.includes('0')" class="text-line-2 size-14">{{ item.title }}</div>
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index f5a9b4aa..1aa6f042 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -35,7 +35,7 @@
             <template v-else>
                 <div v-for="(item, index) in data_magic_list" :key="index" class="cube-selected img-spacing-border" :style="`${ selected_style(item) } ${ item.data_style.background_style } ${ content_radius }`">
                     <template v-if="item.data_content.data_type == 'commodity'">
-                        <div class="w h flex-col gap-20" :style="`${ padding_computer(item.data_style.chunk_padding) }`">
+                        <div :class="[spacing_processing(index) ? 'gap-20 w h flex-col' : 'gap-10 w h flex-col']" :style="`${ padding_computer(item.data_style.chunk_padding) }`">
                             <div v-if="!isEmpty(item.data_content.heading_title) || !isEmpty(item.data_content.subtitle)" class="flex-col gap-5 tl">
                                 <p class="ma-0 w text-line-1" :style="trends_config(item.data_style, 'heading')">{{ item.data_content.heading_title || '' }}</p>
                                 <p class="ma-0 w text-line-1" :style="trends_config(item.data_style, 'subtitle')">{{ item.data_content.subtitle || '' }}</p>
@@ -261,6 +261,10 @@ const commodity_list = (list: any[], num: number) => {
         return [];
     }
 }
+// 不属于第9个，并且第9个的第一个和第二个
+const spacing_processing = (index: number) => {
+    return form.value.style_actived !== 8 || (form.value.style_actived === 8 && [0, 1].includes(index))
+}
 // 公共样式
 const style_container = computed(() => common_styles_computer(new_style.value.common_style));
 </script>
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index fa3f4454..9d2b7f5c 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -13,10 +13,10 @@
                 <template v-else>
                     <template v-if="!isEmpty(item)">
                         <template v-if="!isEmpty(item.new_url)">
-                            <image-empty v-model="item.new_url[0]" :class="`flex-img${product_style} flex align-c jc-c`" :style="content_img_radius"></image-empty>
+                            <image-empty v-model="item.new_url[0]" :class="`flex-img${product_style}`" :style="content_img_radius"></image-empty>
                         </template>
                         <template v-else>
-                            <image-empty v-model="item.images" :class="`flex-img${product_style} flex align-c jc-c`" :style="content_img_radius"></image-empty>
+                            <image-empty v-model="item.images" :class="`flex-img${product_style}`" :style="content_img_radius"></image-empty>
                         </template>
                     </template>
                     <div class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
@@ -373,6 +373,7 @@ const style_container = computed(() => {
     width: calc((100% - v-bind(three_columns)) / 3);
 }
 .multicolumn-columns {
+    width: v-bind(multicolumn_columns);
     min-width: v-bind(multicolumn_columns);
 }
 .flex-img0 {