Commit Graph

221 Commits

Author SHA1 Message Date
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
3f63d8ade9 Merge pull request 'xbx' (#23) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/23
2020-06-15 10:01:08 +08:00
71cd101d97
接口 2020-06-15 10:00:14 +08:00
ee16ae96e0
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-15 08:50:42 +08:00
bce0d0328e
一部分 2020-06-15 08:49:26 +08:00
09f11d7d44
shop 2020-06-11 16:37:52 +08:00
55238876a8
shop 2020-06-11 16:12:04 +08:00
9f9457443e Merge pull request '个人中心主页位置' (#22) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/22
2020-06-11 10:27:22 +08:00
2edbc371ed 个人中心主页位置 2020-06-11 10:25:02 +08:00
2eb42caeaa Merge pull request 'zmr' (#21) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/21
2020-06-11 10:00:46 +08:00
16d586a50b
删除tab 2020-06-11 09:42:44 +08:00
79ce809325
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-11 09:34:45 +08:00
72a29af788
商城首页 2020-06-11 09:34:23 +08:00
zmr900709
120be9e4bf Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-06-11 09:17:38 +08:00
zmr900709
dcb19f420f 完成 2020-06-11 08:43:51 +08:00
19aaa9960e Merge pull request 'cart' (#20) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/20
2020-06-10 16:08:44 +08:00
e9bf1641c3 cart 2020-06-10 16:06:01 +08:00
ccef8eb3e3 Merge pull request '6.9' (#19) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/19
2020-06-09 17:33:48 +08:00
660413e929 6.9 2020-06-09 17:33:12 +08:00
025fc9b5db Merge pull request 'xbx' (#18) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/18
2020-06-09 14:31:14 +08:00