Merge pull request #554 from the1812/preview

Hotfix #1 for v1.10.24
This commit is contained in:
Grant Howard 2020-05-24 16:37:45 +08:00 committed by GitHub
commit b4673f4ab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 60 additions and 47 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -20,7 +20,7 @@
"blur-video-control.min.js": "00A2AC837FC455DF2AED7D0C350265C7438CC6F5C203F085E19639DDB86D0E11",
"bvid-convert.min.css": "F49ED1B27A86CC3957226474EE15E86D5B11974A2C9D6D4968B375222C802FD0",
"bvid-convert.min.js": "19B9ECDC5B9E96884E093A0537757865F1D006DCC3FC8B9FD93D88EB0D99A2B5",
"category-regions.min.js": "75B36FF220C1BE8131CF9E9B1366530D1435E25166B7CD916A62C8959CFBF964",
"category-regions.min.js": "F646D084B252E37B85F4A6A9976ECE3E6E331CF0E554B1BF6F885C38E69406F1",
"clear-cache.min.js": "9AB1536D8278DA681831A589AD1414425BF206B36AE109FB4EC1E8A685BB2A9F",
"collapse-live-side-bar.min.css": "22348786547D2D8DB659A306AF2E9C1F2050D66488778C71545AAEF785FD57E6",
"collapse-live-side-bar.min.js": "BB1B1CF157099A70F1AEA3F154C84D9CA1A84A29B5F6E42357CA9F51FFC4965C",
@ -32,7 +32,7 @@
"compact-layout.min.js": "B20609A7CBBDB1845FA0156FB5BE6B1E1A1B8B069EA85F65D16241DD2C12D738",
"custom-control-background.min.css": "1981FD2BF3B17ECF33F98D5DEDAF0D32ACBE9532A51FDB70822286991AB98EF3",
"custom-control-background.min.js": "B9F366B251D1572ACE801FF6ECF15D4D1AAB3EA5A5B04B961B6F4310E2AB1A84",
"custom-navbar.min.css": "9A928621375DCBCB93199AEA82E1A5EA58C2C0D25BF36BC26620F0CC91E227ED",
"custom-navbar.min.css": "73C144DE2CC99BB36B668B10971AAD10BB5051CC9CC1A2412388A7B31B82F98A",
"custom-navbar.min.html": "269CEAA9877456B824BC17D4FA4FC62CBFE767EF14715DD0E75443185DFD032C",
"custom-navbar.min.js": "423E84D6EC116512C8059E924F82EDC94E95B5F27DDD48AA508800F1E76666AE",
"custom-navbar-activities.min.js": "802226FE2C24D56379A6EAD13D3697A4D5A46109D0C63EDACAE8E667ED267EA1",
@ -166,7 +166,7 @@
"player-on-top.min.js": "B4954610299F27FA54245BB58782E4FA1E2E81FF2F813A774F633A8A5E243643",
"player-shadow.min.js": "918D2127907BC2C164CB86BF7F9C2501CF3B9CD236FEEDE5155B9B5D932F3415",
"quality-errors.min.js": "D56E0659B5F06447579128F9DBD825D40E1659252DDAD358B60E071613AAB2BE",
"quick-favorite.min.css": "37015EF15FFC5CE22F45C9AAF332C57CADF9DA32C33D971B506327C2121EA380",
"quick-favorite.min.css": "F14B5ED3F95E944E55B06FEAFF0AC04306146FE9F9223B2C49CE3D507849BE6B",
"quick-favorite.min.js": "64006E6C0678AE094522A84B224B5DCFA52EBFE4BC0347FDBD524CE3EB407D34",
"rank-list.vue.min.js": "EA112025FE267F33FEA4320754C665A1694104FE6AE280AA171B8B0409BBDCCF",
"record-live-danmaku.min.js": "2590A564ADD42BBB34E957B92728EBBE85A644A8E0F94ACDE69B55E3FF1C3889",
@ -194,7 +194,7 @@
"show-dead-video-title.min.js": "8D591930421EBA43A1BDF50DC8B645C1BD1A17E109FB1CFBCD6B78E6C74E1D68",
"simple-home.vue.min.js": "1F5CF46DEE65549A30C5F0790578EED0C6B3AD6C5F20D9B88CD745C4B7664ABB",
"simple-home-bangumi-category.vue.min.js": "87DCA2C8295CAD66C9FA01D65437EC2F9DD5E7F4A565B4384ABAB1746A6787EE",
"simple-home-categories.vue.min.js": "9F8198B04200457F5A0A7AB9A105DD6A1602F4DA67899EDBF546D64F06CEECB9",
"simple-home-categories.vue.min.js": "0A7D20E0489FAA3DF0A62669ABF42568E8006FFAAB8392E58524645C2E922245",
"simple-home-feeds.vue.min.js": "FD8536D04043817395063E889E0C5A3C6158CDCD794A26398C635B8772EBA32B",
"simple-home-normal-category.vue.min.js": "55B700EF840DBD1E9F5C249739DC24F80B4FEF96082169EC484E944A5189D6E6",
"simplify-home.min.css": "50F0FA046D61ECE5183409CF97C8DBECB4CF64918DF813CD2B39BF9FBD314B42",

