From 6db2266fe478595f6e4fae3b60d04e076ee18af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Thu, 4 May 2023 15:40:55 +0800 Subject: [PATCH] =?UTF-8?q?glcc=20safari=E5=85=BC=E5=AE=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 ++++++++++++++ src/glcc/home/index.scss | 1 + src/glcc/index.jsx | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 88b71ed39..30ab41793 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4561,6 +4561,11 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, + "cssfilter": { + "version": "0.0.10", + "resolved": "http://173.15.15.82:8081/repository/npm-all/cssfilter/-/cssfilter-0.0.10.tgz", + "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" + }, "cssnano": { "version": "4.1.11", "resolved": "http://173.15.15.82:8081/repository/npm-all/cssnano/-/cssnano-4.1.11.tgz", @@ -21771,6 +21776,15 @@ "resolved": "http://173.15.15.82:8081/repository/npm-all/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, + "xss": { + "version": "1.0.14", + "resolved": "http://173.15.15.82:8081/repository/npm-all/xss/-/xss-1.0.14.tgz", + "integrity": "sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==", + "requires": { + "commander": "^2.20.3", + "cssfilter": "0.0.10" + } + }, "xtend": { "version": "4.0.2", "resolved": "http://173.15.15.82:8081/repository/npm-all/xtend/-/xtend-4.0.2.tgz", diff --git a/src/glcc/home/index.scss b/src/glcc/home/index.scss index 2734a0f70..c3302bae2 100644 --- a/src/glcc/home/index.scss +++ b/src/glcc/home/index.scss @@ -185,6 +185,7 @@ } .introduceBox{ display: flex; + align-items: center; .introduceImg{ width: 32vw; margin-left: 3vw; diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index 1c50bac14..e80d42f7d 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -99,7 +99,10 @@ const Glcc = (propsF) => { // 判断是否处于此段时间范围内 function judge(nowTime, timeRnge){ - const timeArr = timeRnge.split(",").map(item=>{return new Date(item).getTime()}); + const timeArr = timeRnge.split(",").map(item=>{ + const data = item && item.replaceAll('-', '/'); + return new Date(data).getTime() + }); return nowTime > timeArr[0] && nowTime < timeArr[1] }