From 1e179e4993fd5c3744388537ec8ce23f0f8337b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Mon, 11 Sep 2023 03:01:13 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小胡 <3203164629@qq.com> --- install/update.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/install/update.php b/install/update.php index 029d2ff..cf44071 100644 --- a/install/update.php +++ b/install/update.php @@ -264,9 +264,6 @@ if($_GET['step'] == 'start') { if(!DB::result_first("select COUNT(*) from %t where skey=%s",array('setting','fileVersionNumber'))){ C::t('setting')->update('fileVersionNumber', '50'); } - if(!DB::result_first("select COUNT(*) from %t where skey=%s",array('setting','default_mod'))){ - C::t('setting')->update('default_mod', 'index_simple'); - } if(!DB::result_first("select COUNT(*) from %t where skey=%s",array('setting','forbiddentime'))){ C::t('setting')->update('forbiddentime', '900'); } From e4d9e80c267837140f622a0d078c6dc392cfba47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Mon, 11 Sep 2023 03:05:00 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小胡 <3203164629@qq.com> --- install/data/install_data.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/install/data/install_data.sql b/install/data/install_data.sql index ad978a5..38d10d1 100644 --- a/install/data/install_data.sql +++ b/install/data/install_data.sql @@ -185,7 +185,6 @@ INSERT INTO `dzz_setting` VALUES('timeoffset', '8'); INSERT INTO `dzz_setting` VALUES('reginput', 'a:4:{s:8:"username";s:8:"username";s:8:"password";s:8:"password";s:9:"password2";s:9:"password2";s:5:"email";s:5:"email";}'); INSERT INTO `dzz_setting` VALUES('newusergroupid', '9'); INSERT INTO `dzz_setting` VALUES('dateformat', 'Y-n-j'); -INSERT INTO `dzz_setting` VALUES('default_mod', 'index_simple'); INSERT INTO `dzz_setting` VALUES('forbiddentime', '900'); INSERT INTO `dzz_setting` VALUES('numberoflogins', '5'); INSERT INTO `dzz_setting` VALUES('notification', '60'); From 9b8c8303a67aba9a748a520f190bc4a7eab3560a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Mon, 11 Sep 2023 03:06:28 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小胡 <3203164629@qq.com> --- dzz/config/config-sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dzz/config/config-sample.php b/dzz/config/config-sample.php index 3c4d8e5..d90e3e7 100644 --- a/dzz/config/config-sample.php +++ b/dzz/config/config-sample.php @@ -4,7 +4,7 @@ return array( 'allow_view'=>1, 'allow_robot'=>false,//是否允许机器人爬取 /*此三项配置如果未配置，将读取系统默认配置访问*/ - 'default_mod'=>'index_simple',//默认应用CONFIG DEFAULT_MOD + 'default_mod'=>'index',//默认应用CONFIG DEFAULT_MOD 'default_op' => 'index',//CONFIG DEFAULT_OP 'dafault_action' => 'index',//CONFIG DAFAULT_ACTION /*加载函数文件，有两种格式： From a4aa588ea0b5da29cbf8ebed03cf0ea544e685dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Sat, 16 Sep 2023 10:55:39 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小胡 <3203164629@qq.com> --- user/profile/avatar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/profile/avatar.php b/user/profile/avatar.php index c88f4cc..a9563fb 100644 --- a/user/profile/avatar.php +++ b/user/profile/avatar.php @@ -19,7 +19,7 @@ if(submitcheck('avatarsubmit')) { if($success) exit(json_encode(array('msg'=>'success'))); else exit(json_encode(array('error'=>'头像保存错误，请稍候重试'))); - showmessage('do_success', '{MOD_URL}&op=avatar'); + showmessage('do_success', MOD_URL.'&op=avatar'); }elseif($_GET['do']=='imageupload'){ From fdeecf1a3770bab9f3129d2a96371920fa2038cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Sun, 17 Sep 2023 04:47:20 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1=E5=8A=A0=E8=BD=BD=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小胡 <3203164629@qq.com> --- static/css/barber-shop.css | 205 ++++++++++++++++++++++++++++--------- 1 file changed, 157 insertions(+), 48 deletions(-) diff --git a/static/css/barber-shop.css b/static/css/barber-shop.css index 1e295e1..71fd4f4 100644 --- a/static/css/barber-shop.css +++ b/static/css/barber-shop.css @@ -1,16 +1,14 @@ .pace { -webkit-pointer-events: none; pointer-events: none; - -webkit-user-select: none; -moz-user-select: none; user-select: none; - overflow: hidden; position: fixed; top: 0; left: 0; - z-index: 2000; + z-index: 2200; width: 100%; height: 5px; } @@ -21,64 +19,175 @@ .pace .pace-progress { background: var(--bs-primary); - background-color: var(--bs-primary); position: fixed; + z-index: 2000; top: 0; - bottom: 0; right: 100%; width: 100%; - overflow: hidden; height: 5px; } +.pace .pace-progress:after { + content: attr(data-progress-text); + display: inline-block; + position: fixed; + text-align: right; + top: 4px; + left: 0; + width: 100%; +} +.pace .pace-progress[data-progress-text="0%"]:after { right: -200px } +.pace .pace-progress[data-progress-text="1%"]:after { right: -198.14px } +.pace .pace-progress[data-progress-text="2%"]:after { right: -196.28px } +.pace .pace-progress[data-progress-text="3%"]:after { right: -194.42px } +.pace .pace-progress[data-progress-text="4%"]:after { right: -192.56px } +.pace .pace-progress[data-progress-text="5%"]:after { right: -190.7px } +.pace .pace-progress[data-progress-text="6%"]:after { right: -188.84px } +.pace .pace-progress[data-progress-text="7%"]:after { right: -186.98px } +.pace .pace-progress[data-progress-text="8%"]:after { right: -185.12px } +.pace .pace-progress[data-progress-text="9%"]:after { right: -183.26px } +.pace .pace-progress[data-progress-text="10%"]:after { right: -181.4px } +.pace .pace-progress[data-progress-text="11%"]:after { right: -179.54px } +.pace .pace-progress[data-progress-text="12%"]:after { right: -177.68px } +.pace .pace-progress[data-progress-text="13%"]:after { right: -175.82px } +.pace .pace-progress[data-progress-text="14%"]:after { right: -173.96px } +.pace .pace-progress[data-progress-text="15%"]:after { right: -172.1px } +.pace .pace-progress[data-progress-text="16%"]:after { right: -170.24px } +.pace .pace-progress[data-progress-text="17%"]:after { right: -168.38px } +.pace .pace-progress[data-progress-text="18%"]:after { right: -166.52px } +.pace .pace-progress[data-progress-text="19%"]:after { right: -164.66px } +.pace .pace-progress[data-progress-text="20%"]:after { right: -162.8px } +.pace .pace-progress[data-progress-text="21%"]:after { right: -160.94px } +.pace .pace-progress[data-progress-text="22%"]:after { right: -159.08px } +.pace .pace-progress[data-progress-text="23%"]:after { right: -157.22px } +.pace .pace-progress[data-progress-text="24%"]:after { right: -155.36px } +.pace .pace-progress[data-progress-text="25%"]:after { right: -153.5px } +.pace .pace-progress[data-progress-text="26%"]:after { right: -151.64px } +.pace .pace-progress[data-progress-text="27%"]:after { right: -149.78px } +.pace .pace-progress[data-progress-text="28%"]:after { right: -147.92px } +.pace .pace-progress[data-progress-text="29%"]:after { right: -146.06px } +.pace .pace-progress[data-progress-text="30%"]:after { right: -144.2px } +.pace .pace-progress[data-progress-text="31%"]:after { right: -142.34px } +.pace .pace-progress[data-progress-text="32%"]:after { right: -140.48px } +.pace .pace-progress[data-progress-text="33%"]:after { right: -138.62px } +.pace .pace-progress[data-progress-text="34%"]:after { right: -136.76px } +.pace .pace-progress[data-progress-text="35%"]:after { right: -134.9px } +.pace .pace-progress[data-progress-text="36%"]:after { right: -133.04px } +.pace .pace-progress[data-progress-text="37%"]:after { right: -131.18px } +.pace .pace-progress[data-progress-text="38%"]:after { right: -129.32px } +.pace .pace-progress[data-progress-text="39%"]:after { right: -127.46px } +.pace .pace-progress[data-progress-text="40%"]:after { right: -125.6px } +.pace .pace-progress[data-progress-text="41%"]:after { right: -123.74px } +.pace .pace-progress[data-progress-text="42%"]:after { right: -121.88px } +.pace .pace-progress[data-progress-text="43%"]:after { right: -120.02px } +.pace .pace-progress[data-progress-text="44%"]:after { right: -118.16px } +.pace .pace-progress[data-progress-text="45%"]:after { right: -116.3px } +.pace .pace-progress[data-progress-text="46%"]:after { right: -114.44px } +.pace .pace-progress[data-progress-text="47%"]:after { right: -112.58px } +.pace .pace-progress[data-progress-text="48%"]:after { right: -110.72px } +.pace .pace-progress[data-progress-text="49%"]:after { right: -108.86px } +.pace .pace-progress[data-progress-text="50%"]:after { right: -107px } +.pace .pace-progress[data-progress-text="51%"]:after { right: -105.14px } +.pace .pace-progress[data-progress-text="52%"]:after { right: -103.28px } +.pace .pace-progress[data-progress-text="53%"]:after { right: -101.42px } +.pace .pace-progress[data-progress-text="54%"]:after { right: -99.56px } +.pace .pace-progress[data-progress-text="55%"]:after { right: -97.7px } +.pace .pace-progress[data-progress-text="56%"]:after { right: -95.84px } +.pace .pace-progress[data-progress-text="57%"]:after { right: -93.98px } +.pace .pace-progress[data-progress-text="58%"]:after { right: -92.12px } +.pace .pace-progress[data-progress-text="59%"]:after { right: -90.26px } +.pace .pace-progress[data-progress-text="60%"]:after { right: -88.4px } +.pace .pace-progress[data-progress-text="61%"]:after { right: -86.53999999999999px } +.pace .pace-progress[data-progress-text="62%"]:after { right: -84.68px } +.pace .pace-progress[data-progress-text="63%"]:after { right: -82.82px } +.pace .pace-progress[data-progress-text="64%"]:after { right: -80.96000000000001px } +.pace .pace-progress[data-progress-text="65%"]:after { right: -79.1px } +.pace .pace-progress[data-progress-text="66%"]:after { right: -77.24px } +.pace .pace-progress[data-progress-text="67%"]:after { right: -75.38px } +.pace .pace-progress[data-progress-text="68%"]:after { right: -73.52px } +.pace .pace-progress[data-progress-text="69%"]:after { right: -71.66px } +.pace .pace-progress[data-progress-text="70%"]:after { right: -69.8px } +.pace .pace-progress[data-progress-text="71%"]:after { right: -67.94px } +.pace .pace-progress[data-progress-text="72%"]:after { right: -66.08px } +.pace .pace-progress[data-progress-text="73%"]:after { right: -64.22px } +.pace .pace-progress[data-progress-text="74%"]:after { right: -62.36px } +.pace .pace-progress[data-progress-text="75%"]:after { right: -60.5px } +.pace .pace-progress[data-progress-text="76%"]:after { right: -58.64px } +.pace .pace-progress[data-progress-text="77%"]:after { right: -56.78px } +.pace .pace-progress[data-progress-text="78%"]:after { right: -54.92px } +.pace .pace-progress[data-progress-text="79%"]:after { right: -53.06px } +.pace .pace-progress[data-progress-text="80%"]:after { right: -51.2px } +.pace .pace-progress[data-progress-text="81%"]:after { right: -49.34px } +.pace .pace-progress[data-progress-text="82%"]:after { right: -47.480000000000004px } +.pace .pace-progress[data-progress-text="83%"]:after { right: -45.62px } +.pace .pace-progress[data-progress-text="84%"]:after { right: -43.76px } +.pace .pace-progress[data-progress-text="85%"]:after { right: -41.9px } +.pace .pace-progress[data-progress-text="86%"]:after { right: -40.04px } +.pace .pace-progress[data-progress-text="87%"]:after { right: -38.18px } +.pace .pace-progress[data-progress-text="88%"]:after { right: -36.32px } +.pace .pace-progress[data-progress-text="89%"]:after { right: -34.46px } +.pace .pace-progress[data-progress-text="90%"]:after { right: -32.6px } +.pace .pace-progress[data-progress-text="91%"]:after { right: -30.740000000000002px } +.pace .pace-progress[data-progress-text="92%"]:after { right: -28.880000000000003px } +.pace .pace-progress[data-progress-text="93%"]:after { right: -27.02px } +.pace .pace-progress[data-progress-text="94%"]:after { right: -25.16px } +.pace .pace-progress[data-progress-text="95%"]:after { right: -23.3px } +.pace .pace-progress[data-progress-text="96%"]:after { right: -21.439999999999998px } +.pace .pace-progress[data-progress-text="97%"]:after { right: -19.58px } +.pace .pace-progress[data-progress-text="98%"]:after { right: -17.72px } +.pace .pace-progress[data-progress-text="99%"]:after { right: -15.86px } +.pace .pace-progress[data-progress-text="100%"]:after { right: -14px } + +.pace .pace-progress-inner { + display: block; + position: absolute; + right: 0px; + width: 100px; + height: 100%; + box-shadow: 0 0 10px var(--bs-primary), 0 0 5px var(--bs-primary); + opacity: 1.0; + -webkit-transform: rotate(3deg) translate(0px, -4px); + -moz-transform: rotate(3deg) translate(0px, -4px); + -ms-transform: rotate(3deg) translate(0px, -4px); + -o-transform: rotate(3deg) translate(0px, -4px); + transform: rotate(3deg) translate(0px, -4px); +} .pace .pace-activity { + display: block; position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - height: 5px; - - -webkit-transform: translate3d(0, 0, 0); - -moz-transform: translate3d(0, 0, 0); - -ms-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); - - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent); - -webkit-background-size: 32px 32px; - -moz-background-size: 32px 32px; - -o-background-size: 32px 32px; - background-size: 32px 32px; - - -webkit-animation: pace-theme-barber-shop-motion 500ms linear infinite; - -moz-animation: pace-theme-barber-shop-motion 500ms linear infinite; - -ms-animation: pace-theme-barber-shop-motion 500ms linear infinite; - -o-animation: pace-theme-barber-shop-motion 500ms linear infinite; - animation: pace-theme-barber-shop-motion 500ms linear infinite; + z-index: 2200; + top: 25px; + right: 15px; + width: 14px; + height: 14px; + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 10px; + -webkit-animation: pace-spinner 400ms linear infinite; + -moz-animation: pace-spinner 400ms linear infinite; + -ms-animation: pace-spinner 400ms linear infinite; + -o-animation: pace-spinner 400ms linear infinite; + animation: pace-spinner 400ms linear infinite; } -@-webkit-keyframes pace-theme-barber-shop-motion { - 0% { -webkit-transform: none; transform: none; } - 100% { -webkit-transform: translate(-32px, 0); transform: translate(-32px, 0); } +@-webkit-keyframes pace-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } } -@-moz-keyframes pace-theme-barber-shop-motion { - 0% { -moz-transform: none; transform: none; } - 100% { -moz-transform: translate(-32px, 0); transform: translate(-32px, 0); } +@-moz-keyframes pace-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } } -@-o-keyframes pace-theme-barber-shop-motion { - 0% { -o-transform: none; transform: none; } - 100% { -o-transform: translate(-32px, 0); transform: translate(-32px, 0); } +@-o-keyframes pace-spinner { + 0% { -o-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -o-transform: rotate(360deg); transform: rotate(360deg); } } -@-ms-keyframes pace-theme-barber-shop-motion { - 0% { -ms-transform: none; transform: none; } - 100% { -ms-transform: translate(-32px, 0); transform: translate(-32px, 0); } +@-ms-keyframes pace-spinner { + 0% { -ms-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -ms-transform: rotate(360deg); transform: rotate(360deg); } } -@keyframes pace-theme-barber-shop-motion { - 0% { transform: none; transform: none; } - 100% { transform: translate(-32px, 0); transform: translate(-32px, 0); } +@keyframes pace-spinner { + 0% { transform: rotate(0deg); transform: rotate(0deg); } + 100% { transform: rotate(360deg); transform: rotate(360deg); } } \ No newline at end of file