efront 3.27.1 → 3.28.1

package/apps/kugou/home.html

@@ -1,5 +1,5 @@
 <slider elementid=pages class="pages"></slider>
-<titlebar class="title-bar">
+<titlebar>
     <tag type=white ng-repeat="t in tags" ng-click="pages.go(t.index)" ng-class="{activate:t===tags.active}">
         <span ng-bind=t.text></span>
     </tag>
@@ -8,6 +8,11 @@
         <icon class="search-icon"></icon>
     </search>
     <btn class="search-btn" ng-click="go('/search/search')">
-        <icon class="search-icon"></icon>
+        <svg class="search-icon" style="fill: currentColor;overflow: hidden;"
+            viewBox="0 0 1024 1024" version="1" xmlns="http://www.w3.org/2000/svg" p-id="2144">
+            <path
+                d="M936 843l-182-182c41-55 64-123 64-194 0-179-146-325-325-325s-325 146-325 325 146 325 325 325c77 0 149-26 207-74l180 180 55-55zM492 728c-143 0-260-117-260-260s117-260 260-260c143 0 260 117 260 260 0 67-25 131-71 179-49 52-116 80-189 80z"
+                fill="" p-id="2145"></path>
+        </svg>
     </btn>
 </titlebar>

package/apps/kugou/home.js

