From 71317887391f23525daa02799823351272771916 Mon Sep 17 00:00:00 2001
From: Zachary <zlj19971222@outlook.com>
Date: Sat, 13 Feb 2021 23:57:47 +0800
Subject: [PATCH] feat: improve songer page

---
 src/components/common/TypeSelectBar.vue    |  19 +++
 src/components/common/TypeSelectSubBar.vue |  58 ++++++++
 src/views/musicLibrary/Songers.vue         | 163 +++++----------------
 3 files changed, 113 insertions(+), 127 deletions(-)
 create mode 100644 src/components/common/TypeSelectBar.vue
 create mode 100644 src/components/common/TypeSelectSubBar.vue

diff --git a/src/components/common/TypeSelectBar.vue b/src/components/common/TypeSelectBar.vue
new file mode 100644
index 0000000..b2754f4
--- /dev/null
+++ b/src/components/common/TypeSelectBar.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="mod_singer_tag" id="tag_box">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style scoped>
+.mod_singer_tag {
+  background-color: #fbfbfd;
+  padding: 34px 0 17px 40px;
+  margin: 30px 0 20px;
+}
+</style>
diff --git a/src/components/common/TypeSelectSubBar.vue b/src/components/common/TypeSelectSubBar.vue
new file mode 100644
index 0000000..d457cff
--- /dev/null
+++ b/src/components/common/TypeSelectSubBar.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="singer_tag__list js_index">
+    <a href="javascript:;"
+       class="singer_tag__item"
+       v-for="(item, key) in items" :key="key"
+       :data-id="item.dataId"
+       :class="item.dataId == selectId ? 'singer_tag__item--all singer_tag__item--select':''"
+       @click="selectClick(item.dataId)">{{item.name}}</a>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    selectId: {},
+    items: {
+      type: Object,
+      default: []
+    }
+  },
+  methods: {
+    selectClick(id){
+      if (id != this.selectId){
+        this.$emit('selectId', id)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.singer_tag__list {
+  padding-bottom: 3px;
+  height: auto;
+  clear: both;
+  overflow: hidden;
+}
+
+.singer_tag__item--select,
+.singer_tag__item--select:hover {
+  background-color: #31c27c;
+  color: #fff;
+}
+
+.singer_tag__item--all {
+  margin-right: 28px;
+}
+
+.singer_tag__item {
+  height: 26px;
+  line-height: 27px;
+  overflow: hidden;
+  float: left;
+  padding: 0 8px;
+  margin: 0 12px 14px 0;
+  margin-right: 12px;
+}
+</style>
diff --git a/src/views/musicLibrary/Songers.vue b/src/views/musicLibrary/Songers.vue
index b483575..042876e 100644
--- a/src/views/musicLibrary/Songers.vue
+++ b/src/views/musicLibrary/Songers.vue
@@ -1,41 +1,21 @@
 <template>
 
 <div class='main' v-loading='loading'>
-  <div class="mod_singer_tag" id="tag_box">
-    <div class="singer_tag__list js_index">
 
-      <a href="javascript:;"
-         class="singer_tag__item"
-         v-for="item in initials" :key="item.title"
-         :class="item.dataId == initial ? 'singer_tag__item--all singer_tag__item--select':''"
-         @click="initialClick(item.dataId)"
-         hidefocus="">{{item.title}}</a>
-
-    </div>
-
-    <div class="singer_tag__list js_type">
-
-      <a href="javascript:;"
-         class="singer_tag__item"
-         v-for="item in types" :key="item.title"
-         :class="item.dataId == type ? 'singer_tag__item--all singer_tag__item--select':''"
-         @click="typeClick(item.dataId)"
-         hidefocus="">{{item.title}}</a>
-
-    </div>
-
-    <div class="singer_tag__list js_area">
-
-      <a href="javascript:;"
-         class="singer_tag__item"
-         v-for="item in areas" :key="item.title"
-         :class="item.areaId == area ? 'singer_tag__item--all singer_tag__item--select':''"
-         @click="areaClick(item.areaId)"
-         hidefocus="">{{item.title}}</a>
-
-    </div>
-
-  </div>
+  <TypeSelectBar>
+    <TypeSelectSubBar
+      :selectId="initial"
+      :items="initials"
+      @selectId="initialClick"/>
+    <TypeSelectSubBar
+      :selectId="type"
+      :items="types"
+      @selectId="typeClick"/>
+    <TypeSelectSubBar
+      :selectId="area"
+      :items="areas"
+      @selectId="areaClick"/>
+  </TypeSelectBar>
 
   <ul class="singer_list_txt" v-loading='loading'>
     <li class="singer_list_txt__item" v-for="item in artists" :key="item.id">
@@ -45,18 +25,23 @@
          title="item.name">{{item.name}}</router-link>
     </li>
   </ul>
-</div>
 
-<div class='arrow-btn arrow-btn-left' >
-  <a href="javascript:;" @click="prevPage()" ><i class='el-icon-arrow-left el-icon-arrow'></i></a>
-</div>
-<div class='arrow-btn arrow-btn-right' >
-  <a href="javascript:;" @click="nextPage()" ><i class='el-icon-arrow-right el-icon-arrow'></i></a>
+  <div class='arrow-btn arrow-btn-left' >
+    <a href="javascript:;" @click="prevPage()" ><i class='el-icon-arrow-left el-icon-arrow'></i></a>
+  </div>
+  <div class='arrow-btn arrow-btn-right' >
+    <a href="javascript:;" @click="nextPage()" ><i class='el-icon-arrow-right el-icon-arrow'></i></a>
+  </div>
+
 </div>
+
 </template>
 
 <script>
-import { getSongers } from "api";
+import { getSongers, songerInitials, songerTypes, songerAreas } from "api";
+
+import TypeSelectBar from 'components/common/TypeSelectBar';
+import TypeSelectSubBar from 'components/common/TypeSelectSubBar';
 
 export default {
   name: 'Songers',
@@ -65,53 +50,12 @@ export default {
       loading: true,
       page: 1,
       more: true,
-      initial: '-1',
-      area: -1,
-      type: -1,
-      initials:[
-        {title: '热门', dataId: '-1'},
-        {title: 'A', dataId: 'a'},
-        {title: 'B', dataId: 'b'},
-        {title: 'C', dataId: 'c'},
-        {title: 'D', dataId: 'd'},
-        {title: 'E', dataId: 'e'},
-        {title: 'F', dataId: 'f'},
-        {title: 'G', dataId: 'g'},
-        {title: 'H', dataId: 'h'},
-        {title: 'I', dataId: 'i'},
-        {title: 'J', dataId: 'j'},
-        {title: 'K', dataId: 'k'},
-        {title: 'L', dataId: 'l'},
-        {title: 'M', dataId: 'm'},
-        {title: 'N', dataId: 'n'},
-        {title: 'O', dataId: 'o'},
-        {title: 'P', dataId: 'p'},
-        {title: 'Q', dataId: 'q'},
-        {title: 'R', dataId: 'r'},
-        {title: 'S', dataId: 's'},
-        {title: 'T', dataId: 't'},
-        {title: 'U', dataId: 'u'},
-        {title: 'V', dataId: 'v'},
-        {title: 'W', dataId: 'w'},
-        {title: 'X', dataId: 'x'},
-        {title: 'Y', dataId: 'y'},
-        {title: 'Z', dataId: 'z'},
-        {title: '#', dataId: '0'},
-      ],
-      types:[
-        {title: '全部', dataId: -1},
-        {title: '男歌手', dataId: 1},
-        {title: '女歌手', dataId: 2},
-        {title: '乐队', dataId: 3},
-      ],
-      areas: [
-      {title: '全部', areaId: -1},
-      {title: '华语', areaId: 7},
-      {title: '欧美', areaId: 96},
-      {title: '日本', areaId: 8},
-      {title: '韩国', areaId: 16},
-      {title: '其他', areaId: 0},
-      ],
+      initial: songerInitials.DEFAULT.dataId,
+      area: songerTypes.DEFAULT.dataId,
+      type: songerAreas.DEFAULT.dataId,
+      initials:songerInitials,
+      types:songerTypes,
+      areas: songerAreas,
       artists: []
     };
   },
@@ -159,8 +103,11 @@ export default {
         this.updateArtists();
       }
     },
+  },
+  components: {
+    TypeSelectBar,
+    TypeSelectSubBar
   }
-
 }
 </script>
 
@@ -178,41 +125,7 @@ export default {
   margin: 0 auto;
   position: relative;
 }
-.mod_singer_tag {
-  background-color: #fbfbfd;
-  padding: 34px 0 17px 40px;
-  margin: 30px 0 20px;
-}
-
-.singer_tag__list {
-  padding-bottom: 3px;
-  height: auto;
-  clear: both;
-  overflow: hidden;
-}
-
-.singer_tag__item--select,
-.singer_tag__item--select:hover {
-  background-color: #31c27c;
-  color: #fff;
-}
-
-.singer_tag__item--all {
-  margin-right: 28px;
-}
-
-.singer_tag__item {
-  height: 26px;
-  line-height: 27px;
-  overflow: hidden;
-}
 
-.singer_tag__item {
-  float: left;
-  padding: 0 8px;
-  margin: 0 12px 14px 0;
-  margin-right: 12px;
-}
 
 .singer_list_txt {
   margin-right: -20px;
@@ -225,10 +138,6 @@ export default {
   width: 20%;
 }
 
-li {
-  list-style: none;
-}
-
 .singer_list_txt__link {
   float: left;
   max-width: 90%;
-- 
GitLab