Commit Graph

896 Commits

Author SHA1 Message Date
d2a4a44eae Merge pull request 'xbx' (#205) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/205
2020-12-01 14:48:17 +08:00
2aad5872f6
dist 2020-12-01 14:46:55 +08:00
b3af49cd61
判断data 2020-12-01 14:43:08 +08:00
4c39553cc7 Merge pull request 'xbx' (#204) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/204
2020-12-01 10:55:02 +08:00
c5b57b62ba dist 2020-12-01 10:54:46 +08:00
e8750adb17 1 2020-12-01 10:51:15 +08:00
3f42651f63 1 2020-12-01 10:49:58 +08:00
4ce7a2f0b1 Merge pull request 'xbx' (#203) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/203
2020-12-01 10:04:46 +08:00
4bff5e896b 打包 2020-12-01 10:04:23 +08:00
dfebda1bb5 修复了样式 2020-12-01 10:02:18 +08:00
61720e9794 Merge pull request '1' (#202) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/202
2020-12-01 09:31:20 +08:00
495e52c302 1 2020-12-01 09:31:06 +08:00
e6e2e42786 Merge pull request '1' (#201) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/201
2020-12-01 09:28:54 +08:00
62f823d736 1 2020-12-01 09:28:36 +08:00
c9c3e6fbc8 Merge pull request 'xbx' (#200) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/200
2020-12-01 09:12:13 +08:00
b30352d1ea dist 2020-12-01 09:09:16 +08:00
d84e671823 请求接口 2020-12-01 09:07:42 +08:00
0d2e9a1618 Merge pull request 'xbx' (#199) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/199
2020-11-30 18:04:16 +08:00
ad7ed07706 请求接口 2020-11-30 18:03:59 +08:00
aa2bf1b858 kaishiqingqiu 2020-11-30 18:03:06 +08:00
30adeeffb0 Merge pull request '开始' (#198) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/198
2020-11-30 17:51:13 +08:00
fd4eb1488e 开始 2020-11-30 17:50:53 +08:00
91763dba1c Merge pull request 'xbx' (#197) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/197
2020-11-30 17:22:11 +08:00
e132e7bcaf 1 2020-11-30 17:21:35 +08:00
e82d95fb09 yuyan 2020-11-30 17:19:22 +08:00
69b938fc29 xiufu 2020-11-30 17:13:37 +08:00
11d06e1114 Merge pull request 'luzhi' (#195) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/195
2020-11-30 16:31:32 +08:00
66279db25d 1 2020-11-30 16:31:05 +08:00
bde66631fc jieshu 2020-11-30 16:22:04 +08:00
6750d3358c luzhi 2020-11-30 16:21:41 +08:00
5a26cc74bf Merge pull request '修改央视' (#194) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/194
2020-11-30 16:07:48 +08:00
971c18a025 1 2020-11-30 16:07:35 +08:00
44fba7a7c8 修改央视 2020-11-30 16:05:19 +08:00
d1b20ae6fc Merge pull request '1' (#193) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/193
2020-11-30 16:00:29 +08:00
64fcf2b4ed 1 2020-11-30 16:00:13 +08:00
9293bcac32 Merge pull request 'xbx' (#192) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/192
2020-11-30 15:57:30 +08:00
b369d56d95 dist 2020-11-30 15:57:09 +08:00
11e4293c39 关闭跳转 2020-11-30 15:53:59 +08:00
f0c50ea434 Merge pull request 'dist' (#191) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/191
2020-11-30 15:51:54 +08:00
61e2402a64 dist 2020-11-30 15:51:39 +08:00
25f7a99ed7 Merge pull request '直播结束' (#190) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/190
2020-11-30 15:49:55 +08:00
d6565eee44 直播结束 2020-11-30 15:49:37 +08:00
13f5407a63 Merge pull request '关闭直播' (#189) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/189
2020-11-30 15:46:39 +08:00
96fe144797 结束 2020-11-30 15:46:27 +08:00
21677f914b 关闭直播 2020-11-30 15:45:50 +08:00
2e90ce03a6 Merge pull request '修复' (#188) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/188
2020-11-30 15:19:26 +08:00
95a3579e82 修复 2020-11-30 15:19:09 +08:00
ccd6541de4 Merge pull request 'xbx' (#187) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/187
2020-11-30 14:45:06 +08:00
a631a97651 跳转 2020-11-30 14:44:52 +08:00
d3255e8425 跳转页面 2020-11-30 14:43:35 +08:00