|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
efde545104
|
Merge pull request '更换图片' (#41) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/41
|
2020-08-12 11:34:02 +08:00 |
|
|
|
b1e5b24319
|
更换图片
|
2020-08-12 11:31:57 +08:00 |
|
|
|
2ea72995a9
|
Merge pull request 'fixed bug' (#40) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/40
|
2020-08-11 20:39:12 +08:00 |
|
cmxdd
|
26c2e044dc
|
fixed bug
|
2020-08-11 20:37:54 +08:00 |
|
|
|
5500dc9f73
|
Merge pull request 'xbx' (#39) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/39
|
2020-08-11 18:28:33 +08:00 |
|
|
|
d97b749a0a
|
文本
|
2020-08-11 18:27:31 +08:00 |
|
|
|
cf76518bc9
|
time
|
2020-08-11 14:31:45 +08:00 |
|
|
|
8d7e4b2ce4
|
消息
|
2020-08-11 11:25:44 +08:00 |
|
|
|
7bfce17816
|
Merge pull request 'fixed bug adout publish shop' (#38) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/38
|
2020-08-11 09:41:52 +08:00 |
|
cmxdd
|
7cf5577cb0
|
fixed bug adout publish shop
|
2020-08-11 09:41:12 +08:00 |
|
|
|
e33e07178d
|
Merge pull request 'cmx' (#37) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/37
|
2020-08-10 20:26:57 +08:00 |
|
cmxdd
|
9fac4e8a2e
|
fixed bug adout shop
|
2020-08-10 20:24:58 +08:00 |
|
cmxdd
|
e223fd5ff9
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx
|
2020-08-10 19:06:34 +08:00 |
|
|
|
d7c6625416
|
Merge pull request 'GDPAO' (#36) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/36
|
2020-08-10 19:04:54 +08:00 |
|
Gdpao
|
0a8f2f815d
|
GDPAO
|
2020-08-10 19:03:44 +08:00 |
|
|
|
42a08e07ba
|
Merge pull request '防止多次点击' (#35) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/35
|
2020-08-10 17:38:51 +08:00 |
|
|
|
4e350f4dd0
|
Merge branch 'master' into xbx
|
2020-08-10 17:38:46 +08:00 |
|
|
|
e946b98abf
|
防止多次点击
|
2020-08-10 17:31:56 +08:00 |
|
cmxdd
|
2759972de6
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx
|
2020-08-10 16:55:34 +08:00 |
|
