Commit Graph

173 Commits

Author SHA1 Message Date
5343196342 upgrade 8.4 2020-08-04 21:13:47 +08:00
396bb37c94 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-04 20:03:05 +08:00
13bdc08c86 upgrade 9.4 2020-08-04 20:00:58 +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
Gdpao
1f5af9d92b gdpaoup 2020-08-04 14:36:35 +08:00
gyh
1e9f442b7b Merge pull request 'gdpaoup3' (#106) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/106
2020-08-03 21:42:24 +08:00
Gdpao
48b7219954 gdpaoup3 2020-08-03 21:40:22 +08:00
0a52842e35 time none8.3 2020-08-03 20:59:24 +08:00
d54a378a9e z8.3 2020-08-03 18:38:04 +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
af768bff80 z8.3 2020-08-03 14:34:56 +08:00
8727ae913d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-03 10:35:41 +08:00
bd996de410
goeasy 2020-08-03 09:05:30 +08:00
1c16a85e18 Merge pull request '8.1' (#95) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/95
2020-08-01 17:18:21 +08:00
4ef16728f9 8.1 2020-08-01 17:17:37 +08:00
680fa48e85 Merge pull request 'comment 8.1' (#94) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/94
2020-08-01 16:37:27 +08:00
854976c8f0 comment 8.1 2020-08-01 16:36:48 +08:00
gyh
223dd51db7 Merge pull request 'update' (#93) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/93
2020-08-01 11:20:41 +08:00
Gdpao
5b31193750 update 2020-08-01 11:16:53 +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
f30c4f4922 gdpaoup 2020-07-31 10:07:37 +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
41f4050768
直播 2020-07-28 20:47:52 +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
6eabd3a575 loadmore 7.27 2020-07-27 17:59:47 +08:00
2ea9b89acc
直播 2020-07-27 17:32:17 +08:00
b2d284f666
直播列表 2020-07-27 14:35:32 +08:00
c931e87209 order 7.25 2020-07-25 15:17:52 +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
818d388f31 order 7.22 2020-07-22 18:51:48 +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
864f43e200 Merge pull request 'update coupon height' (#73) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/73
2020-07-20 17:29:07 +08:00
86686ef1a6 update coupon height 2020-07-20 17:28:37 +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
4c70db7575
1 2020-07-20 08:43:13 +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
edd71ab1a4
添加冒泡事件 2020-07-18 16:01:49 +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
zmr900709
46da0894b4 vuex 2020-07-15 16:46:33 +08:00
cc9fb2b48b 7.15 2020-07-15 16:21:43 +08:00
zmr900709
f662e813a7 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-15 16:04:41 +08:00
zmr900709
69a4517bb5 null 2020-07-15 16:04:31 +08:00
4ab7d33643 7.14 2020-07-14 17:43:15 +08:00
b83b375945 retrieve file 2020-07-14 10:13:27 +08:00
zmr900709
4140c256a0 v 2020-07-14 08:30:28 +08:00
zmr900709
2479d587cd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-11 15:42:05 +08:00
7cff88b5d6 order 2020-07-10 17:38:21 +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
5ede514a02 api 2020-07-07 17:47:00 +08:00
f27d08c224 api 2020-07-03 17:44:58 +08:00
6f42ccde84 Merge pull request 'zmr' (#41) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/41
2020-07-03 09:14:20 +08:00
zmr900709
b7f5711c02 v 2020-07-02 08:39:38 +08:00
dc72f79ee8 api 2020-07-01 17:32:36 +08:00
dc69746320 api 2020-06-30 18:06:50 +08:00
c7136c2c11 update api 2020-06-29 17:37:47 +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
8c993da2cd address api 2020-06-23 17:21:01 +08:00
fe995ced2d 6.22 2020-06-23 09:05:45 +08:00
bf5691b68a 6.22 2020-06-23 09:00:04 +08:00
zmr900709
7a626e7db9 v 2020-06-23 08:47:23 +08:00
zmr900709
744bc925d3 v 2020-06-22 23:20:05 +08:00
zmr900709
dcff321674 v 2020-06-22 21:00:32 +08:00
28911b6e7c update token 2020-06-22 17:45:17 +08:00
zmr900709
d384e6d4e7 v 2020-06-19 19:20:33 +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
zmr900709
b6153a4238 v 2020-06-15 15:38:32 +08:00
zmr900709
c2916b57b1 v 2020-06-15 15:31:31 +08:00