Commit Graph

333 Commits

Author SHA1 Message Date
f7da2d452c Merge pull request '添加了直播' (#77) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/77
2020-09-01 11:38:42 +08:00
e91b35d1e3
添加了直播 2020-09-01 11:38:18 +08:00
gyh
115400353f Merge pull request 'gdpao' (#76) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/76
2020-09-01 09:19:14 +08:00
Gdpao
dd5a59cccb gdpao 2020-09-01 08:46:33 +08:00
c9b9dc1610 Merge pull request 'xbx' (#75) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/75
2020-08-29 00:14:35 +08:00
a6328358e2
修复了登录跳转 2020-08-28 15:54:36 +08:00
7c839816d4
删除了平台达人的购物袋 2020-08-28 15:48:12 +08:00
13524dcefc
更换图标 2020-08-28 15:18:40 +08:00
784cd1ec89
添加了图标 2020-08-28 15:17:29 +08:00
aac975e921
消息完成 2020-08-28 15:04:32 +08:00
1305931e3b
通知和提示 2020-08-28 14:51:35 +08:00
gyh
0562cfd830 Merge pull request 'gdpao' (#74) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/74
2020-08-28 14:18:37 +08:00
Gdpao
14b0d68ce4 gdpao 2020-08-28 14:17:51 +08:00
40e252c400
通知页面 2020-08-27 16:02:27 +08:00
5dd01ffa93 Merge pull request 'xbx' (#73) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/73
2020-08-27 14:04:24 +08:00
gyh
06bbd3d600 Merge pull request 'gdpao' (#72) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/72
2020-08-27 11:29:14 +08:00
Gdpao
3097bf8b91 gdpao 2020-08-27 11:28:17 +08:00
c5305c5a72
添加了铃声 2020-08-27 11:01:26 +08:00
4e02daa854
t添加了提示和直播 2020-08-27 09:52:43 +08:00
gyh
022192c9d6 Merge pull request 'gdpao' (#71) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/71
2020-08-25 11:13:35 +08:00
Gdpao
94c22fdef1 gdpao 2020-08-25 11:12:33 +08:00
gyh
8ce148950a Merge pull request 'gdpao' (#70) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/70
2020-08-24 15:49:30 +08:00
Gdpao
e58a1a6ef6 gdpao 2020-08-24 15:48:54 +08:00
6d4c9dc5a4 Merge pull request '添加了退出登录' (#69) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/69
2020-08-22 16:59:04 +08:00
9361f5bffe
添加了退出登录 2020-08-22 16:58:18 +08:00
gyh
3fe8f15aad Merge pull request 'gdpao' (#68) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/68
2020-08-20 15:34:59 +08:00
Gdpao
84c02f90f7 gdpao 2020-08-20 15:34:04 +08:00
93dfeaa36d Merge pull request '关闭按钮' (#67) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/67
2020-08-20 11:07:11 +08:00
fc4c187702 Merge branch 'master' into xbx 2020-08-20 11:06:58 +08:00
84240fedb8
关闭按钮 2020-08-20 11:05:24 +08:00
gyh
4c3808d2ff Merge pull request 'gdpao' (#66) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/66
2020-08-19 19:27:26 +08:00
Gdpao
32d23e4bb0 gdpao 2020-08-19 19:26:54 +08:00
gyh
380bd7dc9c Merge pull request 'gdpao' (#65) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/65
2020-08-18 15:59:42 +08:00
Gdpao
b35222853d gdpao 2020-08-18 15:58:57 +08:00
e07c2288dc Merge pull request '修复了提交' (#64) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/64
2020-08-18 15:56:34 +08:00
2f4e938a2b
修复了提交 2020-08-18 15:56:10 +08:00
baf39b01e2 Merge pull request '域名' (#63) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/63
2020-08-18 15:31:33 +08:00
79990e56d2
域名 2020-08-18 15:31:03 +08:00
19187b67fc Merge pull request 'paixu' (#62) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/62
2020-08-18 15:27:14 +08:00
5fd62e4010
paixu 2020-08-18 15:26:20 +08:00
22bc2a4b89 Merge pull request '替换域名' (#61) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/61
2020-08-18 15:20:10 +08:00
7090635886
替换域名 2020-08-18 15:19:29 +08:00
87c321be99 Merge pull request '达人链接聊天室' (#60) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/60
2020-08-17 08:59:20 +08:00
4f7fc23c23
达人链接聊天室 2020-08-17 08:57:44 +08:00
gyh
3641264d19 Merge pull request 'gyh' (#59) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/59
2020-08-17 08:48:45 +08:00
Gdpao
cf7d689ce0 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into gyh 2020-08-15 19:11:56 +08:00
gyh
1cc6fc56d1 Merge pull request 'gdpao' (#58) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/58
2020-08-15 19:11:25 +08:00
Gdpao
d1aaa525ed Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into gyh 2020-08-15 19:09:29 +08:00
Gdpao
8ff58e1a31 gdpao 2020-08-15 19:09:02 +08:00
b1c7f612f1 Merge pull request '删除验证' (#57) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/57
2020-08-15 19:08:05 +08:00