Commit Graph

768 Commits

Author SHA1 Message Date
d5e4d52dbe
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx-new 2020-08-25 11:53:03 +08:00
d5d9e98534
1 2020-08-25 11:52:46 +08:00
71a82a10b0
完善 2020-08-25 11:51:16 +08:00
e3e470ab88 Merge pull request 'fixing bug' (#294) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/294
2020-08-25 11:51:13 +08:00
3d4ee2bd4c fixing bug 2020-08-25 11:50:45 +08:00
6af21ad216 Merge pull request '跳转应用商店' (#293) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/293
2020-08-25 10:41:17 +08:00
9c026bf64d 跳转应用商店 2020-08-25 10:40:47 +08:00
4436bbd282 Merge pull request '版本更新' (#292) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/292
2020-08-25 10:14:36 +08:00
27bdf1f2b0 版本更新 2020-08-25 10:13:49 +08:00
76d13c5a71 Merge pull request 'xbx-new' (#291) from xbx-new into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/291
2020-08-25 10:03:53 +08:00
6d4d2e5d8d
去除了视频 2020-08-25 10:01:39 +08:00
6a25fe34a7
去除视频 2020-08-24 17:01:34 +08:00
0d96af99e1 Merge pull request '视频播放' (#290) from xbx-new into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/290
2020-08-24 16:48:30 +08:00
5c47aa8e5c
视频播放 2020-08-24 16:40:38 +08:00
gyh
5ad768f842 Merge pull request 'gdpao' (#289) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/289
2020-08-24 15:46:28 +08:00
Gdpao
e674a2c0df gdpao 2020-08-24 15:45:35 +08:00
5194e15ec8 Merge pull request '添加消息无数据提示' (#288) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/288
2020-08-24 15:14:12 +08:00
0a5115b8f4 添加消息无数据提示 2020-08-24 15:13:38 +08:00
1d8cd6512f Merge pull request '优惠券增加新人优惠券' (#287) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/287
2020-08-24 14:29:47 +08:00
6306573ee4 优惠券增加新人优惠券 2020-08-24 14:29:15 +08:00
21b9995c1c Merge pull request 'add video link' (#286) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/286
2020-08-24 14:13:44 +08:00
065cea4e11 add video link 2020-08-24 14:13:12 +08:00
f86e9ae009 Merge pull request 'add goods details video' (#285) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/285
2020-08-24 11:45:25 +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