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/appmanage/index.jsx | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx index 910f152..4cfee37 100644 --- a/src/views/appmanage/index.jsx +++ b/src/views/appmanage/index.jsx @@ -487,6 +487,8 @@ cell.share_link = _param.share_link || '' // 鍒嗕韩閾炬帴 cell.wxAppId = _param.wxAppId || '' cell.wxAppName = _param.wxAppName || '' + cell.wxMerchId = _param.wxMerchId || '' + cell.wxMerchName = _param.wxMerchName || '' if (cell.adapter && (cell.adapter === 'true' || cell.adapter === 'false')) { cell.adapter = '' @@ -1039,6 +1041,10 @@ _par.wxAppId = item.wxAppId _par.wxAppName = item.wxAppName || item.wxAppId } + if (item.wxMerchId) { + _par.wxMerchId = item.wxMerchId + _par.wxMerchName = item.wxMerchName || item.wxMerchId + } return _par } @@ -1248,8 +1254,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