Commit Graph

475 Commits

Author SHA1 Message Date
asd
0cc2fb5677 提现+视频管理 2020-10-19 15:59:19 +08:00
8c6ab14103
i18n引入 2020-10-19 15:24:55 +08:00
448a305abe
添加了i18n 2020-10-19 15:06:08 +08:00
ec234fe4f8
修改了提示语 2020-10-19 09:10:38 +08:00
13258c990c
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-19 08:59:37 +08:00
c3e33c70b5
修正了分页 2020-10-19 08:59:04 +08:00
asd
063975a818 万恶的语言哦 2020-10-17 17:31:25 +08:00
ce3104abce
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 19:35:29 +08:00
asd
41009afeec 个人档案修改 2020-10-16 19:12:57 +08:00
2dc82c8000
月日历完成 2020-10-16 16:22:21 +08:00
b9f4d755a0
分页 2020-10-16 14:52:21 +08:00
1a9dd0ba50
日历接口调整 2020-10-16 14:47:35 +08:00
b5cbd71a56
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:33:26 +08:00
asd
3f1085f664 订阅者 2020-10-16 14:31:39 +08:00
007cf5a9c7
直播切换 2020-10-16 14:31:32 +08:00
758f85facf
直播学生 2020-10-16 10:47:05 +08:00
eef4917466
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 09:35:44 +08:00
bfcf22b479
直播一部分 2020-10-16 09:34:55 +08:00
ad1c54fdc9
日历修改 2020-10-16 08:59:17 +08:00
asd
9a6eeff200 钱包 获取成功id 2020-10-15 20:12:21 +08:00
7bf5fc86de
添加跳转日历 2020-10-15 19:33:11 +08:00
79a5882601
替换了4个空格缩进 2020-10-15 19:23:34 +08:00
6102fda7de
一部分接口 2020-10-15 19:06:30 +08:00
9c0e6ffd39
发布视频 2020-10-15 16:17:39 +08:00
asd
4824480b5b Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-15 15:45:23 +08:00
asd
19cd11b0dc 钱包 2020-10-15 15:44:50 +08:00
73f0232af1
修改了手机号 2020-10-15 15:43:55 +08:00
b1649cf566
直播修改 2020-10-15 15:34:14 +08:00
6111abafc4
直播 2020-10-15 14:51:34 +08:00
c240c7aba3
添加了put方法 2020-10-15 09:21:00 +08:00
6bf0fbc16f
video样式 2020-10-15 09:14:23 +08:00
7a821adee5
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-14 18:55:57 +08:00
ffe57d9938
上传文件 2020-10-14 18:55:15 +08:00
asd
a341593ba6 fin 2020-10-14 18:52:50 +08:00
asd
edc7242f3f Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 16:27:46 +08:00
asd
f9066bcdf1 视频详情 2020-10-14 16:27:24 +08:00
b41672ce8b
出现tokne自动切登录 2020-10-14 16:21:40 +08:00
5832f7a0bc
删除 2020-10-14 15:36:13 +08:00
5fb97c7c78 Merge pull request '添加del方法' (#42) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/42
2020-10-14 15:34:10 +08:00
4b095a853c
添加del方法 2020-10-14 15:33:46 +08:00
asd
240b0e068a Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 15:31:24 +08:00
asd
9dbaebfff2 视频列表 2020-10-14 15:30:29 +08:00
34beff1594
个人信息回显 2020-10-14 15:30:09 +08:00
83ffc8cc83
下拉菜单样式 2020-10-14 11:12:03 +08:00
fb9ca6f040
注册 短信发送失败 2020-10-14 10:25:49 +08:00
5e4db83a24
帐号退出 2020-10-14 09:32:12 +08:00
9fa44512e4 Merge pull request 'ceshi' (#38) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/38
2020-10-14 09:13:30 +08:00
f446297dca
添加日历返回 2020-10-14 09:10:40 +08:00
asd
3d7070b8d7 直播管理 2020-10-14 08:57:57 +08:00
51f0be0fec
日历样式完成 2020-10-13 16:44:32 +08:00
651fb0f692
ceshi 2020-10-13 11:51:32 +08:00
033ef6867a
添加了属性 2020-10-13 11:03:35 +08:00
84f5841176
升级了部分依赖 安装了新的包 2020-10-13 09:30:06 +08:00
5430f133ba Merge pull request 'xbx' (#35) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/35
2020-10-13 09:15:43 +08:00
9e2122a466
日历深色当天 2020-10-13 09:15:08 +08:00
asd
3dca24773b 分享和乱七八糟的东西 2020-10-12 17:27:05 +08:00
bbe9e3bcc2
日历完成 2020-10-12 16:44:22 +08:00
4683d8882d
日历 2020-10-12 16:15:31 +08:00
3f8c8c302b
添加了部分接口 2020-10-12 10:50:58 +08:00
a7ca08ec34
删除安全验证 2020-10-12 09:55:28 +08:00
asd
be094d44f4 直播返修 2020-10-10 15:31:18 +08:00
3755425b0e
直播路由 2020-10-10 14:34:23 +08:00
96e9284abb Merge pull request 'xbx' (#29) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/29
2020-10-10 14:08:45 +08:00
asd
8469167824 Merge pull request 'ujok' (#28) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/28
2020-10-10 14:05:18 +08:00
4e6f197a16
xiuga 2020-10-10 14:04:19 +08:00
c790a34cbe
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-10 11:36:52 +08:00
asd
9bd5ceb10f ujok 2020-10-10 11:33:21 +08:00
32361d6629
我的档案查看完成 2020-10-10 10:57:00 +08:00
a67333be23
修改了api集中化 搞定了vuex 2020-10-10 10:19:38 +08:00
asd
b63fa6d363 Merge pull request 'zj' (#27) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/27
2020-10-10 09:04:31 +08:00
asd
598b1f8112 直播列表 2020-10-10 09:01:16 +08:00
8bf7b662d5
接口请求 2020-10-10 08:59:54 +08:00
fb6a526aee
首页登录完成 2020-10-09 16:04:20 +08:00
e9a37efe02
登录接口 2020-10-09 14:31:10 +08:00
2a1e290d12
添加了引入图片 2020-10-09 11:33:49 +08:00
b58d0638c4
添加了类型声明文件 2020-10-09 10:53:07 +08:00
9237c995b5
添加了类型文件 2020-10-09 10:49:24 +08:00
975821021d
更换了deep 2020-10-09 10:36:04 +08:00
645001f128
调用了接口 2020-10-09 09:45:13 +08:00
1d0b8f2043
解决了所有警告 2020-10-05 16:47:36 +08:00
a817bc2891
替换了deep 2020-10-05 16:37:13 +08:00
ba3ded3be1
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-05 16:31:16 +08:00
75ab941063
添加了部分路由 2020-10-05 16:31:06 +08:00
68c9dfbb9e Merge pull request '直播资格' (#22) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/22
2020-09-30 11:35:06 +08:00
cd86143d43 直播资格 2020-09-30 11:34:27 +08:00
f4af1db7a5
添加导航 2020-09-29 18:58:51 +08:00
9c1f5b965b Merge pull request '对话框' (#21) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/21
2020-09-29 17:46:40 +08:00
fc101307e3 对话框 2020-09-29 17:45:45 +08:00
asd
0ded7c7e31 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-29 16:51:56 +08:00
asd
db2eec98a0 我的钱包 关于 列表 2020-09-29 16:51:42 +08:00
6626ab779a
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-09-29 15:59:45 +08:00
6b1eb02e9b
视频详情 2020-09-29 15:56:33 +08:00
0432653cd3
一部分 2020-09-29 09:26:52 +08:00
5e2a70b1ad 完善表单样式 2020-09-28 16:42:50 +08:00
3d6b421860
视频详情 2020-09-28 14:22:58 +08:00
asd
8bf0188105 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-27 17:26:10 +08:00
asd
51705dd628 登录注册+重置一半 2020-09-27 17:24:10 +08:00
6259449b89 处理冲突 2020-09-27 17:07:13 +08:00
35ed45d7f5 发布直播 上传视频页面 2020-09-27 17:04:00 +08:00
asd
6575f0f4c0 注册 2020-09-27 16:29:53 +08:00
asd
3938d40a8a 登录 2020-09-27 10:58:47 +08:00
asd
92d255683c Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-27 10:56:38 +08:00
asd
b75843988c Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-27 10:49:44 +08:00
84e8a037b3
Merge branch 'zhy' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-09-27 10:40:26 +08:00
39cafb7bb6 select定位 2020-09-27 10:39:14 +08:00
c81668f397
rem 2020-09-27 10:37:36 +08:00
de899aebc8
router 2020-09-27 08:58:04 +08:00
6f13780802 Merge pull request '下导航' (#12) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/12
2020-09-25 17:31:07 +08:00
6533e7bbf2 下导航 2020-09-25 17:30:07 +08:00
5bf4b36049
修复了滚动条 2020-09-25 16:54:03 +08:00
ec13ae4a4e
更改大写 2020-09-25 16:35:32 +08:00
d8e89c92f9
修复首页 2020-09-25 16:34:20 +08:00
a06e7134dc
Merge branch 'zhy' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-09-25 16:28:36 +08:00
10a0917cdc
修改路由 2020-09-25 16:27:33 +08:00
9ee0987df6 我的档案 2020-09-25 16:26:33 +08:00
011fa5337c
顶部样式完成 2020-09-25 15:46:03 +08:00
asd
84e6700dfc 登录页 2020-09-25 15:23:51 +08:00
6502d6e46e
左侧menu完成 2020-09-25 15:13:39 +08:00
e8145e14ff
推送 2020-09-25 09:41:49 +08:00
c3d715db7a
添加了sass 2020-09-24 16:46:59 +08:00
04c520dc6c
模拟注释 2020-09-24 15:46:08 +08:00
ed42b204d7
添加了拦截器 2020-09-24 15:33:12 +08:00
4fbf1353da
添加axios 添加全局配置 2020-09-24 11:21:42 +08:00
4f571bfc47
添加了axios和组建库 2020-09-24 11:12:18 +08:00
da2254c18e
init 2020-09-24 10:26:22 +08:00