efront 3.33.3 → 3.34.2

package/apps/kugou/index.html

@@ -10,7 +10,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
-    <title>酷狗尊享版</title>
+    <title>酷狗酷你尊享版</title><!-- 这个名字怎么听怎么像骂狗的，你和狗怎么可以放在相同的位置，真是太抬举你了 -->
     <script deleteoncompile efrontloader>
         // 若要在开发环境使用内置组件，请保留此script标签中的代码，在编译发布时，这里的代码会自动删除
     </script>
@@ -20,6 +20,7 @@
     <script deleteoncompile>
         cross_host = '';
     </script>
+    <script type="deleteoncompile" src="crypto/*"></script>
     <style>
         *,
         ::before,

package/apps/kugou/main.js

@@ -1,4 +1,8 @@
 data.setConfig(api);
+data.getApi("kuwo-token").then(function (api) {
+    var token = cookie.getCookies(api.base);
+    if (!token) cross("get", api.base);
+});
 zimoli.switch("", null, "/home");
 css("body", "background-color:#323336;");
 zimoli();

package/apps/kugou/search/search.html

@@ -1,7 +1,6 @@
 <titlebar>
     <back></back>
-    <input placeholder="请输入关键字搜索" ng-model=keyword
-        ng-keyup="event.which===13?confirm():search(this.value)" />
+    <input placeholder="请输入关键字搜索" ng-model=keyword ng-keyup="event.which===13?confirm():search(this.value)" />
     <icon class="loading" ng-if="result?.loading"></icon>
     <btn ng-click="keyword='';search()">清空</btn>
 </titlebar>
@@ -13,8 +12,8 @@
         <btn ng-click="search(s,0)"><span ng-bind="s"></span></btn>
     </padding>
 </div>
-<list ng-if="keyword" ng-src="s in result">
+<list -else ng-src="s in result" min-width=260 >
     <padding>
-        <song _mark=keyword ng-click="play(s.hash)" ng-src=s></song>
+        <song _mark=keyword @play="play(event.value)" ng-src=s></song>
     </padding>
 </list>

package/apps/kugou/search/search.js

