Commit Graph

293 Commits

Author SHA1 Message Date
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
4bf837d53e
删除验证 2020-08-15 17:52:55 +08:00
5fc375e589 Merge pull request '添加空提示' (#56) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/56
2020-08-15 16:06:47 +08:00
3d04824b83
添加空提示 2020-08-15 16:06:20 +08:00
960f0453ec Merge pull request 'xbx' (#55) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/55
2020-08-15 15:58:53 +08:00
1cc3f289fe
添加了梦层 2020-08-15 15:58:26 +08:00
3884f93ad8
修复了商家名字 2020-08-15 13:33:58 +08:00
gyh
e759f15852 Merge pull request 'gdpaoup' (#54) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/54
2020-08-14 20:50:35 +08:00
Gdpao
3e7165ef19 gdpao 2020-08-14 20:50:23 +08:00
Gdpao
2bf46d983a gdpaoup 2020-08-14 20:48:14 +08:00
fd78ec19db Merge pull request 'xbx' (#53) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/53
2020-08-14 17:11:41 +08:00
f57ebac022
修复了不刷新 2020-08-14 17:11:17 +08:00
8276bf358f
信息 2020-08-14 17:09:31 +08:00
67edac985e
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-08-14 14:51:16 +08:00
74b10f4620
直播人数 2020-08-14 14:38:43 +08:00
gyh
12d095dc05 Merge pull request 'gdpaoup' (#52) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/52
2020-08-14 12:18:34 +08:00
Gdpao
c9c714d4e3 gdpaoup 2020-08-14 12:17:28 +08:00
17e336f0fc Merge pull request '修正了' (#51) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/51
2020-08-14 11:08:04 +08:00
bfa4ed6edb
修正了 2020-08-14 11:07:09 +08:00
0e33599174 Merge pull request 'xbx' (#50) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/50
2020-08-14 09:41:26 +08:00
7755f54f07
返回 2020-08-14 09:40:54 +08:00
0b5892cfbd
返回提示 2020-08-14 09:35:56 +08:00
ff4c3982ba Merge pull request '图片上传' (#49) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/49
2020-08-14 08:49:15 +08:00
36080fd730
图片上传 2020-08-14 08:48:40 +08:00
gyh
81ec6586e3 Merge pull request 'gdpao' (#48) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/48
2020-08-14 08:28:18 +08:00
Gdpao
150c3337e4 gdpao 2020-08-14 08:26:50 +08:00
fbdd3f20b4 Merge pull request '直播人数' (#47) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/47
2020-08-13 16:25:21 +08:00
0b0ac462a7
直播人数 2020-08-13 16:24:55 +08:00
7c16e8c190 Merge pull request '透明图标' (#46) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/46
2020-08-13 12:10:49 +08:00
1f54899b66
透明图标 2020-08-13 12:10:21 +08:00
7e37f71d56 Merge pull request 'xbx' (#45) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/45
2020-08-13 12:01:13 +08:00
3c44ad2811
修改了语音的样式 2020-08-13 12:00:44 +08:00
186f1cdb27
语音样式 2020-08-13 11:58:06 +08:00
209cb7d9fb Merge pull request 'xbx' (#44) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/44
2020-08-13 11:37:40 +08:00
e4f917a9cf
关闭直播页面 2020-08-13 11:36:47 +08:00
06092fb183
直播热度与按钮修改 2020-08-13 11:32:40 +08:00
cmx
252e4b7deb Merge pull request 'update adout upload adout tencentCOS' (#43) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/43
2020-08-12 15:18:55 +08:00
cmxdd
9baac8ef63 update adout upload adout tencentCOS 2020-08-12 15:17:48 +08:00
5b2745051e Merge pull request '修改了图片' (#42) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/42
2020-08-12 15:02:46 +08:00
f58cc207c4 Merge branch 'master' into xbx 2020-08-12 15:02:41 +08:00
192bd462d4
修改了图片 2020-08-12 15:01:25 +08:00