diff --git a/src/components/singer/singer.js b/src/components/singer/singer.js
index 3eabd4d..ed536f7 100644
--- a/src/components/singer/singer.js
+++ b/src/components/singer/singer.js
@@ -1,10 +1,107 @@
import React, {Component} from 'react'
+import {Route} from 'react-router-dom'
+// import {connect} from 'react-redux'
+
+import ListView from 'base/listview/listview'
+import SingerDetail from 'base/singerDetail/singerDetail'
+
+import {getSingerList} from 'api/singer'
+import Singers from 'common/js/singer'
+import {ERR_OK} from 'api/config'
+
+import './singer.styl'
+
+const HOT_NAME = '热门'
+
+const HOT_LEN = 10
export default class Singer extends Component{
+ constructor(props) {
+ super(props)
+ this.state = {
+ refresh: false,
+ singers: []
+ }
+ this._getSignerList = this._getSignerList.bind(this)
+ }
+
+ componentDidMount() {
+ this._getSignerList()
+ }
+
+ _getSignerList() {
+ getSingerList().then((res) => {
+ if (res.code === ERR_OK) {
+ console.log(this._normalizeSinger(res.data.list))
+ this.setState({
+ singers: this._normalizeSinger(res.data.list)
+ }, () => {
+ this.setState({
+ refresh: true
+ })
+ })
+ }
+ })
+ }
+
+ _normalizeSinger(list) {
+ let map = {
+ hot: {
+ title: HOT_NAME,
+ items: []
+ }
+ }
+
+ list.forEach((item, index) => {
+ if (index < HOT_LEN) {
+ map.hot.items.push(new Singers({
+ name: item.Fsinger_name,
+ id: item.Fsinger_mid
+ }))
+ }
+ const key = item.Findex
+ if (!map[key]) {
+ map[key] = {
+ title: key,
+ items: []
+ }
+ }
+ map[key].items.push(new Singers({
+ name: item.Fsinger_name,
+ id: item.Fsinger_mid
+ }))
+ })
+
+ let ret = []
+ let hot = []
+ for (let key in map) {
+ let val = map[key]
+
+ if(val.title.match(/[a-zA-Z]/)) {
+ ret.push(val)
+ } else if (val.title === HOT_NAME) {
+ hot.push(val)
+ }
+ }
+ ret.sort((a, b) => {
+ return a.title.charCodeAt(0) - b.title.charCodeAt(0)
+ })
+ return hot.concat(ret)
+ }
+
+ selectSinger(v) {
+ const {match} = this.props
+ const url = `${match.url}/${v.dissid}`
+
+ this.props.history.push(url)
+ }
+
render() {
+ let {match} = this.props
return(
-
- 歌手
+
+
+
)
}
diff --git a/src/components/singer/singer.styl b/src/components/singer/singer.styl
new file mode 100644
index 0000000..1da073b
--- /dev/null
+++ b/src/components/singer/singer.styl
@@ -0,0 +1,5 @@
+.singer-wrapper
+ position: fixed
+ top: 88px
+ bottom: 0
+ width: 100%
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0e871f6..9fed63f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,7 +3,7 @@ import {BrowserRouter as Router, Route, Switch, Redirect} from 'react-router-dom
import LazyLoadComponent from 'common/js/lazyLoad'
-const Headers = LazyLoadComponent({loader: () => import('components/header/header')})
+const Headers = LazyLoadComponent({loader: () => import('base/header/header')})
const NavBar = LazyLoadComponent({loader: () => import('components/navBar/navBar')})
const Recommend = LazyLoadComponent({loader: () => import('components/recommend/recommend')})
const Rank = LazyLoadComponent({loader: () => import('components/rank/rank')})