From b45eed171519ffe4f95d0d10743e7b3a25fcd569 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 七月 2024 15:43:07 +0800
Subject: [PATCH] 2024-07-01

---
 src/views/appcheck/index.jsx |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index c1a2e1e..0351a5a 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -86,6 +86,8 @@
               cell.logo = _param.logo || ''
               cell.wxAppId = _param.wxAppId || ''
               cell.wxAppName = _param.wxAppName || ''
+              cell.wxMerchId = _param.wxMerchId || ''
+              cell.wxMerchName = _param.wxMerchName || ''
             }
 
             return cell
@@ -195,8 +197,10 @@
                     </Col>
                     <Col span={12}>
                       <div className="app-item">
-                        {item.wxAppName ? <div className="label">鍏宠仈鍏紬鍙�:</div> : null}
-                        {item.wxAppName ? <div className="content">{item.wxAppName}</div> : null}
+                        {item.wxAppName || item.wxMerchName ? <>
+                          <div className="label">鍏宠仈搴旂敤:</div>
+                          <div className="content">{`${item.wxAppName}${item.wxAppName && item.wxMerchName ? ' / ' + item.wxMerchName : item.wxMerchName || ''}`}</div>
+                        </> : null}
                       </div>
                     </Col>
                     <Col span={12}>

--
Gitblit v1.8.0