Binary file not shown.

View File

@ -1 +1 @@
(()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:23,tv:11,film:181,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})();
(()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:181,tv:11,film:23,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})();

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
@font-face{font-family:quick-favorite;src:url(data:application/x-font-ttf;base64,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)}.ops .quick-favorite{margin-right:28px!important;position:relative}.ops .quick-favorite>i{font-family:quick-favorite!important;display:inline-block;font-style:normal;text-align:center;text-transform:none;line-height:1;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.ops .quick-favorite>i:after{content:""}.ops .quick-favorite .lists-tip,.ops .quick-favorite .select-list,.ops .quick-favorite .tip{line-height:normal;position:absolute;top:calc(100% + 8px);left:50%;transform:translateX(-50%);z-index:1000;background:#000d;padding:4px 8px;border-radius:4px;color:#eee;transition:.2s ease-out;opacity:0;pointer-events:none}.ops .quick-favorite .lists-tip.show,.ops .quick-favorite .select-list.show,.ops .quick-favorite .tip.show{opacity:1;pointer-events:initial}.ops .quick-favorite .tip{padding:8px}.ops .quick-favorite .lists-tip{top:calc(100% + 8px + 42px);color:#aaa;font-size:12px;z-index:100}.ops .quick-favorite .select-list{display:flex;align-items:center}.ops .quick-favorite .select-list>*{white-space:nowrap}.ops .quick-favorite .select-list .lists-loading{padding:4px 32px}.ops .quick-favorite .select-list .lists{margin-left:8px}.ops .quick-favorite .select-list .v-dropdown .mdi-chevron-down{color:inherit!important;margin:0!important;transition:.2s ease-out;display:flex;align-items:center;justify-content:center;font-size:16pt!important}
@font-face{font-family:quick-favorite;src:url(data:application/x-font-ttf;base64,AAEAAAALAIAAAwAwR1NVQiCLJXoAAAE4AAAAVE9TLzJAIEqwAAABjAAAAFZjbWFw6ynBrQAAAewAAAFwZ2x5ZnI4GW4AAANkAAABDGhlYWQYiH0gAAAA4AAAADZoaGVhB4sD6wAAALwAAAAkaG10eAPoAAAAAAHkAAAACGxvY2EAhgAAAAADXAAAAAZtYXhwAQ8AZAAAARgAAAAgbmFtZa2yT/oAAARwAAACXnBvc3QnqNOhAAAG0AAAAD0AAQAAA+gAAAAAA+gAAAAAA6IAAQAAAAAAAAAAAAAAAAAAAAIAAQAAAAEAAOxSVapfDzz1AAsD6AAAAADa5Bw+AAAAANrkHD4AAAAAA6IDvwAAAAgAAgAAAAAAAAABAAAAAgBYAAMAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKADAAPgACREZMVAAObGF0bgAaAAQAAAAAAAAAAQAAAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAEB9AGQAAUAAAJ6ArwAAACMAnoCvAAAAeAAMQECAAACAAUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBmRWQAQOoB6gED6AAAAFoD6AAAAAAAAQAAAAAAAAAAAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAVQAAQAAAAAATgADAAEAAAAsAAMACgAAAVQABAAiAAAABAAEAAEAAOoB//8AAOoB//8AAAABAAQAAAABAAABBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAcAAAAAAAAAAEAAOoBAADqAQAAAAEAAAAAAIYAAAADAAAAAAOiA78ANwA9AFcAAAEuAS8BLgEvAS4BIgYPAQ4BDwEOAhYfAR4BDwEGHgI/ATYyFzM3LgM/AT4BOwEyFhc3PgEDPgE1BxYTIzc2JisBIgYPAQYWNzMHBh4BMzI/ATYmIwOcBRsRnh8xDEYIHSQgCEMOMB6eERsLCQx1FhAEGQQOHiQPhhtBGwMJFSUXBghHCi0cshUmDAsNCaoNDj8UdmpVBgsLsAYJAkcECQlUHwEFCQQIBdkICQsCgBEWAxgFJRuUEBMTEZMbJgUYAxYiIgx6FDkeqhIiFAIJSRERKgEVIysUwxogExEMDSL+BAkbED8BAR1zCRMHBcQIEAGLBgsFBtUIFgAAAAAQAMYAAQAAAAAAAQAOAAAAAQAAAAAAAgAHAA4AAQAAAAAAAwAOABUAAQAAAAAABAAOACMAAQAAAAAABQALADEAAQAAAAAABgAOADwAAQAAAAAACgArAEoAAQAAAAAACwATAHUAAwABBAkAAQAcAIgAAwABBAkAAgAOAKQAAwABBAkAAwAcALIAAwABBAkABAAcAM4AAwABBAkABQAWAOoAAwABBAkABgAcAQAAAwABBAkACgBWARwAAwABBAkACwAmAXJxdWljay1mYXZvcml0ZVJlZ3VsYXJxdWljay1mYXZvcml0ZXF1aWNrLWZhdm9yaXRlVmVyc2lvbiAxLjBxdWljay1mYXZvcml0ZUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHEAdQBpAGMAawAtAGYAYQB2AG8AcgBpAHQAZQBSAGUAZwB1AGwAYQByAHEAdQBpAGMAawAtAGYAYQB2AG8AcgBpAHQAZQBxAHUAaQBjAGsALQBmAGEAdgBvAHIAaQB0AGUAVgBlAHIAcwBpAG8AbgAgADEALgAwAHEAdQBpAGMAawAtAGYAYQB2AG8AcgBpAHQAZQBHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAgEDABNxdWljay1mYXZvcml0ZV9fXyAxAAAAAAA=)}.ops .quick-favorite{margin-right:28px!important;position:relative}.ops .quick-favorite>i{font-family:quick-favorite!important;display:inline-block;font-style:normal;text-align:center;text-transform:none;line-height:1;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.ops .quick-favorite>i:after{content:""}.ops .quick-favorite .lists-tip,.ops .quick-favorite .select-list,.ops .quick-favorite .tip{line-height:normal;position:absolute;top:calc(100% + 8px);left:50%;transform:translateX(-50%);z-index:1000;background:#000d;padding:4px 8px;border-radius:4px;color:#eee;transition:.2s ease-out;opacity:0;pointer-events:none}.ops .quick-favorite .lists-tip.show,.ops .quick-favorite .select-list.show,.ops .quick-favorite .tip.show{opacity:1;pointer-events:initial}.ops .quick-favorite .tip{padding:8px}.ops .quick-favorite .lists-tip{top:calc(100% + 8px + 42px);color:#aaa;font-size:12px;z-index:100}.ops .quick-favorite .select-list{display:flex;align-items:center}.ops .quick-favorite .select-list>*{white-space:nowrap}.ops .quick-favorite .select-list .lists-loading{padding:4px 32px}.ops .quick-favorite .select-list .lists{margin-left:8px}.ops .quick-favorite .select-list .v-dropdown{color:#000}body.dark .ops .quick-favorite .select-list .v-dropdown{color:#eee}.ops .quick-favorite .select-list .v-dropdown .mdi-chevron-down{color:inherit!important;margin:0!important;transition:.2s ease-out;display:flex;align-items:center;justify-content:center;font-size:16pt!important}

File diff suppressed because one or more lines are too long

View File

@ -26,6 +26,8 @@
width: 350px;
height: 600px;
font-size: 12px;
padding: 0;
margin: 0;
@include v-stretch();
justify-content: center;
.loading-tip {

View File

@ -15,9 +15,11 @@ export const RegionCodes: { [key in keyof SimpleHomeCategoryOrders]: number } =
information: 202,
entertainment: 5,
column: -1,
movie: 23,
// movie: 23,
movie: 181,
tv: 11,
film: 181,
film: 23,
// film: 181,
documentary: 177,
}
export const RegionLinks: { [key in keyof SimpleHomeCategoryOrders]: string } = {

View File

@ -16,7 +16,10 @@
</div>
</div>
<div class="buttons">
<div class="toggle-reorder" @click="reordering = !reordering; reorder.toggle()">
<div
class="toggle-reorder"
@click="reordering = !reordering; reorder.toggle()"
>
<icon type="mdi" :icon="reordering ? 'check' : 'swap-horizontal'"></icon>
{{reordering ? '完成' : '排序'}}
</div>
@ -46,32 +49,32 @@ const tabNames = {
information: '资讯',
entertainment: '娱乐',
// column: '',
movie: '影',
movie: '',
tv: 'TV剧',
film: '影视',
documentary: '纪录片'
film: '放映厅',
documentary: '纪录片',
}
export default {
components: {
Icon: () => import('../../../icon.vue'),
NormalCategory: () => import('./simple-home-normal-category.vue'),
BangumiCategory: () => import('./simple-home-bangumi-category.vue')
BangumiCategory: () => import('./simple-home-bangumi-category.vue'),
},
data() {
return {
tabs: Object.entries(tabNames).map(([key, name]) => {
return {
key,
name
name,
}
}),
selectedTab: Object.entries(settings.simpleHomeCategoryOrders).sort(
(a, b) => a[1] - b[1]
(a, b) => a[1] - b[1],
)[0][0],
reordering: false,
reorder: null,
regionCodes: null,
regionLinks: null
regionLinks: null,
}
},
async mounted() {
@ -116,7 +119,7 @@ export default {
} else {
this.selectedTab = tab.key
}
}
},
},
computed: {
content() {
@ -138,8 +141,8 @@ export default {
} else {
return this.regionCodes[this.selectedTab]
}
}
}
},
},
}
</script>

View File

@ -61,14 +61,20 @@
.lists {
margin-left: 8px;
}
.v-dropdown .mdi-chevron-down {
color: inherit !important;
margin: 0 !important;
transition: 0.2s ease-out;
display: flex;
align-items: center;
justify-content: center;
font-size: 16pt !important;
.v-dropdown {
color: black;
body.dark & {
color: #eee;
}
.mdi-chevron-down {
color: inherit !important;
margin: 0 !important;
transition: 0.2s ease-out;
display: flex;
align-items: center;
justify-content: center;
font-size: 16pt !important;
}
}
}
}