Merge branch 'master' of https://github.com/yxuecheng/vue-music into …

…HEAD
mike652638 · Jan 4, 2018 · e95ff89 · e95ff89
2 parents 668809f + bfc1b0c
commit e95ff89
Show file tree

Hide file tree

Showing 36 changed files with 57 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -36,8 +36,9 @@
 ## 分支
 
 * master
-* lib-flex
-* ssr
+* [lib-flex](https://www.npmjs.com/package/amfe-flexible) 添加自适应布局 merge into master √
+* [ssr](https://ssr.vuejs.org/en/) 服务端渲染实现
+* [pre-render](https://github.com/chrisvfritz/prerender-spa-plugin) 预渲染实现
 
 ## 组件
 
@@ -52,6 +53,7 @@
 * [x] /singer/:id 歌手详情页 , 局部滚动，视差，音乐播放器有的功能都有
 * [x] /rank/:id 排行页
 * [x] /search 搜索，搜索结果，搜索历史，热门搜索，结果播放
+* [ ] 播放列表页
 * [ ] 用户中心页
 
 ## 调试工具
@@ -86,13 +88,14 @@ $ yarn run dev
 
 <img src="./static/WechatIMG505.png" width="50%"><img src="./static/WechatIMG506.png" width="50%">
 
-* iphone7 Plus 模拟器正常
+* IOS系列模拟器正常
 
-<img src="./static/WechatIMG508.png">
+![适配iphone 系列，X的刘海暂未处理](./static/WechatIMG507.jpeg)
+<img src="./static/[email protected]">
+<img src="./static/[email protected]">
+<img src="./static/[email protected]">
 
-* 适配列表中iPhone，iPad系列，其中X有留白
 
-![适配iphone 系列，X的刘海暂未处理](./static/WechatIMG507.jpeg)
 
 ### Andriod 适配
 

diff --git a/music/index.html b/music/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=flexible content="initial-dpr=2"><meta content="telephone=no,email=no" name=format-detection><title>QQ Music</title><link href=./static/css/app.295b94cab1b619c4fc83b7a57d46ef52.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.36e637b252c82c1cf510.js></script><script type=text/javascript src=./static/js/vendor.90efff3d1c4be1c44bce.js></script><script type=text/javascript src=./static/js/app.b00b92ad29fb1ccff28c.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=flexible content="initial-dpr=2"><meta content="telephone=no,email=no" name=format-detection><title>QQ Music</title><link href=./static/css/app.21638aa54e1a11c945f57c75a3dc0382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.507885da59602787dcea.js></script><script type=text/javascript src=./static/js/vendor.90c0efa046c90e03789f.js></script><script type=text/javascript src=./static/js/app.5e355bcc287df4ac3c59.js></script></body></html>
diff --git a/music/static/[email protected] b/music/static/[email protected]
diff --git a/music/static/[email protected] b/music/static/[email protected]
diff --git a/music/static/[email protected] b/music/static/[email protected]
diff --git a/.../app.295b94cab1b619c4fc83b7a57d46ef52.css → .../app.21638aa54e1a11c945f57c75a3dc0382.css b/.../app.295b94cab1b619c4fc83b7a57d46ef52.css → .../app.21638aa54e1a11c945f57c75a3dc0382.css
diff --git a/...p.295b94cab1b619c4fc83b7a57d46ef52.css.gz → ...p.21638aa54e1a11c945f57c75a3dc0382.css.gz b/...p.295b94cab1b619c4fc83b7a57d46ef52.css.gz → ...p.21638aa54e1a11c945f57c75a3dc0382.css.gz
diff --git a/music/static/img/icomoon.1c1933b.svg → music/static/img/icomoon.8a34857.svg b/music/static/img/icomoon.1c1933b.svg → music/static/img/icomoon.8a34857.svg
diff --git a/music/static/js/0.6430bd79662769fdd660.js b/music/static/js/0.6430bd79662769fdd660.js
diff --git a/music/static/js/0.bf193c90eb148f9b100a.js b/music/static/js/0.bf193c90eb148f9b100a.js
diff --git a/music/static/js/0.6430bd79662769fdd660.js.gz → music/static/js/0.bf193c90eb148f9b100a.js.gz b/music/static/js/0.6430bd79662769fdd660.js.gz → music/static/js/0.bf193c90eb148f9b100a.js.gz
diff --git a/music/static/js/1.3a9988a73223db448d8c.js → music/static/js/1.10aa1855a44ee6b100ee.js b/music/static/js/1.3a9988a73223db448d8c.js → music/static/js/1.10aa1855a44ee6b100ee.js
diff --git a/music/static/js/1.3a9988a73223db448d8c.js.gz → music/static/js/1.10aa1855a44ee6b100ee.js.gz b/music/static/js/1.3a9988a73223db448d8c.js.gz → music/static/js/1.10aa1855a44ee6b100ee.js.gz
diff --git a/music/static/js/2.af6a2a2fa0783cf32539.js → music/static/js/2.47b1259754f0ff629860.js b/music/static/js/2.af6a2a2fa0783cf32539.js → music/static/js/2.47b1259754f0ff629860.js
diff --git a/music/static/js/2.af6a2a2fa0783cf32539.js.gz → music/static/js/2.47b1259754f0ff629860.js.gz b/music/static/js/2.af6a2a2fa0783cf32539.js.gz → music/static/js/2.47b1259754f0ff629860.js.gz
diff --git a/music/static/js/3.496f8b3301aa35e10195.js.gz b/music/static/js/3.496f8b3301aa35e10195.js.gz
diff --git a/music/static/js/3.496f8b3301aa35e10195.js → music/static/js/3.b9f64d657ca2d96ddfc1.js b/music/static/js/3.496f8b3301aa35e10195.js → music/static/js/3.b9f64d657ca2d96ddfc1.js
diff --git a/music/static/js/3.b9f64d657ca2d96ddfc1.js.gz b/music/static/js/3.b9f64d657ca2d96ddfc1.js.gz
diff --git a/music/static/js/4.8578ca9c6801e5f68134.js.gz b/music/static/js/4.8578ca9c6801e5f68134.js.gz
diff --git a/music/static/js/5.5f0c1bd072f1ad66a3d0.js.gz b/music/static/js/5.5f0c1bd072f1ad66a3d0.js.gz
diff --git a/music/static/js/6.f60b037663f01e89d204.js.gz b/music/static/js/6.f60b037663f01e89d204.js.gz
diff --git a/music/static/js/7.6d9d56ab90ca41110eff.js b/music/static/js/7.6d9d56ab90ca41110eff.js
diff --git a/music/static/js/app.b00b92ad29fb1ccff28c.js → music/static/js/app.5e355bcc287df4ac3c59.js b/music/static/js/app.b00b92ad29fb1ccff28c.js → music/static/js/app.5e355bcc287df4ac3c59.js
diff --git a/music/static/js/app.5e355bcc287df4ac3c59.js.gz b/music/static/js/app.5e355bcc287df4ac3c59.js.gz
diff --git a/music/static/js/app.b00b92ad29fb1ccff28c.js.gz b/music/static/js/app.b00b92ad29fb1ccff28c.js.gz
diff --git a/music/static/js/manifest.36e637b252c82c1cf510.js b/music/static/js/manifest.36e637b252c82c1cf510.js
diff --git a/music/static/js/manifest.507885da59602787dcea.js b/music/static/js/manifest.507885da59602787dcea.js
diff --git a/.../static/js/vendor.90efff3d1c4be1c44bce.js → .../static/js/vendor.90c0efa046c90e03789f.js b/.../static/js/vendor.90efff3d1c4be1c44bce.js → .../static/js/vendor.90c0efa046c90e03789f.js
diff --git a/music/static/js/vendor.90c0efa046c90e03789f.js.gz b/music/static/js/vendor.90c0efa046c90e03789f.js.gz
diff --git a/music/static/js/vendor.90efff3d1c4be1c44bce.js.gz b/music/static/js/vendor.90efff3d1c4be1c44bce.js.gz
diff --git a/src/common/js/song.js b/src/common/js/song.js
@@ -78,7 +78,8 @@ export function createSong(musicData) {
     album: musicData.albumname,
     duration: musicData.interval,
     image: `https://y.gtimg.cn/music/photo_new/T002R300x300M000${musicData.albummid}.jpg?max_age=2592000`,
-    url: `http://ws.stream.qqmusic.qq.com/${musicData.songid}.m4a?fromtag=46`
+    // url: `http://ws.stream.qqmusic.qq.com/${musicData.songid}.m4a?fromtag=46`
+    url: `http://dl.stream.qqmusic.qq.com/C400${musicData.songmid}.m4a?guid=9035189320&vkey=E1855E70EC9F14732A36333C49CB21DB0EED85C04B45D28E1A4ADDAFFF9765453E5D61DDC21D51372F4DA294919736FB8CFBB94B683CD013&uin=&fromtag=999`
   })
 }
 

diff --git a/src/containers/NotFound/index.vue b/src/containers/NotFound/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="not-found-page">
+    <p class="text">404</p>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'NotFound',
+  }
+</script>
+<style lang="less" scoped>
+  .not-found-page {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: #f4f4f4;
+    text-align: center;
+    .text {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate3d(-50%, -50%, 0);
+    }
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
@@ -36,6 +36,11 @@ const Recommend = (resolve) => {
     resolve(module)
   })
 }
