From 182245fc436de42e33548213ee5de691fd2aea69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=82=B8=E5=85=8B=E6=96=AF?= <975794403@qq.com> Date: Mon, 17 Jun 2019 22:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AA=E7=8E=AF=E6=92=AD?= =?UTF-8?q?=E6=94=BE=EF=BC=8C=E6=AD=8C=E6=9B=B2=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/css/_template/modal.scss | 3 +- app/css/_template/reset.scss | 4 +- app/css/base.css | 58 +++++++++++++++++++++-- app/css/base.scss | 73 +++++++++++++++++++++++++++++ app/index.html | 84 +++++++++++++++++++++++++++++++--- app/plugin/APlayer/APlayer.css | 3 -- app/plugin/APlayer/APlayer.js | 2 - 7 files changed, 208 insertions(+), 19 deletions(-) delete mode 100644 app/plugin/APlayer/APlayer.css delete mode 100644 app/plugin/APlayer/APlayer.js diff --git a/app/css/_template/modal.scss b/app/css/_template/modal.scss index bed0102..9e7e0db 100644 --- a/app/css/_template/modal.scss +++ b/app/css/_template/modal.scss @@ -4,7 +4,7 @@ .modal { position: fixed; - z-index: 9999999999; + z-index: 2019; top: 0; left: 0; width: 100%; @@ -22,7 +22,6 @@ .modal-content { background-color: #fff; - border-radius: 15px; overflow: hidden; } diff --git a/app/css/_template/reset.scss b/app/css/_template/reset.scss index be196d4..159f654 100644 --- a/app/css/_template/reset.scss +++ b/app/css/_template/reset.scss @@ -33,11 +33,11 @@ body { padding: 0; font-size: 14px; background-color: #fff; - font-family: "PingFang SC Regular", "Microsoft YaHei"; + font-family: Monda, PingFang SC, Microsoft YaHei, sans-serif; } select, input, textarea { - font-family: "PingFang SC Regular", "Microsoft YaHei"; + font-family: Monda, PingFang SC, Microsoft YaHei, sans-serif; } ul, dl, dd { diff --git a/app/css/base.css b/app/css/base.css index dfd6534..1518b39 100644 --- a/app/css/base.css +++ b/app/css/base.css @@ -22,10 +22,10 @@ body { padding: 0; font-size: 14px; background-color: #fff; - font-family: "PingFang SC Regular", "Microsoft YaHei"; } + font-family: Monda, PingFang SC, Microsoft YaHei, sans-serif; } select, input, textarea { - font-family: "PingFang SC Regular", "Microsoft YaHei"; } + font-family: Monda, PingFang SC, Microsoft YaHei, sans-serif; } ul, dl, dd { margin: 0; @@ -45,7 +45,7 @@ table { .modal { position: fixed; - z-index: 9999999999; + z-index: 2019; top: 0; left: 0; width: 100%; @@ -60,7 +60,6 @@ table { justify-content: center; } .modal .modal-content { background-color: #fff; - border-radius: 15px; overflow: hidden; } .modal .modal-footer { height: 50px; @@ -181,3 +180,54 @@ table { font-size: 12px; } .player-wrap .player-item audio { flex: 1; } + +.player-info-wrap { + display: block; } + .player-info-wrap .modal-wrapper { + align-items: flex-start; + padding-top: 2.5vw; } + .player-info-wrap .modal-content { + width: 95vw; + height: 90vh; + padding: 15px 0; + display: flex; + flex-direction: column; + overflow: initial; } + .player-info-wrap .modal-content h2 { + text-align: center; + width: 100%; + margin: 5px auto; } + .player-info-wrap .modal-content .lrc { + flex: 1; + overflow-y: auto; + -webkit-overflow-scrolling: touch; + text-align: center; } + .player-info-wrap .modal-content .lrc ol { + padding: 0; } + .player-info-wrap .modal-content .lrc li { + list-style: none; + line-height: 1.4; + padding: 3px 10px; + opacity: .8; } + .player-info-wrap .modal-content .lrc li.active { + opacity: 1; + font-weight: 700; } + .player-info-wrap .modal-content .close { + background: #fff; + border: 1px solid transparent; + display: block; + width: 60px; + height: 40px; + border-radius: 50%; + margin: 0 auto; + transform: translateY(32px); + font-size: 25px; + outline: none; + -webkit-tap-highlight-color: transparent; + color: #666; } + .player-info-wrap .modal-content .close:active { + background: #f7f7f7; } + .player-info-wrap .info-img { + width: 150px; + margin: 10px auto; + display: block; } diff --git a/app/css/base.scss b/app/css/base.scss index 53b4b5f..4871bc6 100644 --- a/app/css/base.scss +++ b/app/css/base.scss @@ -128,3 +128,76 @@ $bottom-height: 80px; } } } + +.player-info-wrap { + display: block; + + .modal-wrapper { + align-items: flex-start; + padding-top: 2.5vw; + } + + .modal-content { + width: 95vw; + height: 90vh; + padding: 15px 0; + display: flex; + flex-direction: column; + overflow: initial; + + h2 { + text-align: center; + width: 100%; + margin: 5px auto; + } + + .lrc { + flex: 1; + overflow-y: auto; + -webkit-overflow-scrolling: touch; + text-align: center; + + ol { + padding: 0; + } + + li { + list-style: none; + line-height: 1.4; + padding: 3px 10px; + opacity: .8; + + &.active { + opacity: 1; + font-weight: 700; + } + } + } + + .close { + background: #fff; + border: 1px solid transparent; + display: block; + width: 60px; + height: 40px; + border-radius: 50%; + margin: 0 auto; + transform: translateY(32px); + font-size: 25px; + outline: none; + -webkit-tap-highlight-color: transparent; + color: #666; + + &:active { + background: #f7f7f7; + + } + } + } + + .info-img { + width: 150px; + margin: 10px auto; + display: block; + } +} diff --git a/app/index.html b/app/index.html index 85ef723..06543f8 100644 --- a/app/index.html +++ b/app/index.html @@ -3,19 +3,26 @@ + content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"> 听音乐 +
+ - +
-
{{index + 1}}. {{v.title}} @@ -23,24 +30,60 @@ {{v.author}}
- +
-
+
+ +