Commit Graph

100 Commits

Author SHA1 Message Date
0b5892cfbd
返回提示 2020-08-14 09:35:56 +08:00
36080fd730
图片上传 2020-08-14 08:48:40 +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
cmxdd
a0e780d05b update adout color of tag 2020-08-10 10:01:10 +08:00
cmxdd
0b5fa511bf update adout tag color 2020-08-10 09:56:01 +08:00
55695f164b
meiyan 2020-08-09 18:36:37 +08:00
0279128637
解决了不出现的问题 2020-08-08 18:34:43 +08:00
427442f50a
关闭 2020-08-08 17:28:34 +08:00
641cb4a4a2
选中颜色 2020-08-08 16:53:44 +08:00
78d60bd9ac
消息提示 2020-08-08 16:32:37 +08:00
217e8b51ed
临时测试 2020-08-08 15:17:36 +08:00
74a9778a62
最初版本 合并 2020-08-08 15:09:56 +08:00
ceb2b8084d
聊天完成 2020-08-07 16:55:00 +08:00
4453742f3c
删除聊天搜索 2020-08-07 15:07:45 +08:00
93c412a515
聊天完成 2020-08-07 14:44:11 +08:00
cmxdd
71a25fd11d fixed bug 2020-08-06 17:02:11 +08:00
cmxdd
6ec2318d0c update photo adout publish 2020-08-06 14:40:11 +08:00
cmxdd
04a4ed523f update bug 2020-08-06 11:48:45 +08:00
cmxdd
e67e2fe701 update code adout order 2020-08-06 10:04:38 +08:00
cmxdd
80e3a721a1 formatted style 2020-08-05 20:10:55 +08:00
cmxdd
31474f482f update api 2020-08-05 20:03:53 +08:00
cmxdd
df1bad0a31 update other api 2020-08-05 17:42:06 +08:00
cmx
e9f0b1ba78 Merge pull request 'cmx' (#19) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/19
2020-08-05 09:16:07 +08:00