theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
306 Commits 8 Branches 0 Tags
Commit Graph

306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luyuan
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
luyuan
1f54899b66
透明图标 2020-08-13 12:10:21 +08:00
luyuan
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
luyuan
3c44ad2811
修改了语音的样式 2020-08-13 12:00:44 +08:00
luyuan
186f1cdb27
语音样式 2020-08-13 11:58:06 +08:00
luyuan
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
luyuan
e4f917a9cf
关闭直播页面 2020-08-13 11:36:47 +08:00
luyuan
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
luyuan
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
luyuan
f58cc207c4 Merge branch 'master' into xbx 2020-08-12 15:02:41 +08:00
luyuan
192bd462d4
修改了图片 2020-08-12 15:01:25 +08:00
luyuan
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
luyuan
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
luyuan
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
luyuan
d97b749a0a
文本 2020-08-11 18:27:31 +08:00
luyuan
cf76518bc9
time 2020-08-11 14:31:45 +08:00
luyuan
8d7e4b2ce4
消息 2020-08-11 11:25:44 +08:00
cmx
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
cmx
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
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
luyuan
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
luyuan
4e350f4dd0 Merge branch 'master' into xbx 2020-08-10 17:38:46 +08:00
luyuan
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
luyuan
bee3ab9fba Merge pull request 'xbx' (#34) from xbx into master 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/34
 2020-08-10 16:48:34 +08:00
luyuan
a318ea9f84
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-08-10 16:47:52 +08:00
luyuan
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
luyuan
75a4bbedbe
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-08-10 14:45:35 +08:00
cmx
d4a9b38f99 Merge pull request 'cmx' (#32) from cmx into master 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/32
 2020-08-10 12:08:34 +08:00
cmxdd
3b9e429c80 Merge branch 'cmx' of http://git.luyuan.tk/luyuan/demingshangjia into cmx 2020-08-10 12:07:30 +08:00
cmxdd
a9d4708d2c fixe bug about image 2020-08-10 12:04:09 +08:00
cmx
7206d00afc Merge pull request 'master' (#31) from master into cmx 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/31
 2020-08-10 11:32:18 +08:00
cmx
798f499263 Merge pull request 'cmx' (#30) from cmx into master 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/30
 2020-08-10 11:31:51 +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
luyuan
f89803cf9b
消息 2020-08-10 10:41:20 +08:00
cmx
795726bdb8 Merge pull request 'cmx' (#29) from cmx into master 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/29
 2020-08-10 10:25:18 +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