Commit Graph

153 Commits

Author SHA1 Message Date
9a0dc4c6d1 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 15:40:53 +08:00
37d8ab7a2b fixing bug 8.11 2020-08-11 15:38:43 +08:00
Gdpao
703689d272 gdpaomg1 2020-08-11 11:12:32 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
8c3121d5ed new member 8.9 2020-08-10 17:38:54 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00
07e1661a18
修改 2020-08-07 18:03:40 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +08:00
f4313dce9d
md5 2020-08-07 14:39:15 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
fc86ad2579
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 11:41:03 +08:00
eb0d648f6a
完成 2020-08-07 11:40:13 +08:00
Gdpao
2afd55f79e gdpaomg 2020-08-06 20:46:40 +08:00
Gdpao
090b7cc753 gdpaoup 2020-08-06 20:42:03 +08:00
1a1a0de460 upgrade 8.6 2020-08-06 17:52:25 +08:00
Gdpao
1b5bf33166 gdpaomg 2020-08-05 21:11:32 +08:00
Gdpao
c4c11781fb gdpaoup 2020-08-05 21:06:29 +08:00
0057bcd28e store 8.5 2020-08-05 17:38:11 +08:00
2fd62acb73 classify 8.4 2020-08-04 19:08:04 +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
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
9ffdfa652a api 2020-07-08 18:14:41 +08:00
5ede514a02 api 2020-07-07 17:47:00 +08:00
a127f08375
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-07 14:46:47 +08:00
2910af7bd7
商品详情 2020-07-07 14:45:57 +08:00
8dc45b57fd api 2020-07-06 17:32:29 +08:00
8060a433b3 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-06 09:20:44 +08:00
40f03de79f
商家首页 2020-07-06 09:10:34 +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
8e7da400ac api 2020-07-03 09:08:53 +08:00
5a99dfc2c9
商城首页接口 2020-07-02 15:39:25 +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
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
744bc925d3 v 2020-06-22 23:20:05 +08:00
zmr900709
dcff321674 v 2020-06-22 21:00:32 +08:00
zmr900709
7c62d68806 v 2020-06-22 17:45:39 +08:00
28911b6e7c update token 2020-06-22 17:45:17 +08:00
7e71f97e01 个人中心 2020-06-19 18:07:11 +08:00
f0244f8077 6.18 2020-06-18 14:57:26 +08:00