+const NotFound = (resolve) => {
+  import('containers/NotFound').then((module) => {
+    resolve(module)
+  })
+}
 Vue.use(Router)
 
 export default new Router({
@@ -87,6 +92,10 @@ export default new Router({
 					component: SingerDetail
 				}
 			]
+		},
+		{
+			path: '*',
+			component: NotFound
 		}
 	]
 })
diff --git a/static/[email protected] b/static/[email protected]
diff --git a/static/[email protected] b/static/[email protected]
diff --git a/static/[email protected] b/static/[email protected]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=flexible content="initial-dpr=2"><meta content="telephone=no,email=no" name=format-detection><title>QQ Music</title><link href=./static/css/app.295b94cab1b619c4fc83b7a57d46ef52.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.36e637b252c82c1cf510.js></script><script type=text/javascript src=./static/js/vendor.90efff3d1c4be1c44bce.js></script><script type=text/javascript src=./static/js/app.b00b92ad29fb1ccff28c.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=flexible content="initial-dpr=2"><meta content="telephone=no,email=no" name=format-detection><title>QQ Music</title><link href=./static/css/app.21638aa54e1a11c945f57c75a3dc0382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.507885da59602787dcea.js></script><script type=text/javascript src=./static/js/vendor.90c0efa046c90e03789f.js></script><script type=text/javascript src=./static/js/app.5e355bcc287df4ac3c59.js></script></body></html>