Commit Graph

479 Commits

Author SHA1 Message Date
zmr900709
7e4b4eef18 v 2020-07-13 08:39:42 +08:00
zmr900709
2479d587cd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-11 15:42:05 +08:00
zmr900709
97a8dad01e v 2020-07-11 15:41:51 +08:00
4dd2694839 Merge pull request 'zhy' (#55) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/55
2020-07-10 17:40:04 +08:00
e88d618fce Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-10 17:39:09 +08:00
7cff88b5d6 order 2020-07-10 17:38:21 +08:00
d925db690b Merge pull request 'xbx' (#54) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/54
2020-07-10 15:58:42 +08:00
5f080a3c9d
搜索点击时间 2020-07-10 15:58:03 +08:00
73ffe92169
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-10 15:57:28 +08:00
66f21e230a Merge pull request 'upload file' (#53) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/53
2020-07-10 09:03:51 +08:00
a5b83f31a8 upload file 2020-07-10 09:03:19 +08:00
zmr900709
699b94e472 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-09 16:35:37 +08:00
zmr900709
10bbccc2bd v 2020-07-09 16:35:23 +08:00
42c8ec9454 Merge pull request 'api' (#52) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/52
2020-07-08 18:15:22 +08:00
9ffdfa652a api 2020-07-08 18:14:41 +08:00
aea71b6354
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-08 08:44:11 +08:00
396e795943
搜索修改 2020-07-08 08:43:39 +08:00
a5a06003a5 Merge pull request 'zhy' (#51) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/51
2020-07-07 17:49:09 +08:00
c4fb80d06b api 2020-07-07 17:48:20 +08:00
5ede514a02 api 2020-07-07 17:47:00 +08:00
77083c0404 Merge pull request 'xbx' (#50) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/50
2020-07-07 14:47:13 +08:00
a127f08375
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-07 14:46:47 +08:00
2910af7bd7
商品详情 2020-07-07 14:45:57 +08:00
8575c8143a Merge pull request 'zhy' (#49) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/49
2020-07-06 17:35:46 +08:00
8dc45b57fd api 2020-07-06 17:32:29 +08:00
d94fb80ee2
弹窗优化 2020-07-06 11:42:12 +08:00
709a315403
弹出曾 2020-07-06 10:25:54 +08:00
c6bea7a19a Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-06 09:21:28 +08:00
61065361e6 Merge pull request '删除un' (#48) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/48
2020-07-06 09:21:00 +08:00
8060a433b3 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-07-06 09:20:44 +08:00
6f0c86c58f
删除un 2020-07-06 09:20:36 +08:00
81799a07c5 Merge pull request '商家首页' (#47) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/47
2020-07-06 09:11:18 +08:00
40f03de79f
商家首页 2020-07-06 09:10:34 +08:00
zmr900709
3d8cfd23d4 v 2020-07-04 11:03:20 +08:00
f27d08c224 api 2020-07-03 17:44:58 +08:00
5308f50e4e Merge pull request 'change mobile' (#46) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/46
2020-07-03 11:07:40 +08:00
aeacee3e65 Merge pull request 'zmr' (#45) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/45
2020-07-03 10:59:01 +08:00
zmr900709
64b43b6b3d v 2020-07-03 10:56:45 +08:00
afca8ed2f3 change mobile 2020-07-03 10:53:10 +08:00
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