From d0a865657f38e21c25cca3a8b407dd4a4960d3a1 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, 5 Sep 2024 09:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E5=92=8C=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84ke=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{model-shop-list => model-goods-list}/index.vue       | 2 +-
 .../model-goods-list-content.vue}                         | 0
 .../model-goods-list-setting.vue}                         | 4 ++--
 .../model-goods-list-styles.vue}                          | 0
 .../{model-shop-tabs => model-goods-tabs}/index.vue       | 2 +-
 .../model-goods-tabs-content.vue}                         | 0
 .../model-goods-tabs-setting.vue}                         | 5 +++--
 .../model-goods-tabs-styles.vue}                          | 1 -
 .../main/default/{shop-list.ts => goods-list.ts}          | 0
 .../main/default/{shop-tabs.ts => goods-tabs.ts}          | 0
 src/views/layout/components/main/index.ts                 | 4 ++--
 src/views/layout/components/main/index.vue                | 8 ++++----
 src/views/layout/components/settings/index.vue            | 8 ++++----
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename src/components/{model-shop-list => model-goods-list}/index.vue (99%)
 rename src/components/{model-shop-list/model-shop-list-content.vue => model-goods-list/model-goods-list-content.vue} (100%)
 rename src/components/{model-shop-list/model-shop-list-setting.vue => model-goods-list/model-goods-list-setting.vue} (67%)
 rename src/components/{model-shop-list/model-shop-list-styles.vue => model-goods-list/model-goods-list-styles.vue} (100%)
 rename src/components/{model-shop-tabs => model-goods-tabs}/index.vue (93%)
 rename src/components/{model-shop-tabs/model-shop-tabs-content.vue => model-goods-tabs/model-goods-tabs-content.vue} (100%)
 rename src/components/{model-shop-tabs/model-shop-tabs-setting.vue => model-goods-tabs/model-goods-tabs-setting.vue} (67%)
 rename src/components/{model-shop-tabs/model-shop-tabs-styles.vue => model-goods-tabs/model-goods-tabs-styles.vue} (99%)
 rename src/views/layout/components/main/default/{shop-list.ts => goods-list.ts} (100%)
 rename src/views/layout/components/main/default/{shop-tabs.ts => goods-tabs.ts} (100%)

diff --git a/src/components/model-shop-list/index.vue b/src/components/model-goods-list/index.vue
similarity index 99%
rename from src/components/model-shop-list/index.vue
rename to src/components/model-goods-list/index.vue
index 1f1cb0f7..08f3ddfa 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -468,7 +468,7 @@ watchEffect(() => {
 }
 .original-price-left {
     width: 1rem;
-    background-image: url('/src/assets/images/components/model-shop-list/price.png');
+    background-image: url('/src/assets/images/components/model-goods-list/price.png');
     background-size: 100% 100%;
     background-repeat: no-repeat;
 }
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-goods-list/model-goods-list-content.vue
similarity index 100%
rename from src/components/model-shop-list/model-shop-list-content.vue
rename to src/components/model-goods-list/model-goods-list-content.vue
diff --git a/src/components/model-shop-list/model-shop-list-setting.vue b/src/components/model-goods-list/model-goods-list-setting.vue
similarity index 67%
rename from src/components/model-shop-list/model-shop-list-setting.vue
rename to src/components/model-goods-list/model-goods-list-setting.vue
index acb22b41..2e0c0315 100644
--- a/src/components/model-shop-list/model-shop-list-setting.vue
+++ b/src/components/model-goods-list/model-goods-list-setting.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="auxiliary-line-setting">
         <template v-if="type == '1'">
-            <model-shop-list-content :value="value.content" :styles="value.style" :default-config="data_config"></model-shop-list-content>
+            <model-goods-list-content :value="value.content" :styles="value.style" :default-config="data_config"></model-goods-list-content>
         </template>
         <template v-if="type == '2'">
-            <model-shop-list-styles :value="value.style" :content="value.content" :default-config="data_config"></model-shop-list-styles>
+            <model-goods-list-styles :value="value.style" :content="value.content" :default-config="data_config"></model-goods-list-styles>
         </template>
     </div>
 </template>
diff --git a/src/components/model-shop-list/model-shop-list-styles.vue b/src/components/model-goods-list/model-goods-list-styles.vue
similarity index 100%
rename from src/components/model-shop-list/model-shop-list-styles.vue
rename to src/components/model-goods-list/model-goods-list-styles.vue
diff --git a/src/components/model-shop-tabs/index.vue b/src/components/model-goods-tabs/index.vue
similarity index 93%
rename from src/components/model-shop-tabs/index.vue
rename to src/components/model-goods-tabs/index.vue
index 3313e0e0..be5b256d 100644
--- a/src/components/model-shop-tabs/index.vue
+++ b/src/components/model-goods-tabs/index.vue
@@ -2,7 +2,7 @@
     <div :style="style_container">
         <tabs-view ref="tabs" :value="props.value"></tabs-view>
         <div class="pt-10">
-            <model-shop-list :value="tabs_list" :is-common-style="false"></model-shop-list>
+            <model-goods-list :value="tabs_list" :is-common-style="false"></model-goods-list>
         </div>
     </div>
 </template>
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-goods-tabs/model-goods-tabs-content.vue
similarity index 100%
rename from src/components/model-shop-tabs/model-shop-tabs-content.vue
rename to src/components/model-goods-tabs/model-goods-tabs-content.vue
diff --git a/src/components/model-shop-tabs/model-shop-tabs-setting.vue b/src/components/model-goods-tabs/model-goods-tabs-setting.vue
similarity index 67%
rename from src/components/model-shop-tabs/model-shop-tabs-setting.vue
rename to src/components/model-goods-tabs/model-goods-tabs-setting.vue
index 2097a78b..3a505d79 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-setting.vue
+++ b/src/components/model-goods-tabs/model-goods-tabs-setting.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="auxiliary-line-setting">
         <template v-if="type == '1'">
-            <model-shop-tabs-content :value="value.content" :tab-style="value.style" :default-config="data_config"></model-shop-tabs-content>
+            <model-goods-tabs-content :value="value.content" :tab-style="value.style" :default-config="data_config"></model-goods-tabs-content>
         </template>
         <template v-if="type == '2'">
-            <model-shop-tabs-styles :value="value.style" :content="value.content" :default-config="data_config"></model-shop-tabs-styles>
+            <model-goods-tabs-styles :value="value.style" :content="value.content" :default-config="data_config"></model-goods-tabs-styles>
         </template>
     </div>
 </template>
@@ -19,6 +19,7 @@ const props = defineProps({
         default: () => ({}),
     },
 });
