From cf04245f9a311cef09d35d23d779633b79d47c02 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, 23 Aug 2024 18:18:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/product-list-show.vue             | 16 ++++++++--------
 .../model-data-magic/components/tabs-content.vue |  2 +-
 src/components/model-data-magic/index.vue        |  2 +-
 src/components/model-shop-list/index.vue         | 10 +++++-----
 .../model-shop-list/model-shop-list-content.vue  |  2 +-
 .../model-shop-tabs/model-shop-tabs-content.vue  |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

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 d5123069..fe834339 100644
--- a/src/components/model-data-magic/components/product-list-show.vue
+++ b/src/components/model-data-magic/components/product-list-show.vue
@@ -3,8 +3,8 @@
         <div class="flex-row gap-10 align-c w h">
             <template v-if="props.flex === 'row'">
                 <div v-for="(item, index) in split_list" :key="index" class="flex-row gap-10 half-width h">
-                    <template v-if="!isEmpty(item.new_url)">
-                        <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
+                    <template v-if="!isEmpty(item.new_cover)">
+                        <image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
                     </template>
                     <template v-else>
                         <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@@ -23,8 +23,8 @@
             <template v-else-if="actived != 7 || props.num !== 1">
                 <div v-for="(item, index) in split_list" :key="index" :class="['flex-col gap-10 h', { 'half-width': props.num !== 1, 'w': props.num == 1 }]">
                     <div class="w h re">
-                        <template v-if="!isEmpty(item.new_url)">
-                            <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
+                        <template v-if="!isEmpty(item.new_cover)">
+                            <image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
                         </template>
                         <template v-else>
                             <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@@ -41,8 +41,8 @@
             </template>
             <template v-else>
                 <div v-for="(item, index) in split_list" :key="index" class="flex-col w h">
-                    <template v-if="!isEmpty(item.new_url)">
-                        <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
+                    <template v-if="!isEmpty(item.new_cover)">
+                        <image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
                     </template>
                     <template v-else>
                         <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@@ -64,8 +64,8 @@
         <div class="flex-col gap-20 align-c w h">
             <template v-if="props.flex === 'row'">
                 <div v-for="(item, index) in split_list" :key="index" class="flex-row gap-10 align-c w h">
