|
|
ee08038a64
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-07-28 20:49:21 +08:00 |
|
|
|
280915560d
|
Merge pull request 'send 7.28' (#85) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/85
|
2020-07-28 20:48:10 +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 |
|
|
|
208f27aa93
|
Merge pull request 'loadmore 7.27' (#84) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/84
|
2020-07-27 18:01:21 +08:00 |
|
|
|
6eabd3a575
|
loadmore 7.27
|
2020-07-27 17:59:47 +08:00 |
|
|
|
2ea9b89acc
|
直播
|
2020-07-27 17:32:17 +08:00 |
|
|
|
100f31c6f9
|
Merge pull request 'lxb' (#83) from lxb into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/83
|
2020-07-27 14:40:40 +08:00 |
|
|
|
a3f2a6d57c
|
删除
|
2020-07-27 14:36:55 +08:00 |
|
|
|
b2d284f666
|
直播列表
|
2020-07-27 14:35:32 +08:00 |
|
lxb
|
3793c56cdc
|
1
|
2020-07-27 09:36:59 +08:00 |
|
|
|
dbafe8b4c1
|
Merge pull request 'order 7.25' (#82) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/82
|
2020-07-25 17:51:40 +08:00 |
|
|
|
185f5979b6
|
order 7.25
|
2020-07-25 17:51:01 +08:00 |
|
|
|
410a7850e6
|
Merge pull request 'order 7.25' (#81) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/81
|
2020-07-25 15:18:30 +08:00 |
|
|
|
c931e87209
|
order 7.25
|
2020-07-25 15:17:52 +08:00 |
|
|
|
94636380f1
|
Merge pull request 'comment 7.24' (#80) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/80
|
2020-07-24 20:36:00 +08:00 |
|
|
|
5abb3f2496
|
comment 7.24
|
2020-07-24 20:35:28 +08:00 |
|
|
|
a1b14b4f5e
|
Merge pull request 'comment 7.24' (#79) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/79
|
2020-07-24 19:50:24 +08:00 |
|
|
|
dd71a0f32a
|
comment 7.2
|
2020-07-24 19:48:57 +08:00 |
|
|
|
4196f545fd
|
Merge pull request 'loadmore 7.23' (#78) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/78
|
2020-07-23 20:59:36 +08:00 |
|
|
|
59362ebc7c
|
loadmore 7.23
|
2020-07-23 20:58:56 +08:00 |
|
|
|
937640f19d
|
Merge pull request 'order 7.23' (#77) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/77
|
2020-07-23 14:57:42 +08:00 |
|
|
|
be9f2ec1c7
|
order 7.23
|
2020-07-23 14:56:20 +08:00 |
|
|
|
2e087313d4
|
Merge pull request 'order 7.22' (#76) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/76
|
2020-07-22 18:52:49 +08:00 |
|
|
|
818d388f31
|
order 7.22
|
2020-07-22 18:51:48 +08:00 |
|
|
|
bd604ecec7
|
Merge pull request 'xbx' (#75) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/75
|
2020-07-21 21:04:01 +08:00 |
|
|
|
03d10b1749
|
Merge branch 'master' into xbx
|
2020-07-21 21:03:56 +08:00 |
|
|
|
50c0ac55e6
|
Merge pull request 'order' (#74) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/74
|
2020-07-21 21:03:13 +08:00 |
|
|
|
c89099f686
|
order
|
2020-07-21 21:02:28 +08:00 |
|
|
|
063da7bef3
|
商家部分
|
2020-07-21 21:01:42 +08:00 |
|
|
|
c96f5ca95d
|
1
|
2020-07-21 20:40:12 +08:00 |
|
|
|
78769b8583
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-07-20 17:30:36 +08:00 |
|
|
|
864f43e200
|
Merge pull request 'update coupon height' (#73) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/73
|
2020-07-20 17:29:07 +08:00 |
|
|
|
86686ef1a6
|
update coupon height
|
2020-07-20 17:28:37 +08:00 |
|
|
|
e6ddb3c5df
|
Merge pull request 'v' (#72) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/72
|
2020-07-20 17:22:47 +08:00 |
|
|
|
73519fe205
|
Merge pull request 'group order' (#71) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/71
|
2020-07-20 17:18:38 +08:00 |
|
|
|
a6e1241238
|
group order
|
2020-07-20 17:17:41 +08:00 |
|
zmr900709
|
2a62b100fb
|
v
|
2020-07-20 17:14:18 +08:00 |
|
|
|
ef7c81201b
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-07-20 08:45:02 +08:00 |
|
|
|
4c70db7575
|
1
|
2020-07-20 08:43:13 +08:00 |
|
|
|
50085a341f
|
Merge pull request 'zmr' (#70) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/70
|
2020-07-18 20:03:48 +08:00 |
|
zmr900709
|
687387861f
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
|
2020-07-18 19:53:16 +08:00 |
|
zmr900709
|
30b99968db
|
tian jia guan zhu
|
2020-07-18 19:52:47 +08:00 |
|
|
|
1c219f6c34
|
Merge pull request '完善问题' (#69) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/69
|
2020-07-18 17:44:15 +08:00 |
|
|
|
5c9bdcd0f3
|
完善问题
|
2020-07-18 17:43:37 +08:00 |
|
|
|
113144b716
|
添加了获取直播列表的接口
|
2020-07-18 16:10:14 +08:00 |
|
|
|
edd71ab1a4
|
添加冒泡事件
|
2020-07-18 16:01:49 +08:00 |
|
|
|
157a29457a
|
Merge pull request 'xbx' (#68) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/68
|
2020-07-18 15:58:22 +08:00 |
|
zmr900709
|
e34c74c303
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
|
2020-07-18 14:06:01 +08:00 |
|