+
 const data_config = reactive({
     // 图片不同风格下的圆角
     img_radius_0: 4,
diff --git a/src/components/model-shop-tabs/model-shop-tabs-styles.vue b/src/components/model-goods-tabs/model-goods-tabs-styles.vue
similarity index 99%
rename from src/components/model-shop-tabs/model-shop-tabs-styles.vue
rename to src/components/model-goods-tabs/model-goods-tabs-styles.vue
index 30af1a35..48b36989 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-goods-tabs/model-goods-tabs-styles.vue
@@ -94,7 +94,6 @@
     </div>
 </template>
 <script setup lang="ts">
-import { pick } from 'lodash';
 const props = defineProps({
     value: {
         type: Object,
diff --git a/src/views/layout/components/main/default/shop-list.ts b/src/views/layout/components/main/default/goods-list.ts
similarity index 100%
rename from src/views/layout/components/main/default/shop-list.ts
rename to src/views/layout/components/main/default/goods-list.ts
diff --git a/src/views/layout/components/main/default/shop-tabs.ts b/src/views/layout/components/main/default/goods-tabs.ts
similarity index 100%
rename from src/views/layout/components/main/default/shop-tabs.ts
rename to src/views/layout/components/main/default/goods-tabs.ts
diff --git a/src/views/layout/components/main/index.ts b/src/views/layout/components/main/index.ts
index 4dd50b0c..dc1a3c86 100644
--- a/src/views/layout/components/main/index.ts
+++ b/src/views/layout/components/main/index.ts
@@ -14,8 +14,8 @@ import defaultNotice from './default/notice';
 import defaultTextTitle from './default/text-title';
 import defaultFloatWindow from './default/float-window';
 import defaultTabs from './default/tabs';
-import defaultProductList from './default/shop-list';
-import defaultShopTabs from './default/shop-tabs';
+import defaultProductList from './default/goods-list';
+import defaultShopTabs from './default/goods-tabs';
 import defaultImgMagic from './default/img-magic';
 import defaultHotZone from './default/hot-zone';
 import defaultCustom from './default/custom';
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index df4d9aed..1faa3267 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -96,12 +96,12 @@
                                             <model-tabs :key="item.com_data" :value="item.com_data"></model-tabs>
                                         </template>
                                         <!-- 商品列表 -->
-                                        <template v-else-if="item.key == 'shop-list'">
-                                            <model-shop-list :key="item.com_data" :value="item.com_data"></model-shop-list>
+                                        <template v-else-if="item.key == 'goods-list'">
+                                            <model-goods-list :key="item.com_data" :value="item.com_data"></model-goods-list>
                                         </template>
                                         <!-- 商品选项卡 -->
-                                        <template v-else-if="item.key == 'shop-tabs'">
-                                            <model-shop-tabs :key="item.com_data" :value="item.com_data"></model-shop-tabs>
+                                        <template v-else-if="item.key == 'goods-tabs'">
+                                            <model-goods-tabs :key="item.com_data" :value="item.com_data"></model-goods-tabs>
                                         </template>
                                         <!-- 图片魔方 -->
                                         <template v-else-if="item.key == 'img-magic'">
diff --git a/src/views/layout/components/settings/index.vue b/src/views/layout/components/settings/index.vue
index 5b006ac1..1c8a2b23 100644
--- a/src/views/layout/components/settings/index.vue
+++ b/src/views/layout/components/settings/index.vue
@@ -51,12 +51,12 @@
                 <model-tabs-setting :type="radio" :value="value.com_data"></model-tabs-setting>
             </template>
             <!-- 商品列表 -->
-            <template v-else-if="value.key == 'shop-list'">
-                <model-shop-list-setting :type="radio" :value="value.com_data"></model-shop-list-setting>
+            <template v-else-if="value.key == 'goods-list'">
+                <model-goods-list-setting :type="radio" :value="value.com_data"></model-goods-list-setting>
             </template>
             <!-- 商品选项卡 -->
-            <template v-else-if="value.key == 'shop-tabs'">
-                <model-shop-tabs-setting :type="radio" :value="value.com_data"></model-shop-tabs-setting>
+            <template v-else-if="value.key == 'goods-tabs'">
+                <model-goods-tabs-setting :type="radio" :value="value.com_data"></model-goods-tabs-setting>
             </template>
             <!-- 图片魔方 -->
             <template v-else-if="value.key == 'img-magic'">