-                    <template v-if="!isEmpty(item.new_url)">
-                        <image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
+                    <template v-if="!isEmpty(item.new_cover)">
+                        <image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
                     </template>
                     <template v-else>
                         <image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index 371062d0..55c966f7 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -94,7 +94,7 @@ const url_value_dialog_call_back = (item: any[]) => {
     item.forEach((item: any) => {
         form.value.goods_list.push({
             id: get_math(),
-            new_url: [],
+            new_cover: [],
             new_title: '',
             data: item,
         });
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index 04e2b6da..c965a0ca 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -247,7 +247,7 @@ const commodity_list = (list: any[], num: number) => {
         const goods_list = cloneDeep(list).map((item: any) => ({
             ...item.data,
             title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
-            new_url: item.new_url,
+            new_cover: item.new_cover,
         }));
         // 存储数据显示
         let nav_list = [];
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index 079a1255..b9b944cc 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -12,8 +12,8 @@
                 </template>
                 <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${theme}`" :style="content_img_radius"></image-empty>
+                        <template v-if="!isEmpty(item.new_cover)">
+                            <image-empty v-model="item.new_cover[0]" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
                         </template>
                         <template v-else>
                             <image-empty v-model="item.images" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
@@ -137,7 +137,7 @@ interface plugins_icon_data {
 interface data_list {
     title: string;
     images: string;
-    new_url: string[];
+    new_cover: string[];
     min_original_price: string;
     show_original_price_symbol: string;
     show_original_price_unit: string;
@@ -156,7 +156,7 @@ const default_list = {
     show_price_unit: '',
     sales_count: '1000',
     images: '',
-    new_url: [],
+    new_cover: [],
     plugins_view_icon_data: []
 };
 const list = ref<data_list[]>([]);
@@ -187,7 +187,7 @@ watchEffect(() => {
             list.value = cloneDeep(form.value.data_list).map((item: any) => ({
                 ...item.data,
                 title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
-                new_url: item.new_url,
+                new_cover: item.new_cover,
             }));
         } else {
             list.value = Array(4).fill(default_list);
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 1e058a1c..42bccfc8 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -138,7 +138,7 @@ const url_value_dialog_call_back = (item: any[]) => {
     item.forEach((item: any) => {
         form.value.data_list.push({
             id: get_math(),
-            new_url: [],
+            new_cover: [],
             new_title: '',
             data: item,
         });
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 2b5dd347..8f11b556 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -204,7 +204,7 @@ const url_value_dialog_call_back = (item: any[]) => {
     item.forEach((item: any) => {
         form.value.tabs_list[click_index].data_list.push({
             id: get_math(),
-            new_url: [],
+            new_cover: [],
             new_title: '',
             data: item,
         });

From 12810a2d014974bb3c3accc4c5a45a448e910130 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, 23 Aug 2024 18:46:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9element-plus=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/color-picker/index.vue       | 2 +-
 src/layout/components/main/default/custom.ts     | 1 -
 src/layout/components/main/default/data-magic.ts | 1 -
 src/layout/components/main/default/user-info.ts  | 1 -
 src/main.ts                                      | 7 ++++++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/base/color-picker/index.vue b/src/components/base/color-picker/index.vue
index f6e01e6e..b1e572e3 100644
--- a/src/components/base/color-picker/index.vue
+++ b/src/components/base/color-picker/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="flex-row align-c gap-12">
-        <el-color-picker v-model="color" show-alpha :predefine="predefine_colors" @change="color_picker_change" />
+        <el-color-picker v-model="color" show-alpha :predefine="predefine_colors" @change="color_picker_change"  />
         <icon name="reset" color="primary" size="16" :class="['c-pointer', { disable: color == defaultColor }]" @click="reset_event"></icon>
     </div>
 </template>
diff --git a/src/layout/components/main/default/custom.ts b/src/layout/components/main/default/custom.ts
index f60a9dce..a3c330bd 100644
--- a/src/layout/components/main/default/custom.ts
+++ b/src/layout/components/main/default/custom.ts
@@ -1,4 +1,3 @@
-import { de } from "element-plus/es/locale";
 import defaultCommon from "./index";
 
 interface defaultSearch {
diff --git a/src/layout/components/main/default/data-magic.ts b/src/layout/components/main/default/data-magic.ts
index a5262998..62a5c6ea 100644
--- a/src/layout/components/main/default/data-magic.ts
+++ b/src/layout/components/main/default/data-magic.ts
@@ -1,6 +1,5 @@
 import { get_math } from "@/utils";
 import defaultCommon from "./index";
-import { tr } from "element-plus/es/locale";
 interface data_magic {
     start: object;
     end: object;
diff --git a/src/layout/components/main/default/user-info.ts b/src/layout/components/main/default/user-info.ts
index bcf0ccf7..50a6e369 100644
--- a/src/layout/components/main/default/user-info.ts
+++ b/src/layout/components/main/default/user-info.ts
@@ -1,4 +1,3 @@
-import { id } from 'element-plus/es/locale';
 import defaultCommon from './index';
 interface DefaultUserInfo {
     content: {
diff --git a/src/main.ts b/src/main.ts
index be250025..7ab191db 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,8 +6,10 @@ import router from './router';
 import Particles from 'vue3-particles';
 
 import common from '@/utils/common';
-import Vue3DraggableResizable from 'vue3-draggable-resizable'
+import ElementPlus from 'element-plus';
+import zhCn from 'element-plus/es/locale/lang/zh-cn';
 //default styles
+import Vue3DraggableResizable from 'vue3-draggable-resizable'
 import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
 
 import '@/styles/index.scss';
@@ -19,6 +21,9 @@ app.config.globalProperties.$common = common;
 app.use(router);
 app.use(Particles);
 app.use(Vue3DraggableResizable);
+app.use(ElementPlus, {
+    locale: zhCn,
+});
 // 全局注册 状态管理(store)
 setupStore(app);
 

From 13c8bf4d7eacb0796cd466f6724ec7ffe81a3e42 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, 23 Aug 2024 18:51:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9element-plus=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 9 ++++++++-
 src/main.ts | 5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 90949588..7706c29b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,13 @@
 <template>
-    <router-view />
+    <el-config-provider :locale="zhCn">
+        <router-view />
+    </el-config-provider>
 </template>
 <script setup lang="ts">
+import { ElConfigProvider } from 'element-plus';
+// 中文
+import zhCn from 'element-plus/es/locale/lang/zh-cn';
+// 英文
+import en from 'element-plus/es/locale/lang/en';
 </script>
 <style scoped lang="scss"></style>
diff --git a/src/main.ts b/src/main.ts
index 7ab191db..4c4110dd 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,8 +6,6 @@ import router from './router';
 import Particles from 'vue3-particles';
 
 import common from '@/utils/common';
-import ElementPlus from 'element-plus';
-import zhCn from 'element-plus/es/locale/lang/zh-cn';
 //default styles
 import Vue3DraggableResizable from 'vue3-draggable-resizable'
 import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
@@ -21,9 +19,6 @@ app.config.globalProperties.$common = common;
 app.use(router);
 app.use(Particles);
 app.use(Vue3DraggableResizable);
-app.use(ElementPlus, {
-    locale: zhCn,
-});
 // 全局注册 状态管理(store)
 setupStore(app);
 

From eaa2f0e9b3a86fc627bf5e4d1a2ba89473b317b1 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, 23 Aug 2024 18:54:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-shop-tabs/model-shop-tabs-content.vue     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 8f11b556..3fe2550f 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -178,9 +178,16 @@ const tabs_list_sort = (item: any) => {
 const tabs_add = () => {
     form.value.tabs_list.push({
         id: get_math(),
-        src: 'carousel',
-        new_src: [],
-        href: {},
+        title: '',
+        img: [],
+        desc: '',
+        data_type: '0',
+        category: [],
+        data_ids: [],
+        number: 4,
+        sort: '0',
+        sort_rules: '0',
+        data_list: [],
     });
 };