Commit Graph

78 Commits

Author SHA1 Message Date
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
Gdpao
11865d4068 gdpao 2020-08-03 14:26:52 +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
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
6d00107944 adv 7.30 2020-07-30 20:33:16 +08:00
04adc72d92 Merge pull request 'send wash 7.29' (#88) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/88
2020-07-29 19:01:59 +08:00
120e062fcd send wash 7.29 2020-07-29 19:01:10 +08:00
Gdpao
8bb1cdfd39 gyhup 2020-07-29 15:04:57 +08:00
b12a3c1722 send 7.28 2020-07-28 20:47:31 +08:00
6eabd3a575 loadmore 7.27 2020-07-27 17:59:47 +08:00
c931e87209 order 7.25 2020-07-25 15:17:52 +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
063da7bef3
商家部分 2020-07-21 21:01:42 +08:00
78769b8583
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-20 17:30:36 +08:00
a6e1241238 group order 2020-07-20 17:17:41 +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
113144b716
添加了获取直播列表的接口 2020-07-18 16:10:14 +08:00
58dc04fc4d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-18 11:44:45 +08:00
82d387a000
商品搜索 2020-07-18 11:44:05 +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
b250d05adf 7.16 2020-07-16 17:39:06 +08:00
zmr900709
552d0dfbf0 v 2020-07-16 15:49:48 +08:00
zmr900709
d66aab7beb vuex 2020-07-16 08:43:55 +08:00
91241682de 7.15 2020-07-15 17:38:41 +08:00
zmr900709
b04b2ffd16 vuex 2020-07-15 16:52:39 +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
700ae94f79 order 2020-07-14 09:15:51 +08:00
zmr900709
7e4b4eef18 v 2020-07-13 08:39:42 +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