Commit Graph

260 Commits

Author SHA1 Message Date
e173f3c2a8
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-10 10:05:14 +08:00
d0107c5729
临时修复了提示 2020-09-10 10:05:04 +08:00
b2d7ae4ec5
临时修复了提示 2020-09-10 09:27:12 +08:00
0f85f77520
添加了一个输出 2020-09-05 12:18:05 +08:00
23916ea7fa
解决了划走之后的问题 2020-09-05 12:09:57 +08:00
gyh
539309b370 Merge pull request 'GDPAO' (#87) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/87
2020-09-04 19:53:27 +08:00
Gdpao
0824d97080 GDPAO 2020-09-04 19:52:43 +08:00
b98baa39aa Merge pull request '文案' (#86) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/86
2020-09-03 18:08:38 +08:00
0619bbd901
文案 2020-09-03 18:08:10 +08:00
60cb9294fc Merge pull request '添加了强制重新渲染' (#85) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/85
2020-09-03 11:45:18 +08:00
cd89acf38c
添加了强制重新渲染 2020-09-03 11:44:16 +08:00
gyh
c4114bcfc5 Merge pull request 'gdpao' (#84) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/84
2020-09-03 10:27:40 +08:00
Gdpao
f2e3427260 gdpao 2020-09-03 10:26:55 +08:00
gyh
dbf18d4091 Merge pull request 'gdpao' (#83) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/83
2020-09-02 14:52:12 +08:00
Gdpao
7d066ca67d gdpao 2020-09-02 14:05:08 +08:00
gyh
22901579b9 Merge pull request 'gdpao' (#82) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/82
2020-09-01 20:36:06 +08:00
Gdpao
3ecaac3190 gdpaomg 2020-09-01 20:35:48 +08:00
Gdpao
c5b3505dcd gdpao 2020-09-01 20:32:15 +08:00
b9eceb6ecf Merge pull request '添加了购买人数' (#81) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/81
2020-09-01 17:33:52 +08:00
2bdd8e2b7f
添加了购买人数 2020-09-01 16:59:55 +08:00
5017534a24 Merge pull request '字体换行' (#80) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/80
2020-09-01 16:55:45 +08:00
f9f6bba08b
字体换行 2020-09-01 16:53:49 +08:00
2f103eafbe Merge pull request '修改了大小写' (#79) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/79
2020-09-01 16:15:23 +08:00
64824a8fb7
修改了大小写 2020-09-01 16:15:09 +08:00
721087e372 Merge pull request '添加活动消息' (#78) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/78
2020-09-01 16:07:09 +08:00
164b7f8e4c
Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx 2020-09-01 16:06:27 +08:00
a80c2e53b8
添加活动消息 2020-09-01 16:05:34 +08:00
f7da2d452c Merge pull request '添加了直播' (#77) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/77
2020-09-01 11:38:42 +08:00
e91b35d1e3
添加了直播 2020-09-01 11:38:18 +08:00
gyh
115400353f Merge pull request 'gdpao' (#76) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/76
2020-09-01 09:19:14 +08:00
Gdpao
dd5a59cccb gdpao 2020-09-01 08:46:33 +08:00
c9b9dc1610 Merge pull request 'xbx' (#75) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/75
2020-08-29 00:14:35 +08:00
a6328358e2
修复了登录跳转 2020-08-28 15:54:36 +08:00
7c839816d4
删除了平台达人的购物袋 2020-08-28 15:48:12 +08:00
13524dcefc
更换图标 2020-08-28 15:18:40 +08:00
784cd1ec89
添加了图标 2020-08-28 15:17:29 +08:00
aac975e921
消息完成 2020-08-28 15:04:32 +08:00
1305931e3b
通知和提示 2020-08-28 14:51:35 +08:00
gyh
0562cfd830 Merge pull request 'gdpao' (#74) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/74
2020-08-28 14:18:37 +08:00
Gdpao
14b0d68ce4 gdpao 2020-08-28 14:17:51 +08:00
40e252c400
通知页面 2020-08-27 16:02:27 +08:00
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
gyh
06bbd3d600 Merge pull request 'gdpao' (#72) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/72
2020-08-27 11:29:14 +08:00
Gdpao
3097bf8b91 gdpao 2020-08-27 11:28:17 +08:00
c5305c5a72
添加了铃声 2020-08-27 11:01:26 +08:00
4e02daa854
t添加了提示和直播 2020-08-27 09:52:43 +08:00
gyh
022192c9d6 Merge pull request 'gdpao' (#71) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/71
2020-08-25 11:13:35 +08:00
Gdpao
94c22fdef1 gdpao 2020-08-25 11:12:33 +08:00
gyh
8ce148950a Merge pull request 'gdpao' (#70) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/70
2020-08-24 15:49:30 +08:00
Gdpao
e58a1a6ef6 gdpao 2020-08-24 15:48:54 +08:00