From 0559bee7aa852d88fedf9002504f52d9e6228eb4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 七月 2024 16:03:40 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/appcheck/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index 3154996..0351a5a 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -84,6 +84,10 @@
}
cell.copyright = _param.copyright || ''
cell.logo = _param.logo || ''
+ cell.wxAppId = _param.wxAppId || ''
+ cell.wxAppName = _param.wxAppName || ''
+ cell.wxMerchId = _param.wxMerchId || ''
+ cell.wxMerchName = _param.wxMerchName || ''
}
return cell
@@ -193,6 +197,10 @@
</Col>
<Col span={12}>
<div className="app-item">
+ {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}>
@@ -238,7 +246,7 @@
</Col>
</Row>
<div className="action">
- <Paragraph style={{display: 'inline-block', margin: 0}} copyable={{ text: `${window.GLOB.baseurl}${item.typename === 'pad' ? 'mob' : item.typename}/index.html#/index/${this.state.selectApp.kei_no}/${item.typename !== 'pc' ? item.typename + '/' : ''}${item.lang}` }}></Paragraph>
+ <Paragraph style={{display: 'inline-block', margin: 0}} copyable={{ text: `${window.GLOB.baseurl}${item.typename === 'pad' ? 'mob' : item.typename}/index.html#/index/${this.state.selectApp.kei_no}/${item.typename !== 'pc' ? item.typename + '/' : ''}${item.lang}${item.wxAppId ? '/' + item.wxAppId : ''}` }}></Paragraph>
</div>
</div>
)
--
Gitblit v1.8.0