Commit Graph

995 Commits

Author SHA1 Message Date
0e21019107 Merge pull request 'xbx' (#307) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/307
2020-08-27 14:04:08 +08:00
4dfacfb524 Merge pull request '第三方绑定' (#305) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/305
2020-08-27 12:22:22 +08:00
d3154dc864 第三方绑定 2020-08-27 12:21:32 +08:00
8f02597787 Merge pull request '第三方绑定' (#304) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/304
2020-08-27 12:18:02 +08:00
16115ba111 第三方绑定 2020-08-27 12:16:09 +08:00
36f0675689
1 2020-08-27 12:15:55 +08:00
18c99cd668
添加了消息铃声 2020-08-27 11:06:11 +08:00
5f233b8e06 Merge pull request '第三方绑定' (#303) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/303
2020-08-27 09:37:18 +08:00
916b1e0cbd 第三方绑定 2020-08-27 09:36:12 +08:00
Gdpao
2e36f2a22f gdpao 2020-08-26 20:31:30 +08:00
af612ef89e Merge pull request '启动页按钮问题' (#302) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/302
2020-08-25 14:39:37 +08:00
95c55de38b 启动页按钮问题 2020-08-25 14:39:11 +08:00
d06394f6ad Merge pull request 'xbx' (#300) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/300
2020-08-25 14:38:13 +08:00
f4de9fe13b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-25 14:37:35 +08:00
2512923891 Merge pull request '版本更新跳转' (#299) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/299
2020-08-25 14:21:38 +08:00
4ab89711b2 版本更新跳转 2020-08-25 14:21:15 +08:00
gyh
4876ddb383 Merge pull request '1.0.1' (#298) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/298
2020-08-25 13:04:20 +08:00
Gdpao
9b5fca48a2 1.0.1 2020-08-25 13:03:24 +08:00
81955085b5 Merge pull request '版本更新跳转' (#297) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/297
2020-08-25 12:21:55 +08:00
ffa18c92d2 版本更新跳转 2020-08-25 12:21:26 +08:00
b63a84149e Merge pull request '版本更新跳转' (#296) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/296
2020-08-25 12:07:07 +08:00
1aee3f3320 版本更新跳转 2020-08-25 12:06:37 +08:00
6d0c6a6b15 Merge pull request '完善' (#295) from xbx-new into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/295
2020-08-25 11:53:18 +08:00
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
3e87a5aaf5
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-24 14:23:22 +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
52e6489a2c
优惠券完成 2020-08-22 16:45:26 +08:00
92771d8174
图标 2020-08-22 09:46:30 +08:00