Commit Graph

237 Commits

Author SHA1 Message Date
zmr900709
91927fdc57 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-08-18 11:35:37 +08:00
zmr900709
8f83aeec8e 修改活动样式 2020-08-18 11:28:51 +08:00
631e8ae3e6 fixing bug 2020-08-18 11:14:29 +08:00
6f5c2d1fc9 fixing bug 2020-08-18 11:01:48 +08:00
06ee3b9038 首页拼团推荐样式 2020-08-18 10:38:35 +08:00
31689af773 秒杀时间背景色 2020-08-18 10:20:30 +08:00
a702558eac fixing bug 8.18 2020-08-18 08:52:47 +08:00
a39aa6e059
文字定位 2020-08-17 18:13:01 +08:00
35838e3a9e
添加了划线价 2020-08-17 18:09:19 +08:00
gyh
f77b4ebc02 Merge pull request 'gdpao' (#223) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/223
2020-08-17 16:58:52 +08:00
Gdpao
b1a705e0f8 gdpao 2020-08-17 16:57:23 +08:00
fb297a74ce
退款 2020-08-17 12:11:38 +08:00
df52535848 mine concerns 8.15 2020-08-15 17:16:11 +08:00
2aca3ae153 update uview 8.14 2020-08-14 17:57:13 +08:00
b8681f7c01 Merge pull request 'order spec 8.14' (#194) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/194
2020-08-14 11:31:15 +08:00
505e3354a3 order spec 8.14 2020-08-14 11:30:49 +08:00
4d76db71fe Merge pull request 'order spec 8.14' (#193) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/193
2020-08-14 11:25:26 +08:00
f9224f10cf order spec 8.14 2020-08-14 11:24:44 +08:00
65c1e2fd63
左滑跳过 2020-08-14 10:55:56 +08:00
3de426b55e Merge pull request 'coupon goods 8.13' (#181) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/181
2020-08-13 17:05:33 +08:00
e224cffc1c coupon goods 8.13 2020-08-13 17:05:02 +08:00
3d552b84c7
直播头像 2020-08-13 16:36:34 +08:00
a95336a5a6 store article 8.13 2020-08-13 16:07:19 +08:00
2811bf31cd store article 8.13 2020-08-13 15:41:03 +08:00
1936105b1b Merge pull request 'store 8.13' (#170) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/170
2020-08-13 11:55:13 +08:00
02639fc9e1 store 8.13 2020-08-13 11:54:44 +08:00
eb886368e9
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-13 10:09:49 +08:00
e55aa62bcc
一部分完成 2020-08-13 10:04:50 +08:00
c03fff99e0 fixing bug 8.12 2020-08-12 18:38:14 +08:00
3b5515d317 fixing bug add address 8.12 2020-08-12 16:01:43 +08:00
d19771b182 show price 8.12 2020-08-12 10:10:59 +08:00
Gdpao
ef79718190 gdpaoup 2020-08-11 22:15:58 +08:00
Niujiawei
23b2b11bc8 2020.08.10 2020-08-11 21:47:28 +08:00
Niujiawei
21d3201c4b 2020.08.10 2020-08-11 21:18:34 +08:00
Gdpao
703689d272 gdpaomg1 2020-08-11 11:12:32 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +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
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
9d3f8da629 rewrite tab swiper 8.7 2020-08-07 17:34:59 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
Niujiawei
9a9276fc94 修改样式2020.08.06 2020-08-06 21:35:27 +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
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
ed0edbab2f 修改样式 2020.08.05 2020-08-05 22:06:09 +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
0057bcd28e store 8.5 2020-08-05 17:38:11 +08:00
Gdpao
0a2441b1a9 gdpaoup3 2020-08-04 23:13:28 +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
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