@@ -35,6 +35,7 @@ render(page, {
     tag: button,
     btn: button,
     input,
+    titlebar,
     slider(elem) {
         var pages = slider(elem, function (index, ratio) {
             if (ratio === 1) {

package/apps/kugou/home.less

@@ -1,4 +1,4 @@
-.title-bar {
+.titlebar {
     position: absolute;
     // background-color: #fffb;
     left: 0;
@@ -8,14 +8,12 @@
     height: 44px;
     line-height: 44px;
     font-size: 16px;
-    box-shadow: 0 2px 2px -2px rgba(0, 0, 0, .1);
     backdrop-filter: blur(20px);
     z-index: 1;
     padding: 0 10px;
     padding-right: 60px;
     cursor: default;
     white-space: nowrap;
-    background-color: #1f4a3bd4;
 
     >tag {
         width: 25%;
@@ -45,7 +43,7 @@
         .track() {
             opacity: 1;
             box-shadow: none;
-            background-color: #22a2c4;
+            background-color: #22a2c433;
             transition: margin-top .2s ease-out;
         }
 
@@ -77,8 +75,7 @@
         display: inline-block;
         height: 44px;
         width: 24px;
-        vertical-align: middle;
-        background: url('http://m.kugou.com/v3/static/images/index/search.png') no-repeat center/ 16px auto;
+        vertical-align: top;
     }
 }
 

package/apps/kugou/main.js

@@ -1,4 +1,4 @@
 data.setConfig(api);
 zimoli.switch("", null, "/home");
-css("body", "background-color:#f2f4f6;");
+css("body", "background-color:#323336;");
 zimoli();

package/apps/kugou/search/search.html

@@ -5,12 +5,12 @@
     <icon class="loading" ng-if="result?.loading"></icon>
     <btn ng-click="keyword='';search()">清空</btn>
 </titlebar>
-<div ng-if="!keyword">
+<div ng-if="!keyword" .history>
     <padding class="empty" ng-if="!searchHistory.length">
         搜索历史为空
     </padding>
     <padding ng-repeat="s in searchHistory">
-        <btn ng-click="search(s,0)" type=white><span ng-bind="s"></span></btn>
+        <btn ng-click="search(s,0)"><span ng-bind="s"></span></btn>
     </padding>
 </div>
 <list ng-if="keyword" ng-src="s in result">

package/apps/kugou/search/search.less

@@ -7,11 +7,12 @@
     bottom: 0;
     background: inherit;
 }
-.button{
+
+.button {
     padding: 0 10px;
 }
 
-.empty{
+.empty {
     color: #666;
     display: block;
     padding: 50px 10px;
@@ -28,6 +29,7 @@
         text-align: right;
         vertical-align: middle;
         width: auto;
+
         &:after {
             content: "⇵";
         }
@@ -65,43 +67,23 @@
     }
 }
 
-.input-box {
-    height: 50px;
-    position: relative;
-    padding: 10px 12px;
-
+.titlebar {
+    padding: 0 60px;
     >input {
         height: 30px;
         border: none;
         width: 100%;
         border-radius: 3px;
+        background: #000c;
         font-size: 14px;
         padding: 0 10px;
+        color: #fff;
     }
 }
 
-.keyword-pad {
-    >div {
-        padding: 10px 12px;
-        background-color: #fff;
-    }
-
-    >div+div {
-        border-top: 1px solid #ccc;
-    }
-}
-
-.result-pad {
-    b {
-        color: rgb(44, 162, 149);
-    }
-
-    >div {
-        padding: 10px 12px;
-        background-color: #fff;
-    }
-
-    >div+div {
-        border-top: 1px solid #ccc;
+.history{
+    btn{
+        background: #5769;
+        padding: 0 16px;
     }
 }

package/apps/kugou/search.html

@@ -0,0 +1,6 @@
+<svg class="icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;"
+    viewBox="0 0 1024 1024" version="1" xmlns="http://www.w3.org/2000/svg" p-id="2144">
+    <path
+        d="M936 843l-182-182c41-55 64-123 64-194 0-179-146-325-325-325s-325 146-325 325 146 325 325 325c77 0 149-26 207-74l180 180 55-55zM492 728c-143 0-260-117-260-260s117-260 260-260c143 0 260 117 260 260 0 67-25 131-71 179-49 52-116 80-189 80z"
+        fill="" p-id="2145"></path>
+</svg>

package/apps/kugou/singer/keywords.html

@@ -1,4 +1,5 @@
 <group ng-repeat="data in datas">
+    <bg></bg>
     <padding ng-repeat="d in data">
         <song ng-src=d ng-click="go('/singer/list',d)"></song>
     </padding>

package/apps/kugou/singer/keywords.js

@@ -13,7 +13,9 @@ var datas = data.from("singer-class", function (response) {
 });
 var $scope = {
     datas,
+    group: padding,
     padding,
+    bg,
     song,
     go,
 };

package/apps/kugou/singer/keywords.less

@@ -4,26 +4,61 @@
 
 >group {
     position: relative;
-    border-radius: 4px;
     overflow: hidden;
     display: block;
     border: solid transparent;
     border-width: 6px 0;
-    
+
+    >bg {
+        display: none;
+    }
+
     >padding {
         height: auto;
         display: block;
         border: solid transparent;
         border-width: 0 6px;
-        >song{
+
+        >song {
             line-height: 30px;
         }
     }
 }
 
+@media (max-width:720px) {
+
+    song .bg {
+        display: none;
+    }
+
+    song {
+        border-radius: 0;
+        background: transparent;
+    }
+
+    >group {
+        overflow: hidden;
+        border-width: 6px;
+
+        padding+padding {
+            border-top: 1px solid #9992;
+        }
+    }
+
+    >group>padding {
+        border: none;
+    }
+
+    >group>bg {
+        background: #101216;
+        border-radius: 4px 0 4px 0;
+        display: block;
+    }
+}
+
 @media(min-width:721px) {
     >group {
-        
+
         >padding {
             width: 33.3333%;
             line-height: 40px;

package/coms/basic/Field.js

@@ -1,5 +1,4 @@
 class Field {
     key = '';
     name = '';
-    sort = 0;
 }

package/coms/basic/Table.js

@@ -36,6 +36,7 @@ class Table extends Array {
         removeFromList(this.sortFields, field);
         this.sortFields.push(field);
         var sorted = this.sorted || this.source.slice(0);
+        if (isEmpty(field.sort)) field.sort = 0;
         field.sort = field.sort > 0 ? -1 : 1;
         this.sorted = sorted.sort(function (a, b) {
             a = seek(a, field.key);

package/coms/basic/cross_.js

@@ -286,16 +286,18 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                         }
                         location = getRequestProtocol(url) + "//" + location;
                     }
-                    var crs = cross_.call(cross, jsonp, digest, method, location, _headers);
-                    crs.isRedirected = (xhr.isRedirected || 0) + 1;
-                    crs.done(onload, false);
-                    crs.error(onerror, false);
-                    if (!isEmpty(datas)) crs.send(datas);
+                    if (!redirected) redirected = [];
+                    headers = _headers;
+                    url = location;
+                    var r = method + " " + url;
+                    if (redirected.indexOf(r) >= 0 || redirected.length > 10) onerror(xhr);
+                    else redirected.push(r), fire();
                     break;
                 default:
                     onerror(xhr);
             }
         };
+        var redirected = null;
         var cross = this;
         var xhr = cross(callback, onerror);
         var send = xhr.send;
@@ -327,6 +329,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         var fire = async function (code) {
             if (!~requests.indexOf(xhr)) return;
+            xhr.method = method;
+            xhr.url = url;
             xhr.encrypt = code;
             var isform = /^f/i.test(method);
             if (isform) {

package/coms/basic_/rest_.js

@@ -8,7 +8,7 @@ function rest_(o, keys) {
     var propertyIsEnumerable = Object.prototype.propertyIsEnumerable;
     var map = Object.create(null);
     for (var k of keys) map[k] = true;
-    var res = Object.create(null);
+    var res = {};
     for (var k in o) {
         if (hasOwnProperty.call(o, k)) {
             if (k in map) continue;

package/coms/kugou/api.js

@@ -16,7 +16,7 @@
         "singer-info0": "mget:[].singer-songs-list>li       singer/info/:id#hash=!id&singer=.singer-name|innerText&name=.song-name|innerText&data=em/innerText"
     },
     "https://www.kugou.com/": {
-        "singer-info": "cget:link[rel]+script       yy/singer/home/:id.html",
+        "singer-info": "cget:link[rel]+script       singer/info/:id",
     },
     "http://mobilecdn.kugou.com/": {
         "search?keyword": "get:data.info                            api/v3/search/song?format=json&page=1&pagesize=30&showtype=1"

package/coms/kugou/bg.js

@@ -0,0 +1,3 @@
+function bg(elem) {
+    return elem || document.createElement("bg");
+}

package/coms/kugou/bg.less

@@ -0,0 +1,34 @@
+& {
+    border: 1px solid rgba(0, 0, 0, .1);
+    border-radius: inherit;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    overflow: hidden;
+
+    &:after {
+        margin: -100px -180px;
+        width: 300px;
+        height: 200px;
+        right: 0;
+        bottom: 0;
+    }
+
+    &:before {
+        width: 60px;
+        height: 100px;
+        margin: -55px -35px;
+        left: 0;
+        top: 0;
+    }
+
+    &:after,
+    &:before {
+        content: "";
+        background-color: #2873;
+        position: absolute;
+        border-radius: 50%;
+    }
+}

package/coms/kugou/bindScroll.js

@@ -4,23 +4,38 @@ function bindScroll(titlebar, page) {
     var labelarea = div();
     var [label, back] = titlebar.children;
     css(back, `height:${fromPixel(topHeight)}`);
-    appendChild.after(label, labelarea);
-    var init=function(){
-        init=function(){};
-        css(labelarea, "height:100%;width:100%;background:#000;position:absolute;left:0;top:0;z-index:-1");
+    var img = document.createElement("png");
+    css(labelarea, "backdrop-filter:blur(20px);height:100%;width:100%;background:inherit;position:absolute;left:0;top:0;z-index:-1");
+    css(img, 'position:absolute;left:0;top:0;width:100%;height:100%;filter:brightness(.8) saturate(.6);z-index:-1');
+    var init = function (image) {
+        if (image) {
+            appendChild.after(label, labelarea);
+            appendChild.after(label, img);
+            setOpacity(image, 0);
+            css(img, `background:${image.style.backgroundImage}no-repeat center;background-size:cover;`);
+        }
+        else {
+            remove(img);
+            remove(labelarea);
+        }
     };
-    onappend(page, function () {
-        css(titlebar, `min-height:${fromPixel(topHeight)}`);
-        setTimeout(refresh);
-    });
-    var refresh = function () {
+    var getImage = function () {
         var image = page.children[0];
         if (!image) return;
         if (!image.style.backgroundImage && !/img/i.test(image.className)) image = page.children[1] || image;
         if (!image.style.backgroundImage && !/img/i.test(image.className)) return;
-        init();
-        setOpacity(image, 0);
-        image.style.opacity = 0;
+        return image;
+    }
+
+    onmounted(page, function () {
+        css(titlebar, `min-height:${fromPixel(topHeight)}`);
+        var image = getImage();
+        init(image);
+        refresh();
+    });
+    var refresh = function () {
+        var image = getImage();
+        if (!image) return;
         var scrollTop = page.scrollTop;
         var offsetHeight = image.offsetHeight;
         var height = offsetHeight + image.offsetTop - scrollTop;
@@ -32,10 +47,10 @@ function bindScroll(titlebar, page) {
         }
         if (height > page.offsetHeight >> 1) {
             height = page.offsetHeight >> 1;
-            css(image, { paddingBottom: fromOffset(height) })
+            css(image, { paddingBottom: fromOffset(height) });
         }
-        css(titlebar, `background: center ${image.style.backgroundImage};background-size:cover;height:${fromOffset(height)}`);
-        setOpacity(labelarea, (1 - (titlebar.offsetHeight + offsetHeight) / offsetHeight / 2));
+        css(titlebar, `height:${fromOffset(height)}`);
+        setOpacity(labelarea, 1 - (titlebar.offsetHeight) / offsetHeight);
         setOpacity(label, 1 - (titlebar.offsetHeight - topHeight) / (offsetHeight - topHeight));
         return {};
     };

package/coms/kugou/buildList.js

@@ -1,5 +1,5 @@
 function main(dataid, datapath) {
-    var page = div();
+    var page = document.createElement("list-page");
     page.innerHTML = buildList;
     render(page, {
         list: lattice,

package/coms/kugou/buildList.less

@@ -1,5 +1,6 @@
 & {
     font-size: 16px;
+    height: 100%;
 }
 
 .list {
@@ -10,17 +11,8 @@
     right: 0;
     bottom: 0;
     left: 0;
-
-    >div {
-        background-color: #fff;
-        width: 100%;
-        padding: 10px 15px;
-    }
-
-    >div+div {
-        border-top: 1px solid #ccc;
-    }
 }
-.padding{
+
+.padding {
     max-width: 100%;
 }

package/coms/kugou/buildScroll.js

@@ -36,7 +36,6 @@ function Main(dataid, datapath, titleid) {
                 data.from(titleid, {
                     id
                 }).then(function ({ title }) {
-                    console.log(arguments)
                     _titlebar.setTitle(title);
                     document.title = title;
                 })

package/coms/kugou/playList.less

@@ -8,14 +8,21 @@
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .6);
     margin-bottom: 10px;
     overflow: visible;
-    background: #fff;
+    background: #131416;
     margin-top: 0;
     transition: margin .2s ease-out;
+    color: #fff;
+}
+>.head{
+    background: inherit;
+}
+>.foot{
+    background: inherit;
 }
-
 >list.body {
     overflow-x: hidden;
     overflow-y: scroll;
+    background: #f2f4f622;
     padding: 0;
 }
 

package/coms/kugou/player.js

@@ -249,7 +249,6 @@ var $scope = {
         $scope.playing = true;
         playState.width = 0;
         getMusicInfo(hash).loading_promise.then((response) => {
-            console.log(response)
             if (!this.playing) return;
             if (hash !== musicList.active_hash) return;
             if (response.imgUrl) {

package/coms/kugou/player.less

@@ -128,16 +128,17 @@
     >.track:after,
     >.avatar {
         border-color: @main-color;
-        opacity: 1;
         box-shadow: 0 0 6px -3px @main-color;
     }
-
+    
     >.track {
-        transition: height .3s;
+        opacity: .7;
+        transition: height .3s, opacity .3s;
         top: 12px;
     }
-
+    
     >.avatar {
+        opacity: 1;
         top: 0;
     }
 
@@ -219,6 +220,7 @@
 
     >div.progress>.track {
         height: 3px;
+        opacity: 1;
     }
 
     >.track {

package/coms/kugou/song.html

@@ -1,4 +1,4 @@
-<div class="bg"></div>
+<bg></bg>
 <png class="logo" ng-if="song.imgurl" ng-src=song.imgurl></png>
 <div class="singer" ng-if="song.singer" ng-model=song.singerMarked></div>
 <div class="song" ng-model=song.songMarked></div>

package/coms/kugou/song.js

@@ -4,6 +4,7 @@ function main(elem) {
     var $scope = {
         filterTime,
         png: img,
+        bg,
         playState: kugou$playState,
         song: {},
         musicList: kugou$musicList,
@@ -19,7 +20,7 @@ function main(elem) {
             }
         }
         $scope.song = {
-            hash: item.hash,
+            hash: item.hash || item.hashid,
             imgurl: item.imgurl,
             singer: singerName,
             songMarked: mark(songName, elem.mark),

package/coms/kugou/song.less

@@ -6,16 +6,17 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    background: #fff;
+    background: #101216;
+    color: #fffc;
 
     border: 2px solid transparent;
 
     &:hover {
-        border-color: #2cf;
+        border-color: #276;
     }
 
     &:active {
-        border-color: #29c;
+        border-color: #253;
     }
 }
 
@@ -63,10 +64,9 @@
 }
 
 b {
-    border: 1px solid #1f4a3bd4;
-    color: #1f4a3bd4;
+    border: 1.2px solid #288833;
     font-weight: normal;
-    background: #a8ebd4d4;
+    background: #2836;
 
 }
 
@@ -78,12 +78,15 @@ b {
     text-align: center;
     line-height: 12px;
     font-size: 12px;
-    color: #888;
+    color: #fff9;
 
     &+.song {
         padding-top: 8px;
     }
 }
+png{
+    filter: brightness(.7) contrast(.9);
+}
 
 >.play-state {
     position: absolute;

package/coms/kugou/titlebar.less

@@ -1,10 +1,7 @@
 & {
-    background-color: #1f4a3b99;
     height: 44px;
     line-height: 42px;
     font-size: 16px;
-    backdrop-filter: blur(20px);
-
     >.button {
         height: 44px;
         line-height: 44px;

package/coms/zimoli/block.less

@@ -3,39 +3,4 @@
     position: relative;
     background: #fffc;
     border-radius: 4px 0 4px 0;
-}
-
->.bg {
-    border: 1px solid rgba(0, 0, 0, .1);
-    border-radius: inherit;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    overflow: hidden;
-
-    &:after {
-        margin: -100px -180px;
-        width: 300px;
-        height: 200px;
-        right: 0;
-        bottom: 0;
-    }
-
-    &:before {
-        width: 60px;
-        height: 100px;
-        margin: -55px -35px;
-        left: 0;
-        top: 0;
-    }
-
-    &:after,
-    &:before {
-        content: "";
-        background-color: rgba(90, 200, 250, 0.1);
-        position: absolute;
-        border-radius: 50%;
-    }
 }