From 820b98afedeaae38af9d92cd825f247da0b8c7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B4=E6=96=B0=E7=A7=91?= <kylebing@163.com>
Date: Fri, 3 Feb 2023 14:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=AD=8C=E6=9B=B2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/ConfigDialog.vue      |  12 +-
 src/component/EditDialog.vue        | 125 +++++++-------
 src/scss/_dark-mode.scss            | 231 ++------------------------
 src/scss/_element-ui-overwrite.scss | 242 ++++++++++++++++++++++++++++
 src/scss/_utility.scss              |   1 +
 src/scss/_variables.scss            |  10 +-
 src/scss/unlock-music.scss          |  81 +++++++++-
 7 files changed, 393 insertions(+), 309 deletions(-)

diff --git a/src/component/ConfigDialog.vue b/src/component/ConfigDialog.vue
index 8523f02..01c0ace 100644
--- a/src/component/ConfigDialog.vue
+++ b/src/component/ConfigDialog.vue
@@ -4,16 +4,6 @@ label {
   line-height: 1.2;
   display: block;
 }
-.item-desc {
-  color: #aaa;
-  font-size: small;
-  display: block;
-  line-height: 1.2;
-  margin-top: 0.2em;
-}
-.item-desc a {
-  color: #aaa;
-}
 
 form >>> input {
   font-family: 'Courier New', Courier, monospace;
@@ -39,7 +29,7 @@ form >>> input {
           </el-form-item>
         </label>
 
-        <p class="item-desc">
+        <p class="tip">
           下载该加密文件的 JOOX 应用所记录的设备唯一识别码。
           <br />
           参见：
diff --git a/src/component/EditDialog.vue b/src/component/EditDialog.vue
index 06ff53e..e01c365 100644
--- a/src/component/EditDialog.vue
+++ b/src/component/EditDialog.vue
@@ -1,24 +1,4 @@
 <style scoped>
-label {
-  cursor: pointer;
-  line-height: 1.2;
-  display: block;
-}
-.item-desc {
-  color: #aaa;
-  font-size: small;
-  display: block;
-  line-height: 1.2;
-  margin-top: 0.2em;
-}
-.item-desc a {
-  color: #aaa;
-}
-
-form >>> input {
-  font-family: 'Courier New', Courier, monospace;
-}
-
 * >>> .um-edit-dialog {
   max-width: 90%;
   width: 30em;
@@ -29,57 +9,62 @@ form >>> input {
   <el-dialog @close="cancel()" title="音乐标签编辑" :visible="show" custom-class="um-edit-dialog" center>
     <el-form ref="form" status-icon :model="form" label-width="0">
       <section>
-        <el-image v-show="!editPicture" :src="imgFile.url || picture" style="width: 100px; height: 100px">
-          <div slot="error" class="image-slot el-image__error">暂无封面</div>
-        </el-image>
-        <el-upload v-show="editPicture" :auto-upload="false" :on-change="addFile" :on-remove="rmvFile" :show-file-list="true" :limit="1" list-type="picture" action="" drag>
-          <i class="el-icon-upload" />
-          <div class="el-upload__text">将新图片拖到此处，或<em>点击选择</em><br />以替换自动匹配的图片</div>
-          <div slot="tip" class="el-upload__tip">
-            新拖到此处的图片将覆盖原始图片
-          </div>
-        </el-upload> 
-        <i
-          :class="{'el-icon-edit': !editPicture, 'el-icon-check': editPicture}"
-          @click="changeCover"
-        ></i><br />
-        标题: 
-        <span v-show="!editTitle">{{title}}</span>
-        <el-input v-show="editTitle" v-model="title"></el-input>
-        <i
-          :class="{'el-icon-edit': !editTitle, 'el-icon-check': editTitle}"
-          @click="editTitle = !editTitle"
-        ></i><br />
-        艺术家: 
-        <span v-show="!editArtist">{{artist}}</span>
-        <el-input v-show="editArtist" v-model="artist"></el-input>
-        <i
-          :class="{'el-icon-edit': !editArtist, 'el-icon-check': editArtist}"
-          @click="editArtist = !editArtist"
-        ></i><br />
-        专辑: 
-        <span v-show="!editAlbum">{{album}}</span>
-        <el-input v-show="editAlbum" v-model="album"></el-input>
-        <i
-          :class="{'el-icon-edit': !editAlbum, 'el-icon-check': editAlbum}"
-          @click="editAlbum = !editAlbum"
-        ></i><br />
-        专辑艺术家: 
-        <span v-show="!editAlbumartist">{{albumartist}}</span>
-        <el-input v-show="editAlbumartist" v-model="albumartist"></el-input>
-        <i
-          :class="{'el-icon-edit': !editAlbumartist, 'el-icon-check': editAlbumartist}"
-          @click="editAlbumartist = !editAlbumartist"
-        ></i><br />
-        风格: 
-        <span v-show="!editGenre">{{genre}}</span>
-        <el-input v-show="editGenre" v-model="genre"></el-input>
-        <i
-          :class="{'el-icon-edit': !editGenre, 'el-icon-check': editGenre}"
-          @click="editGenre = !editGenre"
-        ></i><br />
+        <div class="music-cover">
+          <el-image v-show="!editPicture" :src="imgFile.url || picture">
+            <div slot="error" class="image-slot el-image__error">暂无封面</div>
+          </el-image>
+          <el-upload v-show="editPicture" :auto-upload="false" :on-change="addFile" :on-remove="rmvFile" :show-file-list="true" :limit="1" list-type="picture" action="" drag>
+            <i class="el-icon-upload" />
+            <div class="el-upload__text">将新图片拖到此处，或<em>点击选择</em><br />以替换自动匹配的图片</div>
+            <div slot="tip" class="el-upload__tip">
+              新拖到此处的图片将覆盖原始图片
+            </div>
+          </el-upload>
+          <i :class="{'el-icon-edit': !editPicture, 'el-icon-check': editPicture}"
+               @click="changeCover"></i>
+        </div>
 
-        <p class="item-desc">
+        <div class="edit-item">
+          <div class="label">标题</div>
+          <div class="value" v-show="!editTitle">{{title}}</div>
+          <el-input class="input" size="small" v-show="editTitle" v-model="title"/>
+          <i :class="{'el-icon-edit': !editTitle, 'el-icon-check': editTitle}"
+             @click="editTitle = !editTitle"/>
+        </div>
+        <div class="edit-item">
+          <div class="label">艺术家</div>
+          <div class="value" v-show="!editArtist">{{artist}}</div>
+          <el-input class="input" size="small" v-show="editArtist" v-model="artist"/>
+          <i :class="{'el-icon-edit': !editArtist, 'el-icon-check': editArtist}"
+             @click="editArtist = !editArtist"
+          />
+        </div>
+        <div class="edit-item">
+          <div class="label">专辑</div>
+          <div class="value" v-show="!editAlbum">{{album}}</div>
+          <el-input class="input" size="small" v-show="editAlbum" v-model="album"/>
+          <i :class="{'el-icon-edit': !editAlbum, 'el-icon-check': editAlbum}"
+             @click="editAlbum = !editAlbum"
+          />
+        </div>
+        <div class="edit-item">
+          <div class="label">专辑艺术家</div>
+          <div class="value" v-show="!editAlbumartist">{{albumartist}}</div>
+          <el-input class="input" size="small" v-show="editAlbumartist" v-model="albumartist"/>
+          <i :class="{'el-icon-edit': !editAlbumartist, 'el-icon-check': editAlbumartist}"
+             @click="editAlbumartist = !editAlbumartist"
+          />
+        </div>
+        <div class="edit-item">
+          <div class="label">风格</div>
+          <div class="value" v-show="!editGenre">{{genre}}</div>
+          <el-input class="input" size="small" v-show="editGenre" v-model="genre"/>
+          <i :class="{'el-icon-edit': !editGenre, 'el-icon-check': editGenre}"
+             @click="editGenre = !editGenre"
+          />
+        </div>
+
+        <p class="tip">
           为了节省您设备的资源，请在确定前充分检查，避免反复修改。<br />
           直接关闭此对话框不会保留所作的更改。
         </p>
diff --git a/src/scss/_dark-mode.scss b/src/scss/_dark-mode.scss
index b66d32e..dd07cf9 100644
--- a/src/scss/_dark-mode.scss
+++ b/src/scss/_dark-mode.scss
@@ -10,186 +10,35 @@
     background-color: $dark-bg;
   }
 
-  // FORM
-  .el-radio{
-    &__label{
-      color: $dark-text-main;
-    }
-    &__input{
-      color: $dark-text-info;
-      .el-radio__inner{
-        border-color: $dark-border;
-        background-color: $dark-btn-bg;
-      }
-    }
-
-    &.is-checked{
-      .el-radio__inner{
-        background-color: $blue;
-      }
-      .el-radio__label{
-        font-weight: bold;
-      }
-    }
-  }
-
-  .el-checkbox.is-bordered{
-    border-color: $dark-border;
-    color: $dark-text-main;
-    background-color: $dark-btn-bg;
-    .el-checkbox__inner{
-      background-color: $dark-btn-bg-highlight;
-      border-color: $dark-border-highlight;
-    }
-    &:hover{
-      border-color: $dark-border-highlight;
-      .el-checkbox__inner{
-        background-color: $dark-btn-bg-highlight;
-        border-color: $dark-border-highlight;
-      }
-      .el-checkbox__label{
-        color: $dark-text-info;
-      }
-    }
-    &.is-checked{
-      background-color: $blue;
-      .el-checkbox__inner{
-        border-color: white;
-      }
-      .el-checkbox__label{
-        color: white;
-        font-weight: bold;
-      }
+  // 编辑歌曲信息
+  .music-cover{
+    i{
       &:hover{
-        border-color: $blue;
-        .el-checkbox__inner{
-          background-color: white;
-        }
+        color: $color-checkbox;
       }
     }
+    .el-image{
+      border: 1px solid $dark-border;
+    }
   }
-
-
-
-  // BUTTON
-  .el-button{
-    background-color: $dark-btn-bg;
-    border-color: $dark-border;
-    color: $dark-text-main;
-
-    &:active{
-      transform: translateY(2px);
+  .edit-item{
+    .label{
     }
-
-    &--default{
-      &.is-plain {
-        background-color: $dark-btn-bg;
-        &:hover {
-          background-color: $blue;
-          border-color: $blue;
-          color: white;
-        }
-      }
-      &.is-circle {
-        background-color: $dark-blue;
-        border-color: $dark-blue;
-        &:hover {
-          background-color: $blue;
-          border-color: $blue;
-          color: white;
-        }
+    .value{
+    }
+    .input{
+      input{
+        background-color: transparent !important;
+        border-bottom: 1px solid $dark-border;
       }
     }
-
-    &--success{
-      &.is-plain {
-        background-color: $dark-btn-bg;
-        &:hover {
-          background-color: $green;
-          border-color: $green;
-          color: white;
-        }
-      }
-      &.is-circle {
-        background-color: $dark-green;
-        border-color: $dark-green;
-        &:hover {
-          background-color: $green;
-          border-color: $green;
-          color: white;
-        }
-      }
-    }
-    &--danger{
-      &.is-plain{
-        border-color: $dark-border;
-        background-color: $dark-btn-bg;
-        &:hover{
-          background-color: $red;
-          border-color: $red;
-        }
-      }
-      &.is-circle {
-        background-color: $dark-red;
-        border-color: $dark-red;
-        &:hover {
-          background-color: $red;
-          border-color: $red;
-          color: white;
-        }
-      }
-    }
-  }
-
-  // 文件拖放区
-  .el-upload__tip{
-    color: $dark-text-info;
-  }
-  .el-upload-dragger{
-    background-color: $dark-uploader-bg;
-    border-color: $dark-border;
-    .el-upload__text{
-      color: $dark-text-info;
-    }
-    &:hover{
-      background: $dark-uploader-bg-highlight;
-      border-color: $dark-border-highlight;
-    }
-  }
-
-  // TABLE
-  .el-table{
-    background-color: $dark-bg-td;
-    &:before{ // 去除表格末尾的横线
-      content: none;
-    }
-    &__header{
-      th{
-        border-bottom-color: $dark-border !important;
-      }
-    }
-    th.el-table__cell{
-      background-color: $dark-bg-th;
-      color: $dark-text-info;
-    }
-    td{
-      border-bottom-color: $dark-border !important;
-    }
-    tr{
-      background-color: $dark-bg-td;
-      color: $dark-text-main;
+    i{
       &:hover{
-        td{
-          background-color: $dark-bg-th !important;
-        }
+        color: $color-checkbox;
       }
     }
   }
 
-  // LINKS
-  a{
-
-  }
 
   // footer
   #app-footer {
@@ -201,52 +50,6 @@
     }
   }
 
-
-  // ALERT
-  .el-notification{
-    background-color: $dark-btn-bg-highlight;
-    border-color: $dark-border;
-    &__title{
-      color: white;
-    }
-    &__content{
-      color: $dark-text-info;
-    }
-  }
-
-  // DIALOG
-  .el-dialog{
-    background-color: $dark-dialog-bg;
-    .el-dialog__header{
-      .el-dialog__title{
-        color: $dark-text-main;
-      }
-    }
-    .el-dialog__body{
-      color: $dark-text-main;
-      .el-input{
-        .el-input__inner{
-          color: $dark-text-main;
-          background-color: $dark-btn-bg;
-        }
-        .el-input__suffix{
-          .el-input__suffix-inner{
-          }
-        }
-        .el-input__count{
-          .el-input__count-inner{
-            background-color: transparent;
-          }
-        }
-      }
-    }
-    .item-desc{
-      color: $dark-text-info;
-    }
-  }
-
-
-
   // 自定义样式
   // 首页弹窗提示信息的 更新信息 面板
   .update-info{
diff --git a/src/scss/_element-ui-overwrite.scss b/src/scss/_element-ui-overwrite.scss
index 3863f66..aea6dbb 100644
--- a/src/scss/_element-ui-overwrite.scss
+++ b/src/scss/_element-ui-overwrite.scss
@@ -45,5 +45,247 @@ $btn-radius: 6px;
   }
 }
 .el-upload__tip{
+  text-align: center;
   color: $text-comment;
 }
+
+
+// dialog
+.el-dialog{
+  @include border-radius(5px);
+  &.el-dialog--center{
+    .el-dialog__body{
+      padding: 25px 25px 15px;
+    }
+    .el-dialog__footer{
+      padding: 10px 20px 30px;
+    }
+  }
+}
+
+
+
+@media (prefers-color-scheme: dark) {
+
+  // FORM
+  .el-radio{
+    &__label{
+      color: $dark-text-main;
+    }
+    &__input{
+      color: $dark-text-info;
+      .el-radio__inner{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+      }
+    }
+
+    &.is-checked{
+      .el-radio__inner{
+        background-color: $blue;
+      }
+      .el-radio__label{
+        font-weight: bold;
+      }
+    }
+  }
+
+  .el-checkbox.is-bordered{
+    border-color: $dark-border;
+    color: $dark-text-main;
+    background-color: $dark-btn-bg;
+    .el-checkbox__inner{
+      background-color: $dark-btn-bg-highlight;
+      border-color: $dark-border-highlight;
+    }
+    &:hover{
+      border-color: $dark-border-highlight;
+      .el-checkbox__inner{
+        background-color: $dark-btn-bg-highlight;
+        border-color: $dark-border-highlight;
+      }
+      .el-checkbox__label{
+        color: $dark-text-info;
+      }
+    }
+    &.is-checked{
+      background-color: $blue;
+      .el-checkbox__inner{
+        border-color: white;
+      }
+      .el-checkbox__label{
+        color: white;
+        font-weight: bold;
+      }
+      &:hover{
+        border-color: $blue;
+        .el-checkbox__inner{
+          background-color: white;
+        }
+      }
+    }
+  }
+
+
+
+  // BUTTON
+  .el-button{
+    background-color: $dark-btn-bg;
+    border-color: $dark-border;
+    color: $dark-text-main;
+
+    &:active{
+      transform: translateY(2px);
+    }
+
+    &--default{
+      &.is-plain {
+        background-color: $dark-btn-bg;
+        &:hover {
+          background-color: $blue;
+          border-color: $blue;
+          color: white;
+        }
+      }
+      &.is-circle {
+        background-color: $dark-blue;
+        border-color: $dark-blue;
+        &:hover {
+          background-color: $blue;
+          border-color: $blue;
+          color: white;
+        }
+      }
+    }
+
+    &--success{
+      &.is-plain {
+        background-color: $dark-btn-bg;
+        &:hover {
+          background-color: $green;
+          border-color: $green;
+          color: white;
+        }
+      }
+      &.is-circle {
+        background-color: $dark-green;
+        border-color: $dark-green;
+        &:hover {
+          background-color: $green;
+          border-color: $green;
+          color: white;
+        }
+      }
+    }
+    &--danger{
+      &.is-plain{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+        &:hover{
+          background-color: $red;
+          border-color: $red;
+        }
+      }
+      &.is-circle {
+        background-color: $dark-red;
+        border-color: $dark-red;
+        &:hover {
+          background-color: $red;
+          border-color: $red;
+          color: white;
+        }
+      }
+    }
+  }
+
+  // 文件拖放区
+  .el-upload__tip{
+    color: $dark-text-info;
+  }
+  .el-upload-dragger{
+    background-color: $dark-uploader-bg;
+    border-color: $dark-border;
+    .el-upload__text{
+      color: $dark-text-info;
+    }
+    &:hover{
+      background: $dark-uploader-bg-highlight;
+      border-color: $dark-border-highlight;
+    }
+  }
+
+  // TABLE
+  .el-table{
+    background-color: $dark-bg-td;
+    &:before{ // 去除表格末尾的横线
+      content: none;
+    }
+    &__header{
+      th{
+        border-bottom-color: $dark-border !important;
+      }
+    }
+    th.el-table__cell{
+      background-color: $dark-bg-th;
+      color: $dark-text-info;
+    }
+    td{
+      border-bottom-color: $dark-border !important;
+    }
+    tr{
+      background-color: $dark-bg-td;
+      color: $dark-text-main;
+      &:hover{
+        td{
+          background-color: $dark-bg-th !important;
+        }
+      }
+    }
+  }
+
+
+  // ALERT
+  .el-notification{
+    background-color: $dark-btn-bg-highlight;
+    border-color: $dark-border;
+    &__title{
+      color: white;
+    }
+    &__content{
+      color: $dark-text-info;
+    }
+  }
+
+  // DIALOG
+  .el-dialog{
+    background-color: $dark-dialog-bg;
+    .el-dialog__header{
+      .el-dialog__title{
+        color: $dark-text-main;
+      }
+    }
+    .el-dialog__body{
+      color: $dark-text-main;
+      .el-input{
+        .el-input__inner{
+          border-color: $dark-border;
+          color: $dark-text-main;
+          background-color: $dark-btn-bg;
+        }
+        .el-input__suffix{
+          .el-input__suffix-inner{
+          }
+        }
+        .el-input__count{
+          .el-input__count-inner{
+            background-color: transparent;
+          }
+        }
+      }
+    }
+    .item-desc{
+      color: $dark-text-info;
+    }
+  }
+
+}
diff --git a/src/scss/_utility.scss b/src/scss/_utility.scss
index 141fedb..87cff33 100644
--- a/src/scss/_utility.scss
+++ b/src/scss/_utility.scss
@@ -66,6 +66,7 @@
 }
 
 .btn-like{
+  cursor: pointer;
   &:active{
     @include transform(translateY(2px))
   }
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 49dc2b2..e6a2305 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -3,19 +3,17 @@ $blue      : #409EFF;
 $red       : #F56C6C;
 $green     : #85ce61;
 
-
 // TEXT COLOR
-$text-main    : #2C3E50;
-$text-comment : #777;
-$color-link   : $blue;
-
+$text-main      : #2C3E50;
+$text-copyright : #777;
+$text-comment   : #999;
+$color-link     : $blue;
 
 // FONT SIZE
 $fz-main: 14px;
 $fz-mini-title: 13px;
 $fz-mini-content: 12px;
 
-
 // DARK MODE
 $dark-border                : lighten(black, 25%);
 $dark-border-highlight      : lighten(black, 55%);
diff --git a/src/scss/unlock-music.scss b/src/scss/unlock-music.scss
index a48818c..2c89fcd 100644
--- a/src/scss/unlock-music.scss
+++ b/src/scss/unlock-music.scss
@@ -3,12 +3,7 @@
 @import "gaps";
 @import "element-ui-overwrite";
 
-// UNIVERSAL STYLE
-
-
-
 // MAIN CONTENT
-
 body{
   margin: 0;
   padding: 0;
@@ -40,24 +35,94 @@ audio{
   margin-top: 20px;
 }
 
+// 编辑歌曲信息
+.music-cover{
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-flow: column nowrap;
+  i{
+    margin-top: 10px;
+    @extend .btn-like;
+    &:hover{
+      color: $color-checkbox;
+    }
+  }
+  .el-image{
+    padding: 5px;
+    @include border-radius(5px);
+    border: 1px solid $color-border-el;
+    width: 150px;
+    height: 150px;
+  }
+}
+.edit-item{
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  .label{
+    font-weight: bold;
+    width: 80px;
+    text-align: right;
+    flex-shrink: 0;
+  }
+  .value{
+    padding: 5px 0;
+    height: 20px;
+    line-height: 20px;
+    margin-left: 10px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .input{
+    margin-left: 10px;
+    input{
+      font-family: inherit;
+      height: 30px;
+      line-height: 20px;
+      @include border-radius(0);
+      border: none;
+      border-bottom: 1px solid $color-border-el;
+      padding: 5px 5px;
+    }
+  }
+  i{
+    margin-left: 10px;
+    @extend .btn-like;
+    &:hover{
+      color: $color-checkbox;
+    }
+  }
+}
+
+.tip{
+  margin-top: 20px;
+  color: $text-comment;
+  font-size: $fz-mini-content;
+  a{
+    color: inherit;
+  }
+}
+
 // footer
 #app-footer {
   margin-top: 40px;
   text-align: center;
-  color: $text-comment;
+  color: $text-copyright;
   line-height: 1.3;
   font-size: $fz-mini-content;
   a {
     padding-left: 0.2rem;
     padding-right: 0.2rem;
-    color: darken($text-comment, 10%);
+    color: darken($text-copyright, 10%);
     &:hover{
       color: $color-link;
     }
   }
 }
 
-
 // 首页弹窗提示信息的 更新信息 面板
 .update-info{
   @include border-radius(8px);