Commit Graph

120 Commits

Author SHA1 Message Date
4f7fc23c23
达人链接聊天室 2020-08-17 08:57:44 +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
Gdpao
3e7165ef19 gdpao 2020-08-14 20:50:23 +08:00
Gdpao
2bf46d983a gdpaoup 2020-08-14 20:48:14 +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
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
Gdpao
150c3337e4 gdpao 2020-08-14 08:26:50 +08:00
0b0ac462a7
直播人数 2020-08-13 16:24:55 +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
192bd462d4
修改了图片 2020-08-12 15:01:25 +08:00
b1e5b24319
更换图片 2020-08-12 11:31:57 +08:00
cmx
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
d97b749a0a
文本 2020-08-11 18:27:31 +08:00
8d7e4b2ce4
消息 2020-08-11 11:25:44 +08:00
cmxdd
7cf5577cb0 fixed bug adout publish shop 2020-08-11 09:41:12 +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
gyh
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
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
a318ea9f84
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-08-10 16:47:52 +08:00
3eaee9009a
聊天 2020-08-10 16:47:27 +08:00
cmxdd
2ab2d1c38e fixed bug 2020-08-10 15:55:21 +08:00
gyh
d8840edb30 Merge pull request 'gdpao' (#33) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/33
2020-08-10 14:48:10 +08:00
Gdpao
1d98624753 gdpao 2020-08-10 14:47:20 +08:00
cmxdd
a9d4708d2c fixe bug about image 2020-08-10 12:04:09 +08:00
cmxdd
64da585bd7 add login out 2020-08-10 11:31:03 +08:00
cmxdd
959afc776a fixed bg adout login 2020-08-10 11:27:06 +08:00
cmxdd
de2b7fe26d uopdate about conflict 2020-08-10 10:24:36 +08:00