Skip to content

Commit d3083a6

Browse files
HunlongyuHunlongyu
committed
v0.7.19 优化完成暗黑主题
1 parent 6ba19f6 commit d3083a6

File tree

11 files changed

+113
-16
lines changed

11 files changed

+113
-16
lines changed

‎.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GH_TOKEN=bf20e1fde476eafdc8d67c0cd7b9fe8bf3c063fe
1+
GH_TOKEN=6cf0ffff6219a7dd4746618c5594f124b1a42e63

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
[下载地址](https://github.com/Hunlongyu/ZY-Player/releases)
3232

3333
### 未完成:
34-
1. 主题: 暗黑主题
35-
2. 更新: 自动更新
36-
3. 图标: 求一个 zy 的logo, 256x256 像素的
34+
1. 更新: 手动检测更新
35+
2. 图标: 求一个 zy 的logo, 256x256 像素的
3736

3837
### 重要:
3938
所有资源来自网上, 该软件不参与任何制作, 上传, 储存, 下载等内容. 该软件仅供学习参考, 请于安装后24小时内删除.

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"name": "zy",
3-
"version": "0.7.18",
3+
"version": "0.7.19",
4+
"author": "Hunlongyu",
5+
"description": "ZY Player 资源播放器",
46
"private": true,
57
"scripts": {
68
"serve": "vue-cli-service serve",

‎src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export default Vue.extend({
8888
})
8989
</script>
9090
<style lang="scss">
91+
@import './assets/theme/global.scss';
9192
@import './assets/theme/dark.scss';
9293
@import './assets/theme/light.scss';
9394
*{

‎src/assets/image/dark.png

72.5 KB
Loading

‎src/assets/image/light.png

59.9 KB
Loading

‎src/assets/theme/dark.scss

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,48 @@
1-
@import './global.scss';
21
.theme-dark{
3-
color: var(--d-c);
2+
color: var(--d-c);
43
background-color: var(--d-bgc);
4+
.el-button, input, select, .el-select{
5+
color: var(--d-c);
6+
background-color: var(--d-bgc);
7+
border-color: var(--d-bdc);
8+
}
9+
.el-button--text{
10+
border: none;
11+
}
12+
.el-tabs__item, .el-tabs__nav-wrap::after{
13+
color: var(--d-c);
14+
background-color: var(--d-bgc);
15+
border-color: var(--d-dbc);
16+
}
17+
.el-table, .el-table th, .el-table tr,
18+
.el-table--striped .el-table__body tr.el-table__row--striped td,
19+
.el-table--enable-row-hover .el-table__body tr:hover>td,
20+
.el-table td, .el-table th.is-leaf{
21+
color: var(--d-c);
22+
background-color: var(--d-bgc);
23+
border-color: var(--d-dbc);
24+
}
25+
.el-pagination, .el-pagination .el-pagination__total, .el-pagination .el-pagination__jump,
26+
.el-pagination .btn-next, .el-pagination .btn-prev, .el-pager li{
27+
color: var(--d-c);
28+
background-color: var(--d-bgc);
29+
}
30+
.el-input__inner,
31+
.el-input-group__append, .el-input-group__prepend{
32+
background-color: var(--d-bgc);
33+
border-color: var(--d-dbc);
34+
}
35+
.el-select-dropdown{
36+
color: var(--d-c);
37+
background-color: var(--d-bgc) !important;
38+
border-color: var(--d-bdc) !important;
39+
}
40+
.el-drawer{
41+
overflow: auto;
42+
&::-webkit-scrollbar{
43+
width: 0px;
44+
}
45+
}
546
.Header, .Aside{
647
i{
748
color: var(--d-icon);
@@ -20,4 +61,45 @@
2061
}
2162
}
2263
}
64+
.Main{
65+
.film, .search, .star, .player{
66+
.table-box{
67+
&::-webkit-scrollbar-track {
68+
box-shadow: inset 0 0 6px var(--d-bdc);
69+
}
70+
&::-webkit-scrollbar-thumb {
71+
background-color: var(--d-icon);
72+
outline: 1px solid var(--d-icon);
73+
}
74+
}
75+
}
76+
.setting{
77+
.el-link, .card{
78+
color: var(--d-c);
79+
background-color: var(--d-bgc);
80+
border-color: var(--d-bdc);
81+
}
82+
}
83+
}
84+
.detail{
85+
color: var(--d-c);
86+
&::-webkit-scrollbar-track {
87+
box-shadow: inset 0 0 6px var(--d-bdc);
88+
}
89+
&::-webkit-scrollbar-thumb {
90+
background-color: var(--d-icon);
91+
outline: 1px solid var(--d-icon);
92+
}
93+
.box, .info, .urls{
94+
border: 1px solid var(--d-bdc);
95+
}
96+
.vodInfo{
97+
li, span, a{
98+
color: var(--d-c);
99+
}
100+
label{
101+
color: #f90;
102+
}
103+
}
104+
}
23105
}

‎src/assets/theme/global.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
--d-icon-h: #919191;
1616
--d-bgc: #242424;
1717
--d-bgc-h: #454545;
18-
--d-bdc: #dcdee2;
18+
--d-bdc: #7a7a7a;
1919
}

‎src/assets/theme/light.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import './global.scss';
21
.theme-light{
32
color: var(--l-c);
43
background-color: var(--l-bgc);

‎src/page/film.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
small
3333
layout="total, prev, pager, next, jumper"
3434
:current-page="filmPage"
35+
@current-change="pageChange"
3536
:page-size="50"
3637
:total="filmTotal">
3738
</el-pagination>
@@ -84,6 +85,7 @@ export default Vue.extend({
8485
methods: {
8586
...mapMutations(['SET_SITE', 'SET_DETAIL', 'SET_MAIN', 'SET_VIDEO']),
8687
tabClick (tab:any) {
88+
this.filmPage = 1
8789
this.getFilmList(this.site, this.filmPage, tab.name)
8890
},
8991
selectSite (e:any) {
@@ -92,6 +94,10 @@ export default Vue.extend({
9294
this.filmPage = 1
9395
this.getFilmList(e, 1, '0')
9496
},
97+
pageChange (e:number) {
98+
this.filmPage = e
99+
this.getFilmList(this.site, this.filmPage, this.tabs)
100+
},
95101
getFilmList (n: number = 0, p: number = 1, type: string = '0') {
96102
this.loading = true
97103
this.filmData = []

‎src/page/setting.vue

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,17 @@
2121
<span size="mini">Light</span>
2222
</el-card>
2323
<el-card shadow="hover" class="card">
24-
<img src="@/assets/image/light.png" class="image" @click="selectTheme('dark')">
24+
<img src="@/assets/image/dark.png" class="image" @click="selectTheme('dark')">
2525
<span size="mini">Dark</span>
2626
</el-card>
2727
</el-row>
2828
</el-row>
29+
<el-row class="item update">
30+
<el-row class="title"><i class="el-icon-refresh"></i><span>更新</span></el-row>
31+
<el-row class="btns">
32+
<el-button size="small" @click="checkUpdate">检查更新</el-button>
33+
</el-row>
34+
</el-row>
2935
<el-row class="item about">
3036
<el-row class="title"><i class="el-icon-view"></i><span>关于</span></el-row>
3137
<el-row class="info">
@@ -35,12 +41,6 @@
3541
</ul>
3642
</el-row>
3743
</el-row>
38-
<!-- <el-row class="item update">
39-
<el-row class="title"><i class="el-icon-refresh"></i><span>更新</span></el-row>
40-
<el-row class="btns">
41-
<el-button size="small">检查更新</el-button>
42-
</el-row>
43-
</el-row> -->
4444
</el-row>
4545
</template>
4646
<script lang="ts">
@@ -50,6 +50,7 @@ import { mapMutations } from 'vuex'
5050
import { shell } from 'electron'
5151
import site from '@/plugins/dexie/site'
5252
import theme from '@/plugins/dexie/theme'
53+
import fly from 'flyio'
5354
export default Vue.extend({
5455
name: 'setting',
5556
data () {
@@ -115,6 +116,13 @@ export default Vue.extend({
115116
}).catch(() => {
116117
this.$message.warning('切换主题失败~')
117118
})
119+
},
120+
checkUpdate () {
121+
fly.get('https://api.github.com/repos/Hunlongyu/ZY-Player/releases/latest').then(res => {
122+
console.log(res)
123+
}).catch(err => {
124+
console.log(err)
125+
})
118126
}
119127
},
120128
created () {

0 commit comments

Comments
 (0)