From 9171e62315bb0abac4a79ab3a4a685d86c0a557c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 13 Aug 2024 16:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-search/index.vue          | 14 +++++++++++---
 .../model-search/model-search-content.vue      |  2 +-
 .../model-shop-tabs-content.vue                | 18 +++++++++---------
 src/layout/components/main/default/search.ts   |  5 +++--
 src/utils/index.ts                             |  2 +-
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/components/model-search/index.vue b/src/components/model-search/index.vue
index bc4c6627..deccae6a 100644
--- a/src/components/model-search/index.vue
+++ b/src/components/model-search/index.vue
@@ -14,6 +14,9 @@
                     </template>
                 </div>
             </template>
+            <template v-else-if="form.style_radio == 'search' && form.style_type == 'logo' && form.logo.length > 0">
+                <image-empty v-model="form.logo[0]" class="search-image mr-10"></image-empty>
+            </template>
             <el-input :placeholder="get_placeholder()" :style="{ borderColor: 'red' }" :readonly="true">
                 <template v-if="text_location == 'right'" #suffix>
                     <el-icon class="iconfont icon-search" />
@@ -57,7 +60,7 @@ const style = computed(() => {
 });
 const style_container = computed(() => common_styles_computer(new_style.value.common_style));
 // 输入框颜色
-const border_color = computed(() => new_style.value.search_border);
+const search_border = computed(() => new_style.value.search_border);
 // 提示语颜色
 const placeholder_color = computed(() => new_style.value.tips_color || '#CCCCCC');
 // 定位位置
@@ -78,7 +81,9 @@ const get_placeholder = () => {
 :deep(.el-input) {
     & .el-input__wrapper {
         border-radius: 16px !important;
-        border: 1px solid v-bind(border_color);
+        border: 0;
+        box-shadow: none;
+        background: v-bind(search_border);
     }
     & .el-input__inner::placeholder, 
     & .el-input__prefix-inner {
@@ -89,7 +94,10 @@ const get_placeholder = () => {
 .set-text-size {
     font-size: v-bind(text_size);
 }
-
+.search-image {
+    width: 5rem;
+    height: 3rem;
+}
 .nowrap {
     text-wrap: nowrap;
 }
diff --git a/src/components/model-search/model-search-content.vue b/src/components/model-search/model-search-content.vue
index 05ed2859..b38312fb 100644
--- a/src/components/model-search/model-search-content.vue
+++ b/src/components/model-search/model-search-content.vue
@@ -35,7 +35,7 @@
                 </template>
                 <template v-if="form.style_radio == 'search' && form.style_type == 'logo'">
                     <el-form-item label="logo图">
-                        <upload></upload>
+                        <upload v-model="form.logo" :limit="1" size="60"></upload>
                     </el-form-item>
                 </template>
             </card-container>
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index 6c9dadc0..c3f4b836 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -28,7 +28,7 @@
                                 </el-form-item>
                                 <template v-if="active_index == index">
                                     <el-form-item label="上传图片">
-                                        <upload></upload>
+                                        <upload v-model="row.img" :limit="1" size="40" styles="2"></upload>
                                     </el-form-item>
                                     <el-form-item label="简介配置">
                                         <el-input v-model="row.desc" placeholder="请输入简介" clearable />
@@ -43,14 +43,14 @@
                                             <drag :data="row.product_list" :space-col="20" @remove="product_list_remove($event, index)" @on-sort="product_list_sort($event, index)">
                                                 <template #default="scoped">
                                                     <upload v-model="scoped.row.new_src" :limit="1" size="40" styles="2"></upload>
-                                                        <el-image :src="scoped.row.url" fit="contain" class="img">
-                                                            <template #error>
-                                                                <div class="bg-f5 flex-row jc-c align-c radius h w">
-                                                                    <icon name="error-img" size="16" color="9"></icon>
-                                                                </div>
-                                                            </template>
-                                                        </el-image>
-                                                        <url-value v-model="scoped.row.href"></url-value>
+                                                    <el-image :src="scoped.row.url" fit="contain" class="img">
+                                                        <template #error>
+                                                            <div class="bg-f5 flex-row jc-c align-c radius h w">
+                                                                <icon name="error-img" size="16" color="9"></icon>
+                                                            </div>
+                                                        </template>
+                                                    </el-image>
+                                                    <url-value v-model="scoped.row.href"></url-value>
                                                 </template>
                                             </drag>
                                             <el-button class="mtb-20 w" @click="product_add(index)">+添加</el-button>
diff --git a/src/layout/components/main/default/search.ts b/src/layout/components/main/default/search.ts
index 0385ddfc..04c3c998 100644
--- a/src/layout/components/main/default/search.ts
+++ b/src/layout/components/main/default/search.ts
@@ -9,7 +9,7 @@ interface defaultSearch {
     content: {
         style_radio: string;
         style_type: string;
-        logo: string;
+        logo: uploadList[];
         search_title: string;
         search_link: object;
         location: string;
@@ -31,7 +31,7 @@ const defaultSearch: defaultSearch = {
     content: {
         style_radio: 'search',
         style_type: 'title',
-        logo: '',
+        logo: [],
         search_title: '',
         search_link: {},
         location: 'store',
@@ -54,6 +54,7 @@ const defaultSearch: defaultSearch = {
         text_size: 15,
         common_style: {
             ...defaultCommon,
+            color_list: ['#ffffff'],
             padding_top: 9,
             padding_bottom: 9,
             padding_left: 15,
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3cf8f035..7fda39f1 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -41,7 +41,7 @@ export function gradient_handle(color_list: string[], direction: string) {
         reverse_color.forEach((item: any, index: number) => {
             container_common_styles += `${item ? item : 'rgb(255 255 255 / 0%)'}`;
             if (color_list.length == 1) {
-                container_common_styles += `0%, ${item} 100%`;
+                container_common_styles += ` 0%, ${item} 100%`;
             } else {
                 if (index == color_list.length - 1) {
                     container_common_styles += ` 100%`;