Commit Graph

248 Commits

Author SHA1 Message Date
91241682de 7.15 2020-07-15 17:38:41 +08:00
ffb216870c Merge pull request 'vuex' (#63) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/63
2020-07-15 16:54:23 +08:00
zmr900709
b04b2ffd16 vuex 2020-07-15 16:52:39 +08:00
5773aba1a9 Merge pull request 'zmr' (#62) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/62
2020-07-15 16:47:16 +08:00
zmr900709
46da0894b4 vuex 2020-07-15 16:46:33 +08:00
76a0e7e8bd Merge pull request '7.15' (#60) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/60
2020-07-15 16:23:14 +08:00
cc9fb2b48b 7.15 2020-07-15 16:21:43 +08:00
zmr900709
1918062639 vue install 2020-07-15 16:16:40 +08:00
zmr900709
f662e813a7 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-15 16:04:41 +08:00
zmr900709
69a4517bb5 null 2020-07-15 16:04:31 +08:00
1854ffff03 Merge pull request 'zhy' (#59) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/59
2020-07-14 17:44:07 +08:00
4ab7d33643 7.14 2020-07-14 17:43:15 +08:00
b83b375945 retrieve file 2020-07-14 10:13:27 +08:00
d1e1934239 Merge pull request 'order' (#58) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/58
2020-07-14 09:16:39 +08:00
700ae94f79 order 2020-07-14 09:15:51 +08:00
e803150203 Merge pull request 'zmr' (#57) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/57
2020-07-14 08:37:01 +08:00
zmr900709
580f9e1d9e Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-07-14 08:34:51 +08:00
zmr900709
4140c256a0 v 2020-07-14 08:30:28 +08:00
58b02c7432 Merge pull request 'zmr' (#56) from zmr into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/56
2020-07-13 11:27:15 +08:00
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