From 58f713299e726dca6ce33ee28d3a8c4c880475c8 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, 24 Sep 2024 10:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/components/model-goods-list/price.png | Bin 380 -> 0 bytes
 .../model-custom/components/index-default.ts     |   2 +-
 src/components/model-goods-list/index.vue        |  15 ++++++---------
 .../layout/components/main/default/goods-list.ts |   4 ++++
 .../layout/components/main/default/goods-tabs.ts |   4 ++++
 5 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 src/assets/images/components/model-goods-list/price.png

diff --git a/src/assets/images/components/model-goods-list/price.png b/src/assets/images/components/model-goods-list/price.png
deleted file mode 100644
index c162b9a095732d991625aa62cc8a40242c6ca005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmV-?0fYXDP)<h;3K|Lk000e1NJLTq000;O000~a1^@s6d**-c00001b5ch_0Itp)
z=>Px$Hc3Q5R7gwhma$3$K@>&r6n5#XG?k4OR#w_b&@Zs?57gff1i!*sY$RWx*v&=}
z>;!F{2qMg8O&TScxv~oZ4P^Jt#=$1r&dxn|?t5<-g&DryYqH@z_7u2Hpb20ZMB}HV
zs-vHE^}ZucL9A8n4+3OwcPnl<x&X0NB|Kgi19~QD5onWKl#1v7i2#K-aYb+;L|g>O
zWAQ_GAL?8jku|y#lKJEbOCu_}#p5zG7IB+eqn{+LSY}}A35p?de3-?3X_2i-PCy<<
z1EfaZkl2X^utq<FSd9r7OkP}dU{i~1Uo`6oisxVssJx5j5&dsOe1B}DpV=VV9DJD0
z=7|0_8Xz_LjKonCK-Sf}p6Z&U=s{3r;+IG+?mW%`ELClkuB*JD{jdJIgFgV&;a@o)
a8~6r-W1=xF((IZ50000<MNUMnLSTZpy`SX(

diff --git a/src/components/model-custom/components/index-default.ts b/src/components/model-custom/components/index-default.ts
index 0f90dacc..06fd70aa 100644
--- a/src/components/model-custom/components/index-default.ts
+++ b/src/components/model-custom/components/index-default.ts
@@ -97,7 +97,7 @@ export const icon_com_data = {
     icon_weight: 'normal',
     icon_size: 12,
     icon_option: 'none',
-    icon_location: 'left',
+    icon_location: 'center',
     icon_padding: {
         padding: 0,
         padding_top: 0,
diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index 16f8c4f7..04a7654b 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -37,8 +37,8 @@
                                         <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
                                     </div>
                                     <div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
-                                        <span class="original-price-left"></span
-                                        ><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
+                                        <img class="original-price-left" :src="form.static_img[0].url" />
+                                        <span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                             >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                             <template v-if="is_show('original_price_unit')">
                                                 {{ item.show_original_price_unit }}
@@ -72,8 +72,8 @@
                                         <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
                                     </div>
                                     <div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
-                                        <span class="original-price-left"></span
-                                        ><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
+                                        <img class="original-price-left" :src="form.static_img[0].url" />
+                                        <span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                             >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                             <template v-if="is_show('original_price_unit')">
                                                 {{ item.show_original_price_unit }}
@@ -121,8 +121,8 @@
                                             <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
                                         </div>
                                         <div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
-                                            <span class="original-price-left"></span
-                                            ><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
+                                            <img class="original-price-left" :src="form.static_img[0].url" />
+                                            <span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                                 >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                                 <template v-if="is_show('original_price_unit')">
                                                     {{ item.show_original_price_unit }}
@@ -491,9 +491,6 @@ watchEffect(() => {
 }
 .original-price-left {
     width: 1rem;
-    background-image: url('/src/assets/images/components/model-goods-list/price.png');
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
 }
 .original-price {
     background-color: #ede2c5;
diff --git a/src/views/layout/components/main/default/goods-list.ts b/src/views/layout/components/main/default/goods-list.ts
index 7782fe26..77cfa692 100644
--- a/src/views/layout/components/main/default/goods-list.ts
+++ b/src/views/layout/components/main/default/goods-list.ts
@@ -1,4 +1,6 @@
 import defaultCommon from './index';
+import { online_url } from '@/utils';
+const new_url = await online_url('/static/app/common/').then((res) => res);
 interface DefaultProductList {
     content: {
         theme: string;
@@ -15,6 +17,7 @@ interface DefaultProductList {
         order_by_type: string;
         order_by_rule: string;
         is_show: string[];
+        static_img: uploadList[];
         is_shop_show: string;
         shop_type: string;
         shop_button_text: string;
@@ -68,6 +71,7 @@ const defaultProductList: DefaultProductList = {
         order_by_type: '0',
         order_by_rule: '0',
         is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
+        static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
         is_shop_show: '1',
         shop_type: 'text',
         shop_button_text: '购买',
diff --git a/src/views/layout/components/main/default/goods-tabs.ts b/src/views/layout/components/main/default/goods-tabs.ts
index daf68ad8..ecc03a3b 100644
--- a/src/views/layout/components/main/default/goods-tabs.ts
+++ b/src/views/layout/components/main/default/goods-tabs.ts
@@ -1,4 +1,6 @@
 import defaultCommon from './index';
+import { online_url } from '@/utils';
+const new_url = await online_url('/static/app/common/').then((res) => res);
 interface articleTabsList {
     id: string;
     title: string;
@@ -22,6 +24,7 @@ interface DefaultProductList {
         carousel_col: number;
         tabs_list: articleTabsList[];
         tabs_active_index: number;
+        static_img: uploadList[];
         is_show: string[];
         is_shop_show: string;
         is_price_solo: string;
@@ -83,6 +86,7 @@ const defaultProductList: DefaultProductList = {
             { id: '4', title: '测试三', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', order_by_rule: '0', data_list: [], data_auto_list: [] },
         ],
         tabs_active_index: 0,
+        static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
         is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
         is_shop_show: '1',
         is_price_solo: '1',