Commit Graph

374 Commits

Author SHA1 Message Date
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
4e989fc1c0
. 2020-06-02 15:53:33 +08:00
ba1db0eb05
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 15:37:04 +08:00
c02c1bef74
首页基本完成 2020-06-02 15:37:01 +08:00
640948442b Merge pull request 'zmr' (#7) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/7
2020-06-02 15:35:36 +08:00
5b36365a76 6.2 2020-06-02 15:35:19 +08:00
zmr900709
abb23e3089 v 2020-06-02 15:35:03 +08:00
zmr900709
9bf8ed444f v 2020-06-02 12:01:13 +08:00
04855a770c 6.2 2020-06-02 11:42:13 +08:00
963dc86404 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-06-02 11:41:33 +08:00
zmr900709
7856c25009 v 2020-06-02 11:40:14 +08:00
35799b3325 Merge pull request 'xbx' (#6) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/6
2020-06-02 11:35:41 +08:00
885d15331e
Merge branch 'xbx' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 11:35:24 +08:00
f913563727 Merge branch 'master' into xbx 2020-06-02 11:35:13 +08:00
abc463f59d
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-06-02 11:35:04 +08:00
2d212ec8d2
引入了uview 2020-06-02 11:34:09 +08:00
c3f438a79a
添加组建库 2020-06-02 11:29:31 +08:00