Commit Graph

240 Commits

Author SHA1 Message Date
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
92deb50c1a
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-09 14:30:04 +08:00
2f123fbb48
首页基本完成 2020-06-09 14:29:43 +08:00
e795d7752a Merge pull request '6.9' (#17) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/17
2020-06-09 10:13:18 +08:00
55b5213e10 6.9 2020-06-09 10:12:32 +08:00
5738ea3dde Merge pull request 'zhy' (#16) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/16
2020-06-09 09:22:31 +08:00
768736514b 6.9 2020-06-09 08:56:37 +08:00
72034e4fa6 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-06-08 15:30:20 +08:00
6ff006e59b Merge pull request '6.8' (#15) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/15
2020-06-08 15:28:16 +08:00
b37bb911bc Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-06-08 15:23:51 +08:00
233cb82ee4 6.8 2020-06-08 15:23:23 +08:00
zmr900709
82babef77f v 2020-06-08 11:32:07 +08:00
63f21c3021
修复首页报错 2020-06-04 09:39:08 +08:00
86f813f93c Merge pull request '删除空白' (#14) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/14
2020-06-04 08:45:04 +08:00
86c243a255
删除空白 2020-06-04 08:42:04 +08:00
0dd0f55245 Merge pull request '6.4' (#13) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/13
2020-06-04 08:23:42 +08:00
e8c74df8a0 6.4 2020-06-04 08:21:34 +08:00
74eccdf363 Merge pull request 'xbx' (#12) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/12
2020-06-03 17:18:00 +08:00
4b4619f54a
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-03 17:17:17 +08:00
d71c7fcc24
搜索完成 2020-06-03 17:17:05 +08:00
b5ef323612
达人详情完成 2020-06-03 10:53:38 +08:00
ab89ead240 Merge pull request '6.3' (#11) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/11
2020-06-03 09:16:16 +08:00
80591e1e64 6.3 2020-06-03 09:14:04 +08:00
5ed9298738 Merge pull request 'xbx' (#10) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/10
2020-06-03 08:28:02 +08:00
0f3073e577
关注页面完成 2020-06-02 17:24:13 +08:00
8162188b03
首页完成 2020-06-02 16:45:02 +08:00
2d9af1ba45
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 16:10:07 +08:00
45079580d4 Merge pull request 'zhy' (#8) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/8
2020-06-02 16:09:50 +08:00
0a6766f653 6.2 2020-06-02 16:08:35 +08:00
cf16d0750f Merge pull request 'v' (#9) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/9
2020-06-02 16:03:14 +08:00
19dba0cd67 Merge branch 'master' into zmr 2020-06-02 16:03:09 +08:00
zmr900709
14dec1fd04 v 2020-06-02 15:59:01 +08:00