Commit Graph

273 Commits

Author SHA1 Message Date
9872770472
Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:03 +08:00
7a7b126fe3
聊天 2020-08-06 10:40:26 +08:00
Niujiawei
1313a90d5e 修改样式 2020-08-05 22:44:08 +08:00
Niujiawei
361e9a76fd 修改样式等相关文件 2020-08-05 21:39:02 +08:00
Gdpao
1b5bf33166 gdpaomg 2020-08-05 21:11:32 +08:00
Gdpao
c4c11781fb gdpaoup 2020-08-05 21:06:29 +08:00
e1519b8d68 Merge pull request 'store 8.5' (#119) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/119
2020-08-05 17:40:03 +08:00
0057bcd28e store 8.5 2020-08-05 17:38:11 +08:00
b0f224d79b
聊天列表 2020-08-05 17:00:04 +08:00
045f6e6e01
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-05 10:47:18 +08:00
09a7dbdf5c
1 2020-08-05 10:47:08 +08:00
Niujiawei
ef4a4010ff 修改样式2020.0804 2020-08-04 22:34:03 +08:00
Gdpao
7b9bee2f1e gdpaoup2 2020-08-04 22:13:50 +08:00
5343196342 upgrade 8.4 2020-08-04 21:13:47 +08:00
Gdpao
cc934696d1 gdpaoup 2020-08-04 19:46:42 +08:00
Gdpao
afc7731781 gdpao 2020-08-04 19:39:31 +08:00
1f9299602e Merge pull request 'classify 8.4' (#110) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/110
2020-08-04 19:10:00 +08:00
2fd62acb73 classify 8.4 2020-08-04 19:08:04 +08:00
gyh
f69a82ace5 Merge pull request 'gdpaoup' (#109) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/109
2020-08-04 14:38:17 +08:00
Gdpao
1f5af9d92b gdpaoup 2020-08-04 14:36:35 +08:00
e354152beb
人数 2020-08-04 11:43:33 +08:00
20b1c0da43 Merge branch 'master' into xbx 2020-08-04 10:42:38 +08:00
35e0c39d1d
rid 2020-08-04 10:41:54 +08:00
715793414f Merge pull request 'time none8.3' (#105) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/105
2020-08-03 21:00:41 +08:00
0a52842e35 time none8.3 2020-08-03 20:59:24 +08:00
gyh
0ee518854c Merge pull request 'gdpaoup2' (#104) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/104
2020-08-03 19:52:53 +08:00
Gdpao
38f92c6766 gdpaoup2 2020-08-03 19:51:05 +08:00
95f893a277
kuandu 2020-08-03 19:50:56 +08:00
b070a559dc
直播 2020-08-03 15:56:51 +08:00
0bc6be9b9f Merge pull request 'z8.3' (#100) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/100
2020-08-03 14:39:38 +08:00
Gdpao
51cd6f8261 gdpaoup 2020-08-03 14:37:02 +08:00
af768bff80 z8.3 2020-08-03 14:34:56 +08:00
gyh
c118eced7f Merge pull request 'gdpao' (#98) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/98
2020-08-03 14:31:20 +08:00
Gdpao
11865d4068 gdpao 2020-08-03 14:26:52 +08:00
8727ae913d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-03 10:35:41 +08:00
1da6974fe3
直播 2020-08-03 10:34:06 +08:00
bd996de410
goeasy 2020-08-03 09:05:30 +08:00
gyh
7ae10c200d Merge pull request 'gdpao' (#96) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/96
2020-08-01 17:24:12 +08:00
Gdpao
8a213ba094 gdpao 2020-08-01 17:22:46 +08:00
854976c8f0 comment 8.1 2020-08-01 16:36:48 +08:00
48722ef768 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-31 21:49:05 +08:00
ff7c6b358d order comment 7.31 2020-07-31 21:47:41 +08:00
Gdpao
ea10c99cd1 gdpao 2020-07-31 09:59:22 +08:00
2ec14481fd
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-31 09:40:18 +08:00
b9b8384011
修正错误 2020-07-31 09:40:06 +08:00
Gdpao
d817d0c28b gyh change 2020-07-31 08:45:30 +08:00
6d00107944 adv 7.30 2020-07-30 20:33:16 +08:00
120e062fcd send wash 7.29 2020-07-29 19:01:10 +08:00
ee08038a64
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-28 20:49:21 +08:00
b12a3c1722 send 7.28 2020-07-28 20:47:31 +08:00
4004f3715b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-27 18:02:22 +08:00
2ea9b89acc
直播 2020-07-27 17:32:17 +08:00
b2d284f666
直播列表 2020-07-27 14:35:32 +08:00
185f5979b6 order 7.25 2020-07-25 17:51:01 +08:00
5abb3f2496 comment 7.24 2020-07-24 20:35:28 +08:00
dd71a0f32a comment 7.2 2020-07-24 19:48:57 +08:00
59362ebc7c loadmore 7.23 2020-07-23 20:58:56 +08:00
be9f2ec1c7 order 7.23 2020-07-23 14:56:20 +08:00
03d10b1749 Merge branch 'master' into xbx 2020-07-21 21:03:56 +08:00
c89099f686 order 2020-07-21 21:02:28 +08:00
78769b8583
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 17:30:36 +08:00
e6ddb3c5df Merge pull request 'v' (#72) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/72
2020-07-20 17:22:47 +08:00
a6e1241238 group order 2020-07-20 17:17:41 +08:00
zmr900709
2a62b100fb v 2020-07-20 17:14:18 +08:00
ef7c81201b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 08:45:02 +08:00
zmr900709
687387861f Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-18 19:53:16 +08:00
zmr900709
30b99968db tian jia guan zhu 2020-07-18 19:52:47 +08:00
5c9bdcd0f3 完善问题 2020-07-18 17:43:37 +08:00
113144b716
添加了获取直播列表的接口 2020-07-18 16:10:14 +08:00
zmr900709
e34c74c303 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-18 14:06:01 +08:00
zmr900709
c90b2c3912 v 2020-07-18 14:05:37 +08:00
7b9479d56c coupon 2020-07-17 17:34:42 +08:00
5a4e302899 Merge pull request 'zmr' (#66) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/66
2020-07-17 08:42:58 +08:00
zmr900709
750ff19690 shouye xiugai 2020-07-17 08:36:53 +08:00
b250d05adf 7.16 2020-07-16 17:39:06 +08:00
91241682de 7.15 2020-07-15 17:38:41 +08:00
cc9fb2b48b 7.15 2020-07-15 16:21:43 +08:00
b83b375945 retrieve file 2020-07-14 10:13:27 +08:00
zmr900709
2479d587cd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-11 15:42:05 +08:00
73ffe92169
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-10 15:57:28 +08:00
a5b83f31a8 upload file 2020-07-10 09:03:19 +08:00
zmr900709
699b94e472 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-09 16:35:37 +08:00
zmr900709
10bbccc2bd v 2020-07-09 16:35:23 +08:00
9ffdfa652a api 2020-07-08 18:14:41 +08:00
aea71b6354
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-08 08:44:11 +08:00
396e795943
搜索修改 2020-07-08 08:43:39 +08:00
5ede514a02 api 2020-07-07 17:47:00 +08:00
8dc45b57fd api 2020-07-06 17:32:29 +08:00
f27d08c224 api 2020-07-03 17:44:58 +08:00
19b1dad0a8
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-03 09:10:40 +08:00
98efaa4352
某些页面修改 2020-07-03 09:09:21 +08:00
8e7da400ac api 2020-07-03 09:08:53 +08:00
dc72f79ee8 api 2020-07-01 17:32:36 +08:00
dc69746320 api 2020-06-30 18:06:50 +08:00
dce6d3a1b8 update api 2020-06-29 17:24:57 +08:00
905022e6e4 update api 2020-06-29 08:47:37 +08:00
28e80b49ff 6.24 2020-06-24 16:39:31 +08:00
7e71f97e01 个人中心 2020-06-19 18:07:11 +08:00
f0244f8077 6.18 2020-06-18 14:57:26 +08:00
zmr900709
b534c2323e v 2020-06-17 12:09:28 +08:00
b697270eb9 6.15 2020-06-15 11:34:33 +08:00
71cd101d97
接口 2020-06-15 10:00:14 +08:00
ee16ae96e0
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-15 08:50:42 +08:00
09f11d7d44
shop 2020-06-11 16:37:52 +08:00
55238876a8
shop 2020-06-11 16:12:04 +08:00
2edbc371ed 个人中心主页位置 2020-06-11 10:25:02 +08:00
72a29af788
商城首页 2020-06-11 09:34:23 +08:00
63f21c3021
修复首页报错 2020-06-04 09:39:08 +08:00
d71c7fcc24
搜索完成 2020-06-03 17:17:05 +08:00
8162188b03
首页完成 2020-06-02 16:45:02 +08:00
ba1db0eb05
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 15:37:04 +08:00
c02c1bef74
首页基本完成 2020-06-02 15:37:01 +08:00
zmr900709
9bf8ed444f v 2020-06-02 12:01:13 +08:00
af1e4ff55b
推荐+readme 2020-06-02 11:14:51 +08:00
0f5e209d64
直播页面 2020-06-02 09:34:37 +08:00
c312152365
推荐完成 2020-06-02 09:16:41 +08:00
15730b8506
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 09:00:12 +08:00
zmr900709
cb8eb90c15 登录页页添加 2020-06-02 08:49:13 +08:00
4e8bdc6522
首页一部分 2020-06-02 08:47:57 +08:00
zmr900709
d9ecf2144c merge master 2020-06-01 11:52:29 +08:00
zmr900709
2a27b13f90 fist 2020-06-01 11:41:09 +08:00
db2b9d8e25 5.29 2020-05-29 17:10:25 +08:00
53596b2be1 first commit 2020-05-29 11:13:55 +08:00