Commit Graph

221 Commits

Author SHA1 Message Date
f9fa80665b
默认 2020-08-11 16:03:12 +08:00
9a0dc4c6d1 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 15:40:53 +08:00
1ef4db7dc4 fixing bug 8.11 2020-08-11 15:39:56 +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
Gdpao
b3a7b2d032 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh 2020-08-11 10:36:18 +08:00
Gdpao
b34ac35821 gdpaoup 2020-08-11 10:35:01 +08:00
def8f0cf1b Merge pull request 'xbx' (#151) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151
2020-08-11 10:26:19 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
Gdpao
e1c908152a gdpao 2020-08-11 10:04:25 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
4739ef71a9 fixed bug 8.11 2020-08-11 09:46:05 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
gyh
52bce327cc Merge pull request 'gdpaoup' (#145) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
2020-08-10 19:08:19 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
33b0137c06 Merge pull request 'zhy' (#144) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
2020-08-10 17:47:31 +08:00
8c3121d5ed new member 8.9 2020-08-10 17:38:54 +08:00
8df5bc2701
状态 2020-08-10 17:30:41 +08:00
0c8e81f484
跳转提示 2020-08-10 17:03:15 +08:00
Gdpao
2e95172a75 upct 2020-08-09 19:11:12 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +08:00
520fa5497c serach input 8.9 2020-08-09 19:06:54 +08:00
9a4e4f5efe Merge pull request 'bug 8.9' (#140) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/140
2020-08-09 18:40:07 +08:00
9b93b6a5a9 bug 8.9 2020-08-09 18:39:35 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
d00b4a75ac Merge pull request 'specil 8.9' (#138) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/138
2020-08-09 14:24:30 +08:00
9631e9f827 specil 8.9 2020-08-09 14:23:59 +08:00
gyh
097f7e3cba Merge pull request 'gdpao' (#137) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/137
2020-08-09 11:33:25 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
228e34d8fc spec 8.9 2020-08-09 11:27:15 +08:00
cef9296a78 spike time 8.8 2020-08-08 18:15:07 +08:00
02702bc447 group buy 8.8 2020-08-08 12:07:50 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00
6bf4fdc7e3
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 18:01:40 +08:00
9d3f8da629 rewrite tab swiper 8.7 2020-08-07 17:34:59 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +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
8bf42a75dd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-06 10:50:11 +08:00
2c6cdbead9
Merge branch 'zhy' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:48:46 +08:00
2cb8f90281 refund 8.6 2020-08-06 10:48:21 +08:00
2a8ee65a94
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:18 +08:00
9872770472
Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:03 +08:00
Gdpao
046f2e50c5 gdpaoup 2020-08-06 10:35:59 +08:00
Niujiawei
1313a90d5e 修改样式 2020-08-05 22:44:08 +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
Niujiawei
ef4a4010ff 修改样式2020.0804 2020-08-04 22:34:03 +08:00
Gdpao
6ed05ecf31 gdpaoup 2020-08-04 21:50:12 +08:00
Gdpao
692495f108 gdpaoup 2020-08-04 21:46:52 +08:00
f6c6ffa176 upgrade 8.4 2020-08-04 20:09:21 +08:00
Gdpao
afc7731781 gdpao 2020-08-04 19:39:31 +08:00
Gdpao
1f5af9d92b gdpaoup 2020-08-04 14:36:35 +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
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
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
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
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
Gdpao
5b31193750 update 2020-08-01 11:16:53 +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
Gdpao
8bb1cdfd39 gyhup 2020-07-29 15:04:57 +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
185f5979b6 order 7.25 2020-07-25 17:51:01 +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
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
c90b2c3912 v 2020-07-18 14:05:37 +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
cc9fb2b48b 7.15 2020-07-15 16:21:43 +08:00
5f080a3c9d
搜索点击时间 2020-07-10 15:58:03 +08:00
396e795943
搜索修改 2020-07-08 08:43:39 +08:00
2910af7bd7
商品详情 2020-07-07 14:45:57 +08:00
d94fb80ee2
弹窗优化 2020-07-06 11:42:12 +08:00
709a315403
弹出曾 2020-07-06 10:25:54 +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
bce0d0328e
一部分 2020-06-15 08:49:26 +08:00
2f123fbb48
首页基本完成 2020-06-09 14:29:43 +08:00
86c243a255
删除空白 2020-06-04 08:42:04 +08:00
d71c7fcc24
搜索完成 2020-06-03 17:17:05 +08:00
b5ef323612
达人详情完成 2020-06-03 10:53:38 +08:00
0f3073e577
关注页面完成 2020-06-02 17:24:13 +08:00