From 37aded4333bef5489e0168af0825b180e2991c72 Mon Sep 17 00:00:00 2001
From: Linzm <1015157648@qq.com>
Date: Sun, 17 Aug 2025 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=89=B2=E8=BE=B9=E6=A1=86=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/badge/preview.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/badge/preview.vue b/src/views/badge/preview.vue
index fcb992b..fb5105b 100644
--- a/src/views/badge/preview.vue
+++ b/src/views/badge/preview.vue
@@ -234,8 +234,9 @@ function sureReload() {
 const imgKey = ref(101)
 const frameUrl = ref('')
 const changeImage = (item: any) => {
+  console.log('changeImage', item)
   imgKey.value = item.key
-  imageUrl.value = item.origin_url
+  imageUrl.value = shapeId.value == 17 || shapeId.value == 18 ? item.frame_url : item.origin_url
   frameUrl.value = item.frame_url
   imageWater.value = item.url
 }
@@ -732,6 +733,7 @@ const calculateByteLength = (str: string) => {
 // }
 
 const shapeChange = (item: any) => {
+  console.log('shapeChange', item)
   sizeList.value.map((item: any) => {
     if (item.shape_id !== item.id) {
       item.count = 0
@@ -743,7 +745,9 @@ const shapeChange = (item: any) => {
   custom_switch.value = item.custom_switch
   limitCount.value = item.text_limit_max
   if (typeId.value == 3) {
-    imageUrl.value = item.name == '无边框' ? originUrl.value : frameUrl.value
+    imageUrl.value = item.id == 15 || item.id == 16 ? originUrl.value : frameUrl.value
+  } else {
+    imageUrl.value = item.origin_url
   }
   ImageShow(item)
   if (custom_switch.value == 1) {