From 1115c2d94cccfd158e3750e854fc307fd2fe06ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 4 Nov 2024 11:05:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=AD=89=E6=AF=94=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/article-list.vue | 11 +++++++----
 components/diy/goods-list.vue   | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue
index 9e8ecc44..e8632c72 100644
--- a/components/diy/article-list.vue
+++ b/components/diy/article-list.vue
@@ -69,6 +69,8 @@
 <script>
     const app = getApp();
     import { common_styles_computer, common_img_computer, padding_computer, radius_computer, get_math } from '@/common/js/common/common.js';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
     export default {
         props: {
             propValue: {
@@ -196,15 +198,16 @@
                     { name: '无图模式', value: '3', width:0, height: 0 },
                     { name: '左右滑动展示', value: '4', width:0, height: 0 },
                 ];
+                const scale = sys_width / 390;
                 let img_style = ``;
                 if (['0'].includes(new_content.theme)) {
                     // 图片宽度
                     if (typeof new_style.content_img_width == 'number') {
-                        img_style += `width: ${ new_style.content_img_width * 2 }rpx;`;
+                        img_style += `width: ${ new_style.content_img_width * scale }px;`;
                     } else {
                         const list = product_style_list.filter(item => item.value == new_content.theme);
                         if (list.length > 0) {
-                            img_style += `width: ${ list[0].width * 2 }rpx;`;
+                            img_style += `width: ${ list[0].width * scale }px;`;
                         } else {
                             img_style += 'width: auto;';
                         }
@@ -213,11 +216,11 @@
                 if (!['3', '4'].includes(new_content.theme)) {
                     // 图片宽度
                     if (typeof new_style.content_img_height == 'number') {
-                        img_style += `height: ${ new_style.content_img_height * 2 }rpx;`;
+                        img_style += `height: ${ new_style.content_img_height * scale }px;`;
                     } else {
                         const list = product_style_list.filter(item => item.value == new_content.theme);
                         if (list.length > 0) {
-                            img_style += `height: ${ list[0].height * 2 }rpx;`;
+                            img_style += `height: ${ list[0].height * scale }px;`;
                         } else {
                             img_style += 'height: auto;';
                         }
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index 20b310ba..0c7b553e 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -172,6 +172,8 @@
     import { isEmpty, common_styles_computer, common_img_computer, gradient_handle, padding_computer, radius_computer } from '@/common/js/common/common.js';
     import imageEmpty from '@/components/diy/modules/image-empty.vue';
     import componentBadge from '@/components/badge/badge';
+    var system = app.globalData.get_system_info(null, null, true);
+    var sys_width = app.globalData.window_width_handle(system.windowWidth);
     export default {
         components: {
             imageEmpty,
@@ -280,15 +282,16 @@
                         { name: '三列展示', value: '3', width: 116, height: 114 },
                         { name: '左右滑动展示', value: '5', width: 0, height: 0 },
                     ];
+                    const scale = sys_width / 390;
                     let img_style = ``;
                     if (['0', '4'].includes(new_form.theme)) {
                         // 图片宽度
                         if (typeof new_style.content_img_width == 'number') {
-                            img_style += `width: ${ new_style.content_img_width * 2 }rpx;`;
+                            img_style += `width: ${ new_style.content_img_width * scale }px;`;
                         } else {
                             const list = product_style_list.filter(item => item.value == new_form.theme);
                             if (list.length > 0) {
-                                img_style += `width: ${ list[0].width * 2 }rpx;`;
+                                img_style += `width: ${ list[0].width * scale }px;`;
                             } else {
                                 img_style += 'width: auto;';
                             }
@@ -297,11 +300,11 @@
                     if (!['5', '6'].includes(new_form.theme)) {
                         // 图片宽度
                         if (typeof new_style.content_img_height == 'number') {
-                            img_style += `height: ${ new_style.content_img_height * 2 }rpx;`;
+                            img_style += `height: ${ new_style.content_img_height * scale }px;`;
                         } else {
                             const list = product_style_list.filter(item => item.value == new_form.theme);
                             if (list.length > 0) {
-                                img_style += `height: ${ list[0].height * 2 }rpx;`;
+                                img_style += `height: ${ list[0].height * scale }px;`;
                             } else {
                                 img_style += 'height: auto;';
                             }