zmr900709
|
4be45cafde
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
|
2020-07-03 10:52:08 +08:00 |
|
zmr900709
|
d5eb0e6908
|
v
|
2020-07-03 10:50:02 +08:00 |
|
|
|
6f42ccde84
|
Merge pull request 'zmr' (#41) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/41
|
2020-07-03 09:14:20 +08:00 |
|
|
|
6dfe6ca7c3
|
Merge pull request 'xbx' (#40) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/40
|
2020-07-03 09:10:59 +08:00 |
|
|
|
19b1dad0a8
|
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
|
2020-07-03 09:10:40 +08:00 |
|
|
|
b86e2831c7
|
Merge pull request 'api' (#39) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/39
|
2020-07-03 09:09:24 +08:00 |
|
|
|
98efaa4352
|
某些页面修改
|
2020-07-03 09:09:21 +08:00 |
|
|
|
8e7da400ac
|
api
|
2020-07-03 09:08:53 +08:00 |
|
|
|
3e077a810a
|
添加注释
|
2020-07-02 15:40:01 +08:00 |
|
|
|
5a99dfc2c9
|
商城首页接口
|
2020-07-02 15:39:25 +08:00 |
|
|
|
583afe370f
|
直播页面
|
2020-07-02 09:49:35 +08:00 |
|
|
|
c9864973ff
|
升级uview
|
2020-07-02 08:42:36 +08:00 |
|
zmr900709
|
b7f5711c02
|
v
|
2020-07-02 08:39:38 +08:00 |
|
|
|
973ffa1135
|
Merge pull request 'api' (#38) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/38
|
2020-07-01 17:33:16 +08:00 |
|
|
|
dc72f79ee8
|
api
|
2020-07-01 17:32:36 +08:00 |
|
|
|
7b60b756d0
|
Merge pull request 'api' (#37) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/37
|
2020-06-30 18:07:52 +08:00 |
|
|
|
dc69746320
|
api
|
2020-06-30 18:06:50 +08:00 |
|
|
|
d4a5a63f72
|
Merge pull request 'zhy' (#36) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/36
|
2020-06-29 17:38:30 +08:00 |
|
|
|
c7136c2c11
|
update api
|
2020-06-29 17:37:47 +08:00 |
|
|
|
dce6d3a1b8
|
update api
|
2020-06-29 17:24:57 +08:00 |
|
|
|
1e7ac7bc05
|
Merge pull request 'update api' (#35) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/35
|
2020-06-29 08:48:25 +08:00 |
|
|
|
905022e6e4
|
update api
|
2020-06-29 08:47:37 +08:00 |
|
|
|
3112cf2a9f
|
Merge pull request '6.24' (#34) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/34
|
2020-06-24 16:40:22 +08:00 |
|
|
|
28e80b49ff
|
6.24
|
2020-06-24 16:39:31 +08:00 |
|
|
|
f377c1823b
|
Merge pull request 'address api' (#33) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/33
|
2020-06-23 17:23:05 +08:00 |
|
|
|
8c993da2cd
|
address api
|
2020-06-23 17:21:01 +08:00 |
|
|
|
2cbcb81dc7
|
Merge pull request 'zhy' (#32) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/32
|
2020-06-23 09:06:25 +08:00 |
|
|
|
fe995ced2d
|
6.22
|
2020-06-23 09:05:45 +08:00 |
|
|
|
bf5691b68a
|
6.22
|
2020-06-23 09:00:04 +08:00 |
|
|
|
a900101039
|
Merge pull request 'zmr' (#30) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/30
|
2020-06-23 08:52:40 +08:00 |
|
zmr900709
|
7a626e7db9
|
v
|
2020-06-23 08:47:23 +08:00 |
|
zmr900709
|
744bc925d3
|
v
|
2020-06-22 23:20:05 +08:00 |
|
zmr900709
|
5a8ce60255
|
v
|
2020-06-22 22:58:29 +08:00 |
|
zmr900709
|
dcff321674
|
v
|
2020-06-22 21:00:32 +08:00 |
|
|
|
59a6728791
|
Merge pull request 'update token' (#29) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/29
|
2020-06-22 17:46:07 +08:00 |
|
zmr900709
|
7c62d68806
|
v
|
2020-06-22 17:45:39 +08:00 |
|
|
|
28911b6e7c
|
update token
|
2020-06-22 17:45:17 +08:00 |
|
zmr900709
|
d384e6d4e7
|
v
|
2020-06-19 19:20:33 +08:00 |
|
|
|
af5f075861
|
Merge pull request '个人中心' (#28) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/28
|
2020-06-19 18:08:09 +08:00 |
|
|
|
7e71f97e01
|
个人中心
|
2020-06-19 18:07:11 +08:00 |
|
|
|
84d15f6b29
|
Merge pull request '6.18' (#27) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/27
|
2020-06-18 14:58:48 +08:00 |
|
|
|
f0244f8077
|
6.18
|
2020-06-18 14:57:26 +08:00 |
|
|
|
df47e0d357
|
Merge pull request 'zmr' (#26) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/26
|
2020-06-17 12:19:50 +08:00 |
|
zmr900709
|
084ab31b4f
|
v
|
2020-06-17 12:15:33 +08:00 |
|
zmr900709
|
b534c2323e
|
v
|
2020-06-17 12:09:28 +08:00 |
|
|
|
53b9086f5f
|
Merge pull request 'zmr' (#25) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/25
|
2020-06-15 15:42:21 +08:00 |
|
zmr900709
|
b6153a4238
|
v
|
2020-06-15 15:38:32 +08:00 |
|
zmr900709
|
c2916b57b1
|
v
|
2020-06-15 15:31:31 +08:00 |
|
|
|
cbd12d41cd
|
Merge pull request '6.15' (#24) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/24
|
2020-06-15 11:35:35 +08:00 |
|
|
|
b697270eb9
|
6.15
|
2020-06-15 11:34:33 +08:00 |
|
