Commit Graph

748 Commits

Author SHA1 Message Date
0a5115b8f4 添加消息无数据提示 2020-08-24 15:13:38 +08:00
6306573ee4 优惠券增加新人优惠券 2020-08-24 14:29:15 +08:00
065cea4e11 add video link 2020-08-24 14:13:12 +08:00
dddbabd207 add goods details video 2020-08-24 11:44:58 +08:00
6f344dc550 Merge pull request '修复' (#284) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/284
2020-08-21 18:05:07 +08:00
03c6779b96
修复 2020-08-21 18:04:11 +08:00
gyh
8518677f05 Merge pull request 'gdpao' (#282) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/282
2020-08-21 16:05:52 +08:00
Gdpao
e0aafebcdc gdpao 2020-08-21 16:05:09 +08:00
e43003e0cd Merge pull request '消息物流跳转' (#281) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/281
2020-08-21 14:49:08 +08:00
7f30cf8020 消息物流跳转 2020-08-21 14:48:19 +08:00
62d610b025 Merge pull request '商品规格样式' (#279) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/279
2020-08-21 11:51:54 +08:00
5806077877 商品规格样式 2020-08-21 11:51:31 +08:00
50fb33d8e4 Merge pull request 'fixing bug' (#278) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/278
2020-08-21 11:18:31 +08:00
164dff3db5 fixing bug 2020-08-21 11:18:01 +08:00
5b287c7049 Merge pull request '全部显示物流' (#277) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/277
2020-08-21 10:19:17 +08:00
fc44bb5fd6 全部显示物流 2020-08-21 10:18:10 +08:00
ecea27ccff Merge pull request '调整订单数量位置' (#276) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/276
2020-08-21 09:25:21 +08:00
3d2e0a9525 调整订单数量位置 2020-08-21 09:24:51 +08:00
gyh
4b0cbcf814 Merge pull request 'gdpao' (#275) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/275
2020-08-21 09:15:47 +08:00
Gdpao
ecb5f19fc0 gdpao 2020-08-21 09:14:57 +08:00
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
gyh
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
gyh
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
gyh
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