From 76c4adc98ef8e7a3ea0f44d608363e3c0ddacf9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 03 七月 2024 18:01:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/pay/index.jsx | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/views/pay/index.jsx b/src/views/pay/index.jsx
index c3c5575..b01f691 100644
--- a/src/views/pay/index.jsx
+++ b/src/views/pay/index.jsx
@@ -259,17 +259,8 @@
{!overdone ? <div className="qrcode-box">
{!overdue ? <p>璺濈浜岀淮鐮佽繃鏈熻繕鍓�<span>{second}</span>绉掞紝杩囨湡鍚庤鍒锋柊椤甸潰閲嶆柊鑾峰彇浜岀淮鐮併��</p> : null}
{overdue ? <p className="overdue">浜岀淮鐮佸凡杩囨湡锛�<span onClick={this.resetQrcode}>鍒锋柊</span>椤甸潰閲嶆柊鑾峰彇浜岀淮鐮併��</p> : null}
- <QRCode
- value={qrcode}
- size={250}
- fgColor="#000000"
- // imageSettings={{
- // src: '',
- // height: 60,
- // width: 60,
- // excavate: true
- // }}
- />
+ <QRCode value={qrcode} size={250} fgColor="#000000"/>
+ {!overdue && !qrcode ? <div className="qr-mask"></div> : null}
{overdue ? <div className="overdue-mask"><p onClick={this.resetQrcode}>鑾峰彇澶辫触 鐐瑰嚮閲嶆柊鑾峰彇浜岀淮鐮�</p></div> : null}
<div className="qrcode-tip">
<img src={WeiXinScan} alt=""/>
--
Gitblit v1.8.0