From 6a14db1ee34942042dcf1f433363629289950010 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Tue, 17 Jun 2025 09:40:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(shop):=20=E4=BF=AE=E5=A4=8D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=96=B9=E6=B3=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8D=A1=E7=89=87=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复当前支付方法计算中未正确处理数字类型的问题
合并运行模式显示项并调整卡片图片宽度和内边距
---
 src/views/cabinet/shop/card.vue            | 9 ++++-----
 src/views/cabinet/shop/shop-form-modal.vue | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/cabinet/shop/card.vue b/src/views/cabinet/shop/card.vue
index f20d436..0b73bd0 100644
--- a/src/views/cabinet/shop/card.vue
+++ b/src/views/cabinet/shop/card.vue
@@ -145,10 +145,9 @@ function getPaymentMethods(mode: number): Array<{ label: string; type: string }>
                   </text>
                 </svg>
 
-                <el-descriptions class="cabinet-info" :column="2">
+                <el-descriptions class="cabinet-info" :column="1">
                   <!-- <el-descriptions-item class="type">模式：{{ item.belongType === 0 ? '借还模式' : '固资模式' }}</el-descriptions-item> -->
-                  <el-descriptions-item class="mode">运行模式：</el-descriptions-item>
-                  <el-descriptions-item class="mode"><el-tag :type="getModeType(item.mode)">{{
+                  <el-descriptions-item class="mode">运行模式：<el-tag :type="getModeType(item.mode)">{{
                     getModeText(item.mode) }}</el-tag></el-descriptions-item>
                   <!-- <el-descriptions-item class="payment-methods">支付方式：
                   </el-descriptions-item>
@@ -198,7 +197,7 @@ function getPaymentMethods(mode: number): Array<{ label: string; type: string }>
   justify-content: space-between;
 
   .cabinet-image {
-    width: 50%;
+    width: 40%;
     height: 130px;
     padding: 0 3px;
     object-fit: contain;
@@ -214,7 +213,7 @@ function getPaymentMethods(mode: number): Array<{ label: string; type: string }>
 
     .cabinet-info {
       text-align: left;
-      padding: 26px 0px;
+      padding: 16px 0px;
 
       .name,
       .type,
diff --git a/src/views/cabinet/shop/shop-form-modal.vue b/src/views/cabinet/shop/shop-form-modal.vue
index 1346722..3e01e6b 100644
--- a/src/views/cabinet/shop/shop-form-modal.vue
+++ b/src/views/cabinet/shop/shop-form-modal.vue
@@ -113,7 +113,7 @@ const beforeAvatarUpload = (rawFile) => {
 };
 
 const currentPaymentMethods = computed(() => {
-  if (!formData.value.mode) return [];
+  if (typeof formData.value.mode !== 'number') return [];
   const methodValues = modeToPaymentMethodMap[formData.value.mode] || [];
   return methodValues.map(value => {
     const option = paymentMethodOptions.find(item => item.value === value);