|
|
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 |
|
Gdpao
|
3097bf8b91
|
gdpao
|
2020-08-27 11:28:17 +08:00 |
|
|
|
4e02daa854
|
t添加了提示和直播
|
2020-08-27 09:52:43 +08:00 |
|
Gdpao
|
94c22fdef1
|
gdpao
|
2020-08-25 11:12:33 +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 |
|
|
|
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 |
|
|
|
fc4c187702
|
Merge branch 'master' into xbx
|
2020-08-20 11:06:58 +08:00 |
|
|
|
84240fedb8
|
关闭按钮
|
2020-08-20 11:05:24 +08:00 |
|
Gdpao
|
32d23e4bb0
|
gdpao
|
2020-08-19 19:26:54 +08:00 |
|
|
|
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 |
|
|
|
2f4e938a2b
|
修复了提交
|
2020-08-18 15:56:10 +08:00 |
|
|
|
79990e56d2
|
域名
|
2020-08-18 15:31:03 +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 |
|
|
|
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
|
8ff58e1a31
|
gdpao
|
2020-08-15 19:09:02 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
cmxdd
|
61756ac875
|
update publish
|
2020-08-05 09:15:02 +08:00 |
|
|
|
2d7ed292c0
|
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
|
2020-08-03 17:43:01 +08:00 |
|
|
|
30451e2767
|
宽度
|
2020-08-03 17:42:58 +08:00 |
|
|
|
59df1ed10f
|
Merge branch 'master' into xbx
|
2020-08-03 16:50:56 +08:00 |
|
|
|
385653d391
|
直播
|
2020-08-03 16:47:46 +08:00 |
|
cmxdd
|
3e45c9350a
|
图文视频发布，文章选择删除逻辑没有处理完，需要继续处理
|
2020-07-31 10:14:46 +08:00 |
|
|
|
f6e4562ce2
|
Merge pull request 'cmx' (#15) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/15
|
2020-07-30 19:52:16 +08:00 |
|
cmxdd
|
22ea59f5c5
|
update about api
|
2020-07-30 19:49:12 +08:00 |
|
|
|
5520e7ab7c
|
添加进度条
|
2020-07-30 15:55:16 +08:00 |
|
|
|
1d9edefd7f
|
直播完成
|
2020-07-30 15:54:32 +08:00 |
|