@@ -19,8 +19,9 @@ function main(params, from) {
         searchHistory,
         player: kugou$player,
         padding,
-        play(hash) {
-            this.player.play(hash);
+        list: gallery,
+        play(info) {
+            this.player.play(info);
             var words = searchHistory.slice(0);
             var { keyword } = this;
             for (var cx = words.length - 1; cx >= 0; cx--) {
@@ -30,10 +31,59 @@ function main(params, from) {
             words = words.slice(0, 20);
             data.setInstance("searchHistory", words, true);
         },
-        search(keyword = this.keyword, timeout = 600) {
-            if ($scope.keyword !== keyword) $scope.keyword = keyword;
-            $scope.result = data.lazyInstance('search', { keyword }, timeout);
+        resultMap: null,
+        addResult(info) {
+            var resultMap = this.resultMap;
+            var singerName = sortname(String(info.singername || '').split(/[\&\,，、]/)).join('、');
+            var songName = info.songname;
+            var id = `${singerName}:${info.songname}`;
+            if (!resultMap[id]) resultMap[id] = Object.assign([], { singer: singerName, song: songName });
+            resultMap[id].push(info);
+        },
+        async requestSearch(type, id, params, mp, timeout, parse) {
+            var res = await data.lazyInstance(id, params, timeout, parse);
+            if (mp !== this.resultMap) return;
+            res.forEach(a => a.type = type);
+            res.forEach(this.addResult, this);
+            this.result = Object.keys(this.resultMap).map(k => this.resultMap[k]).sort((a, b) => b.length - a.length);
+            for (var r of this.result) r.sort((a, b) => a.priced - b.priced);
+            return res;
+        },
+        searched: null,
+        async search(keyword = this.keyword, timeout = 600) {
+            if (keyword === this.searched) return;
+            this.keyword = keyword;
+            this.searched = keyword;
+            this.resultMap = Object.create(null);
+            this.result = [];
+            if (!keyword) return;
+            var s1 = this.requestSearch("kugo", 'search', { keyword }, this.resultMap, timeout, function (s1) {
+                s1.forEach(a => {
+                    a.priced = a.privilege === 10 && (a.price_sq > 0);
+                });
+                return s1;
+            });
+            var s2 = this.requestSearch("kuwo", "search-kuwo", { key: keyword }, this.resultMap, timeout);
+            var s3 = this.requestSearch("yyyy", "search-yyyy", yyyc.encode({ hlposttag: "</span>", hlposttag: `<span class="s-fc7">`, limit: 30, offset: 0, s: keyword, total: true, type: 1 }), this.resultMap, timeout, function (s3) {
+                s3.forEach(a => {
+                    a.priced = a.fee === 1;
+                    a.singername = a.ar.map(a => {
+                        if (a.name === "." || isEmpty(a.name)) return a.alia.join("、");
+                        return a.name;
+                    }).join("、");
+                });
+                return s3;
+            });
+            var p4 = {
+                word: keyword,
+                type: 1,
+                // pageSize: 20,
+            };
+            qqjc(p4);
+            var s4 = this.requestSearch("qqjt", "search-qqjt", p4, this.resultMap, timeout);
             state({ keyword });
+            await Promise.all([s1, s2, s3, s4]);
+
         },
         confirm() {
             this.search(void 0, 0);

package/apps/kugou/search/search.less

@@ -87,4 +87,7 @@
         background: #5769;
         padding: 0 16px;
     }
+}
+list padding{
+    display: block;
 }

package/coms/basic/cross_.js

@@ -371,7 +371,19 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     if (_cookies) {
         _headers.Cookie = _cookies;
     }
-    extend(_headers, headers);
+    var cookobj = null;
+    for (var k in headers) {
+        if (/^\$/.test(headers[k])) {
+            var k2 = headers[k].slice(1);
+            if (!cookobj) cookobj = _cookies ? parseKV(_cookies, ';') : {};
+            if (k2 in cookobj) {
+                _headers[k] = cookobj[k2];
+            }
+        }
+        else {
+            _headers[k] = headers[k];
+        }
+    }
     if (/^[mc]/i.test(method)) {
         _headers["User-Agent"] = /^m/i.test(method)
             ? "efront/3.25 (iPhone) Safari/602.1"

package/coms/basic/parseURL.js

@@ -17,8 +17,8 @@
 // │                                              href                                              │
 // └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
-// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6-----------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
-var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
+// -------/// ---------------1---------------------------------///////////////////2-----3--------//////// ------4----2/////5---------------------------------------------------6------------------------------------------------------------------------------------//////////////-7--5///8-------9----------//10--11---10/8/--12----////
+var reg = /^([^\:\/\\\?#\[]+\:(?![^\:\/\\\?\#]*@|[\/\\][^\/\\]))?(?:\/\/|\\\\)?(?:(([^\:\/\\\?#]+)?(?:\:([^\/\\\?#]+))?)@)?(([^\/\\@\?\#\.]*?[^\/\\@\:\?\#\.\d][^\/\\@\:\?\#\.]*?|[^\/\\@\:\?\#\.]+(?:\:[^\@\/\\\?#\.]*[^\d\@\:\/\\\?#\.]+|(?:\.[^\/\\@\:\?\#\.]+)+))?(?:(?:\:|^)(\d+))?)(((?:\/|\\|^)[^\?#]*)?(\?([^#]*))?)(#[\s\S]*)?$/;
 var hrefDescriptor = {
     get() {
         var href = '';

package/coms/basic/parseURL_test.js

@@ -50,6 +50,7 @@ test("./cluster-opt.html", "pathname", "./cluster-opt.html")
 test(":cluster-opt.html", "pathname", ":cluster-opt.html")
 test("d:/cluster-opt.html", "pathname", "d:/cluster-opt.html")
 test("d:\\cluster-opt.html", "pathname", "d:\\cluster-opt.html")
+test("d:\\work\\cluster-opt.html", "pathname", "d:\\work\\cluster-opt.html")
 test("ftp:\\\\cluster-opt.html", "host", "cluster-opt.html")
 test("\\\\cluster-opt.html", "host", "cluster-opt.html")
 test("https://a:b@測試?abc#foo", "host", "測試")

package/coms/basic/seek.js

@@ -1,3 +1,8 @@
+class join {
+    constructor(t) {
+        this.text = t;
+    }
+}
 var seek = function (object, seeker) {
     if (seeker === null || seeker === undefined || isEmpty(object)) return;
     if (seeker instanceof Function) {
@@ -6,15 +11,48 @@ var seek = function (object, seeker) {
     if (typeof seeker === "string") {
         if (/^(['"`])[\s\S]*$/i.test(seeker)) return seeker.replace(/^(['"`])([\s\S*])\1?$/, "$2");
         if (seeker === '' || seeker === ".") return object;
-        seeker = seeker.split(".");
+        var s = [];
+        s.unshift(seeker.replace(/[\.]([^\.\[]*)|\[([^\]]*)\]|\<([^\>]*)\>/g, (a, b, c, d) => {
+            if (b) s.push(b);
+            else if (d) {
+                s.push(new join(c));
+            }
+            else if (c) {
+                s.push(c || '0');
+            }
+            return '';
+        }));
+        seeker = s;
     }
     if (seeker instanceof Array) {
         if (!seeker.length) return;
-        for (var cx = 0, dx = seeker.length; cx < dx; cx++) {
+        loop: for (var cx = 0, dx = seeker.length; cx < dx; cx++) {
             var key = seeker[cx];
             if (typeof key === "string") {
-                object = object[key];
-            } else {
+                if (/[\^]/.test(key)) {
+                    key = key.split(/[\^]/);
+                    for (var k of key) {
+                        if (k in object) {
+                            object = object[k];
+                            continue loop;
+                        }
+                    }
+                    object = undefined;
+                } else {
+                    object = object[key];
+                }
+            }
+            else if (key instanceof join) {
+                if (object instanceof Array) {
+                    var restk = seeker.slice(cx + 1, dx);
+                    object = object.map(a => seek(a, restk)).join(key.text);
+                }
+                else {
+                    object = '';
+                }
+                break;
+            }
+            else {
                 object = seek(object, key);
             }
             if (object === undefined || object === null) return;

package/coms/kugou/api.js

@@ -1,6 +1,6 @@
 ({
     "https://m.kugou.com/": {
-        "song-info": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou&hash",
+        "song-info;hash": "get                                 app/i/getSongInfo.php?cmd=playInfo&from=mkugou",
         "slider-src": "get:[].mod-slider>.swipe-wrap>div  .#src=img!src&href=a!href",
         "songs-list": "get:[].panel-songslist%20li          .#hash=!id&.panel-songs-item-name>span!innerText",
         "songs-list": "get:[].m_cm_item1warp:nth-child(2)>div .#=a!href\\song-mix&a:nth-child(2)>p:first-child!innerText&singer=a:nth-child(2)>p:nth-child(2)!innerText&imgurl=img!_src",
@@ -20,5 +20,33 @@
     },
     "http://mobilecdn.kugou.com/": {
         "search?keyword": "get:data.info                            api/v3/search/song?format=json&page=1&pagesize=30&showtype=1"
+    },
+    "http://www.kuwo.cn/": {
+        "kuwo-token"/*主要用于初始化kw_token*/: "get",
+    },
+    "http://www.kuwo.cn/api/www/ csrf=$kw_token": {
+        "search-kuwo;key": "get:data.list                                 search/searchMusicBykeyWord?&pn=1&rn=30#singername=artist&songname=name&priced=isListenFee",
+        "music-info;mid": "get:data                                       music/musicInfo",
+    },
+    "http://www.kuwo.cn/api/v1/www/": {
+        "play-url;mid=rid": "get:data                                              music/playUrl?type=music",
+    },
+
+    "http://m.kuwo.cn/newh5/": {
+        "kuwo-lrc;musicId=rid": "get:data.lrclist singles/songinfoandlrc",
+    },
+    "https://music.163.com/weapi/": {
+        "search-yyyy": "form:result.songs cloudsearch/get/web#songname=name&avatar=al.picUrl",
+        "yyyy-url": "form:data[0] song/enhance/player/url/v1#encode=type",
+        "yyyy-lrc": "form:lrc.lyric song/lyric",
+        "yyyy-info": "form:lrc.lyric v3/song/detail",
+    },
+    "http://lyrics.kugou.com/": {
+        "search-krc;keyword=songName&duration=time&hash": "get:candidates[0] search?ver=1&man=yes&client=pc",
+        "download-krc;accesskey&id": "get:content download?ver=1&client=pc&fmt=krc&charset=utf8"
+    },
+    "https://music.91q.com/": {// 千千静听/百度音乐
+        "search-qqjt;word": "get:data.typeTrack v1/search#songname=title&singername=artist<、>.name&avatar=pic&priced=isVip",
+        "qqjt-url?TSID": "get:data v1/song/tracklink#url=path"
     }
-})
+})

package/coms/kugou/buildList.html

@@ -1,6 +1,6 @@
 <list ng-src="s in datas" min-width:=datas[0]?.name?320:120>
     <padding>
-        <song ng-click="run(s)" ng-class="{activate:s.hash===musicList.active_hash,imgonly:!datas[0]?.name}" ng-src="s"></song>
+        <song ng-click="run(s)" ng-class="{activate:musicList.isActived(s),imgonly:!datas[0]?.name}" ng-src="s"></song>
     </padding>
 </list>
 <loading ng-if="datas.is_loading"></loading>

package/coms/kugou/buildList.js

@@ -6,7 +6,7 @@ function main(dataid, datapath) {
         padding,
         song,
         loading,
-        musicList,
+        musicList:kugou$musicList,
         async run(s) {
             if (!s.hash && s.hashid) {
                 await data.from("song-mix", s, function (a) {
@@ -15,7 +15,7 @@ function main(dataid, datapath) {
                 });
             }
             if (s.hash) {
-                kugou$player.play(s.hash);
+                kugou$player.play(s);
             } else {
                 go(datapath, s);
             }

package/coms/kugou/buildScroll.js

@@ -11,7 +11,7 @@ function Main(dataid, datapath, titleid) {
         datapath,
         run(s) {
             if (s.hash) {
-                this.player.play(s.hash);
+                this.player.play(s);
             } else {
                 go(datapath, s);
             }

package/coms/kugou/getSandbox.js

@@ -1,6 +1,6 @@
 var getSandbox = function (xhr) {
     var bodyHTML = String(xhr.responseText || xhr.response || "").replace(RegBodyExp, "$1").replace(RegScriptExp, "").replace(/\son/ig, " no").replace(/\s(src|href)/g, " s$1");
-    var sandbox = createElement(div);
+    var sandbox = document.createElement("div");
     sandbox.innerHTML = bodyHTML;
     return sandbox;
 }

package/coms/kugou/krc.js

@@ -2,30 +2,87 @@ var secret = [64, 71, 97, 119, 94, 50, 116, 71, 81, 54, 49, 45, 206, 210, 110, 1
 var isTrident = /Trident/i.test(navigator.userAgent);
 function krc(list = div()) {
     care(list, function (info) {
-
-        cross("get", `http://lyrics.kugou.com/search?ver=1&man=yes&client=pc&keyword=${info.songName}&duration=${info.time}&hash=${info.hash}`).done(function (response) {
-            if (!response.response) return;
-            var liric = JSON.parse(response.response);
-            var info = liric.candidates[0];
-            if (!info) return;
-            var url = `http://lyrics.kugou.com/download?ver=1&client=pc&id=${info.id}&accesskey=${info.accesskey}&fmt=krc&charset=utf8`;
-            info && cross("get", url).done(function (response) {
-                if (!response.response) return;
-                var krc = JSON.parse(response.responseText || response.response);
-                var content = fromBase64(krc.content);
-                content = content.slice(4).map((a, i) => a ^ secret[i % 16]);
-                var bufff = thirdParty$inflate(content.slice(2));
-                var krc = decodeUTF8(bufff);
-                remove(list.children);
-                var children = createKRC(krc);
+        if (info.type !== "kugo") {
+            remove(list.children);
+            if (info.lrc) {
+                var children = createLRC(info.lrc);
                 appendChild(list, children);
                 list.process = children.process;
-            });
-        });
-
+            }
+            return;
+        }
+        var content = info.krc.slice(4).map((a, i) => a ^ secret[i % 16]);
+        var bufff = thirdParty$inflate(content.slice(2));
+        var krc = decodeUTF8(bufff);
+        remove(list.children);
+        var children = createKRC(krc);
+        appendChild(list, children);
+        list.process = children.process;
     })
     return list;
 }
+function createLRC(lrc) {
+    var saved_rows = [];
+    for (var row of lrc.split(/[\r\n]+/)) {
+        var data = /^\s*\[(.*?)\](.*?)$/.exec(row);
+        if (!data) {
+            if (!isProduction) console.info("%c未解析%c", "color:#c28", "color:#333", row, data);
+            continue;
+        }
+        var [, time, words] = data;
+        var startTime = 0;
+        var times = time.split(":");
+        while (times.length) {
+            startTime = startTime * 60 + +times.shift();
+        }
+        saveToOrderedArray(saved_rows, {
+            value: startTime,
+            startTime,
+            text: words
+        });
+    }
+    var krcList = saved_rows.map(a => {
+        var r = document.createElement('div');
+        text(r, a.text);
+        return r;
+    });
+    var savedIndex = 0;
+    krcList.process = function (offset, length) {
+        var index = getIndexFromOrderedArray(saved_rows, offset);
+        var current_row = saved_rows[index];
+        if (current_row) {
+            var ele = krcList[index];
+            var firstChild = krcList[0];
+            if (index > 0) {
+                if (index !== savedIndex) {
+                    savedIndex = index;
+                    setClass(krcList, index);
+                }
+            }
+            if (ele && firstChild && firstChild.isMounted) {
+                var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
+                css(firstChild, `margin-top:${marginTop | 0}px;`);
+            }
+        }
+    };
+    return krcList;
+}
+
+function setClass(krcList, index) {
+    var ele = krcList[index];
+    krcList.slice(0, index).map(function (a, cx, arr) {
+        removeClass(a, "active after after-active before-active");
+        addClass(a, "before");
+    });
+    removeClass(ele, "after before after-active before-active");
+    addClass(krcList[index - 1], 'before-active');
+    addClass(ele, "active");
+    krcList.slice(index + 1).map(function (a) {
+        removeClass(a, "before active after-active before-active");
+        addClass(a, "after");
+    });
+    if (index + 2 < krcList.length) addClass(krcList[index + 1], 'after-active');
+}
 function createKRC(krc) {
     var saved_rows = [];
     krc.split(/[\r\n]+/).map(function (row) {
@@ -73,18 +130,7 @@ function createKRC(krc) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 if (index > 0) {
                     if (markerLabel.parentNode !== ele) {
-                        krcList.slice(0, index).map(function (a, cx, arr) {
-                            removeClass(a, "active after after-active before-active");
-                            addClass(a, "before");
-                        });
-                        removeClass(ele, "after before after-active before-active");
-                        addClass(krcList[index - 1], 'before-active');
-                        addClass(ele, "active");
-                        krcList.slice(index + 1).map(function (a) {
-                            removeClass(a, "before active after-active before-active");
-                            addClass(a, "after");
-                        });
-                        if (index + 2 < krcList.length) addClass(krcList[index + 1], 'after-active');
+                        setClass(krcList, index);
                         ele.insertBefore(markerLabel, ele.firstChild);
                     }
                     var word_ele = ele.children[current_row_index + 1];
@@ -109,17 +155,17 @@ function createKRC(krc) {
             }
         }
     };
-    var markerLabel = createElement(div);
+    var markerLabel = document.createElement("div");
     return krcList;
 }
 function createCell(word) {
     var label = word.label;
-    var cell = createElement("span");
+    var cell = document.createElement("span");
     text(cell, label);
     return cell;
 }
 function createRow(data) {
-    var row = createElement(div);
+    var row = document.createElement("div");
     var cells = data.words.map(createCell);
     appendChild(row, cells);
     return row;

package/coms/kugou/musicList.js

@@ -1,6 +1,41 @@
 var musicList = data.getInstance("musicList");
+var actived = null;
 musicList.forEach(function (music) {
-    if (music.activate) {
-        musicList.active_hash = music.hash;
+    if (music.activate) actived = music;
+});
+
+var isSameSong = function (m1, m2) {
+    return m1 === m2 || m1.mid && m1.mid === m2.mid || m1.hash && m1.hash === m2.hash || m1.id && m1.id === m2.id;
+};
+
+function addMethod(name, func) {
+    Object.defineProperty(musicList, name, {
+        value: func,
+        enumerable: false
+    });
+}
+addMethod("setActive", function (m) {
+    if (actived !== m) {
+        if (actived && actived !== m) {
+            actived.activate = false;
+        }
+        actived = m;
     }
+});
+addMethod("remove", function (music) {
+    for (var cx = this.length - 1; cx >= 0; cx--) {
+        if (isSameSong(this[cx], music)) musicList.splice(cx, 1);
+    }
+});
+
+addMethod('indexOf', function (music, i) {
+    for (var cx = i || 0, dx = this.length; cx < dx; cx++) {
+        if (isSameSong(this[cx], music)) return cx;
+    }
+});
+addMethod('getActived', function () {
+    return actived;
+});
+addMethod('isActived', function (m) {
+    return actived && m && isSameSong(m, actived);
 });

package/coms/kugou/page.js

@@ -4,14 +4,14 @@
 // var document=this.document;
 // document["body"].appendChild(this.document.createElement("input"));
 var createBottomBar = function (buttonsConfig) {
-    var bar = createElement(div);
+    var bar = document.createElement("div");
     addClass(bar, "bottom-bar");
     var button_count = 0;
     for (var k in buttonsConfig) button_count++;
-    var btnArea = createElement(div);
+    var btnArea = document.createElement("div");
     css(btnArea, "width:" + (100 / button_count) + "%;");
     maxWidth(btnArea, 100);
-    var line = createElement(btnArea);
+    var line = btnArea.cloneNode();
     inlineBlock(btnArea);
     var active = function (ratio) {
         if (ratio >= .6) {
@@ -29,11 +29,11 @@ var createBottomBar = function (buttonsConfig) {
     var index = 0;
     for (var k in buttonsConfig) {
         var [url, info] = buttonsConfig[k].split(":");
-        var btn = createElement(btnArea);
+        var btn = btnArea.cloneNode();
         btn.url = url;
         btn.searchInfo = info;
         btn.active = active;
-        btn.container = createElement(div);
+        btn.container = document.createElement("div");
         btn.index = index++;
         btn.innerHTML = k;
         onclick(btn, function () {
@@ -83,7 +83,7 @@ onappend(pages, function () {
     if (!isFinite(index)) index = 1;
     pages.go(index);
 });
-var page = createElement(div);
+var page = document.createElement("div");
 appendChild(page, pages, bar);
 ontouchstart(page, kugou$dragview);
 onmousedown(page, kugou$dragview);

package/coms/kugou/playList.html

@@ -4,7 +4,7 @@
 </div>
 <list class="body" ng-src="(p,i) in musicList" min-width=480>
     <padding ng-delete="remove(i)">
-        <song ng-click="play(i)" ng-class="{activate:p.hash===musicList.active_hash}" ng-src=p></song>
+        <song ng-click="play(i)" ng-class="{activate:musicList.isActived(p)}" ng-src=p></song>
     </padding>
 </list>
 <div foot>

package/coms/kugou/playList.js

@@ -24,7 +24,6 @@ var $scope = {
     },
     remove(i) {
         var list = kugou$musicList.slice(0);
-        list.active_hash = kugou$musicList.active_hash;
         list.splice(i, 1);
         data.setInstance("musicList", list, true);
     },

package/coms/kugou/playList.less

@@ -12,13 +12,20 @@
     margin-top: 0;
     transition: margin .2s ease-out;
     color: #fff;
+    border: 1px solid;
 }
->.head{
+
+>.head {
     background: inherit;
+    border-bottom: 1px solid;
 }
->.foot{
+
+>[foot] {
     background: inherit;
+    border-top: 1px solid;
+    padding-bottom: 6px;
 }
+
 >list.body {
     overflow-x: hidden;
     overflow-y: scroll;

package/coms/kugou/player.html

@@ -11,9 +11,9 @@
         <span ng-bind="totalTime"></span>
     </div>
     <div class="song">
-        <span class="name" ng-bind=info.songName></span>
-        <span class="spliter" ng-if="info.songName&&info.singerName">&nbsp;-&nbsp;</span>
-        <span class="singer" ng-bind=info.singerName></span>
+        <span class="name" ng-bind=songName></span>
+        <span class="spliter" ng-if="songName&&singerName">&nbsp;-&nbsp;</span>
+        <span class="singer" ng-bind=singerName></span>
     </div>
 </div>
 <btn class="prev" ng-click=play(index-1)></btn>