|
f54b94f0c6
|
Merge pull request '去掉店铺关注背景色' (#274) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/274
|
2020-08-20 17:59:02 +08:00 |
|
|
abda1f39f5
|
去掉店铺关注背景色
|
2020-08-20 17:58:34 +08:00 |
|
|
9e6c36b65a
|
Merge pull request 'gdpaoup2' (#273) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/273
|
2020-08-20 17:44:18 +08:00 |
|
Gdpao
|
71fb73b61a
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh
|
2020-08-20 17:42:46 +08:00 |
|
Gdpao
|
83b06e2ab5
|
gdpaoup2
|
2020-08-20 17:42:07 +08:00 |
|
|
b575501bb7
|
Merge pull request 'fixing bug' (#272) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/272
|
2020-08-20 17:39:55 +08:00 |
|
|
d69486d1ab
|
fixing bug
|
2020-08-20 17:39:30 +08:00 |
|
|
d3c68b8c93
|
Merge pull request '初始化运费' (#271) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/271
|
2020-08-20 16:55:08 +08:00 |
|
|
40e4d10bd7
|
初始化运费
|
2020-08-20 16:54:39 +08:00 |
|
|
7790481afb
|
Merge pull request 'gdpaoup1' (#270) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/270
|
2020-08-20 16:23:32 +08:00 |
|
Gdpao
|
7c0720fab2
|
gdpaoup1
|
2020-08-20 16:22:34 +08:00 |
|
|
1f966b261e
|
Merge pull request '消息物流跳转' (#269) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/269
|
2020-08-20 16:20:38 +08:00 |
|
|
421112db2e
|
消息物流跳转
|
2020-08-20 16:18:52 +08:00 |
|
|
920976dedd
|
Merge pull request '消息物流跳转' (#268) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/268
|
2020-08-20 16:17:15 +08:00 |
|
|
91a655e224
|
消息物流跳转
|
2020-08-20 16:16:34 +08:00 |
|
|
4e3665acc7
|
Merge pull request 'gdppao' (#267) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/267
|
2020-08-20 15:17:54 +08:00 |
|
Gdpao
|
1643bf51b2
|
gdppao
|
2020-08-20 15:16:29 +08:00 |
|
|
d234176f22
|
Merge pull request 'xbx' (#266) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/266
|
2020-08-20 15:15:16 +08:00 |
|
|
b75e885e70
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-08-20 14:55:54 +08:00 |
|
|
9eaf84d496
|
Merge pull request 'fixing bung' (#264) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/264
|
2020-08-20 14:47:44 +08:00 |
|
|
dbbd64269f
|
fixing bung
|
2020-08-20 14:46:57 +08:00 |
|
|
677890a06d
|
解决了关注刷新的问题
|
2020-08-20 14:32:01 +08:00 |
|
|
dd3d3c17c4
|
Merge pull request 'zmr' (#263) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/263
|
2020-08-20 14:30:12 +08:00 |
|
zmr900709
|
78169d8cde
|
解决样式问题
|
2020-08-20 14:24:17 +08:00 |
|
zmr900709
|
7f0d1063f0
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
|
2020-08-20 14:23:32 +08:00 |
|
zmr900709
|
c81ee7e961
|
1
|
2020-08-20 14:23:21 +08:00 |
|
|
6864f22576
|
Merge pull request '首页拼团商品显示不全' (#262) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/262
|
2020-08-20 12:05:44 +08:00 |
|
|
a91fa4708b
|
首页拼团商品显示不全
|
2020-08-20 12:05:15 +08:00 |
|
|
bfffb44fe2
|
Merge pull request 'zhy' (#261) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/261
|
2020-08-20 11:43:19 +08:00 |
|
|
16c2c1fa71
|
使用优惠券价格
|
2020-08-20 11:42:52 +08:00 |
|
|
4c8e2ba4b6
|
使用优惠券价格
|
2020-08-20 11:41:58 +08:00 |
|
|
96d7ad439a
|
Merge pull request '优惠券列表显示,使用优惠券价格计算' (#259) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/259
|
2020-08-20 11:29:22 +08:00 |
|
|
390bda7c0e
|
优惠券列表显示,使用优惠券价格计算
|
2020-08-20 11:28:49 +08:00 |
|
|
0ae19c2ddf
|
Merge pull request 'touxiang' (#258) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/258
|
2020-08-20 11:27:56 +08:00 |
|
|
26cb84748a
|
touxiang
|
2020-08-20 11:26:59 +08:00 |
|
|
c6cd88dc48
|
Merge pull request 'xbx' (#257) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/257
|
2020-08-20 11:10:11 +08:00 |
|
|
a34880e6a6
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-08-20 11:09:49 +08:00 |
|
|
3d840a0546
|
修复了交易物流
|
2020-08-20 10:54:09 +08:00 |
|
|
30539ddf64
|
Merge pull request '新人优惠券显示问题,使用优惠券价格问题' (#256) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/256
|
2020-08-20 10:26:39 +08:00 |
|
|
51823edb12
|
新人优惠券显示问题,使用优惠券价格问题
|
2020-08-20 10:25:58 +08:00 |
|
|
e58f571de4
|
直播添加了下拉刷新
|
2020-08-20 10:16:40 +08:00 |
|
|
c4821f888f
|
Merge pull request 'gdpao' (#255) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/255
|
2020-08-19 19:25:14 +08:00 |
|
Gdpao
|
69760e6377
|
gdpao
|
2020-08-19 19:24:14 +08:00 |
|
|
080f0c6d86
|
Merge pull request 'zhy' (#254) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/254
|
2020-08-19 18:04:59 +08:00 |
|
|
4e842b127c
|
fixing bug coupon
|
2020-08-19 18:04:32 +08:00 |
|
|
627cfc4aa0
|
优惠券加分页
|
2020-08-19 17:55:58 +08:00 |
|
|
1e94eb864f
|
Merge pull request '调整首页全部拼团样式' (#253) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/253
|
2020-08-19 17:28:58 +08:00 |
|
|
64597b26fa
|
调整首页全部拼团样式
|
2020-08-19 17:27:49 +08:00 |
|
|
05b334fdcb
|
Merge pull request '广告位跳转' (#252) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/252
|
2020-08-19 16:59:46 +08:00 |
|
|
dc636e30b7
|
广告位跳转
|
2020-08-19 16:59:06 +08:00 |
|