Commit Graph

624 Commits

Author SHA1 Message Date
686955424b
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-15 15:38:05 +08:00
6f0ed8e3f9
i年时 2020-08-15 15:37:16 +08:00
be2780fbc4
修复 2020-08-15 13:42:51 +08:00
7d13fc8e85
直播 2020-08-15 13:36:16 +08:00
7deb5d312b Merge pull request 'bug 8.14' (#209) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/209
2020-08-14 21:38:48 +08:00
e784bbf596 bug 8.14 2020-08-14 21:38:23 +08:00
55742478b2 Merge pull request 'goods details store route 8.14' (#208) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/208
2020-08-14 20:45:44 +08:00
d79b0c5da7 goods details store route 8.14 2020-08-14 20:45:11 +08:00
gyh
ba4d2dfa51 Merge pull request 'gdpao' (#207) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/207
2020-08-14 20:41:44 +08:00
Gdpao
3da4dad3cb Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh 2020-08-14 20:41:16 +08:00
Gdpao
5c895d247f gdpao 2020-08-14 20:40:38 +08:00
2ddeb4bc61 Merge pull request 'mine css 8.14' (#206) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/206
2020-08-14 20:19:29 +08:00
41d2258a5d mine css 8.14 2020-08-14 20:19:04 +08:00
gyh
da21482a81 Merge pull request 'gdpao_up' (#205) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/205
2020-08-14 19:50:59 +08:00
Gdpao
9158f27afb gdpao_up 2020-08-14 19:49:57 +08:00
6313f642ea Merge pull request 'order details takeawayer 8.14' (#204) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/204
2020-08-14 18:59:15 +08:00
f46cc4d645 order details takeawayer 8.14 2020-08-14 18:58:46 +08:00
7d8027678d Merge pull request 'update uview 8.14' (#203) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/203
2020-08-14 17:57:44 +08:00
2aca3ae153 update uview 8.14 2020-08-14 17:57:13 +08:00
dc03b9f410 Merge pull request '关注' (#202) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/202
2020-08-14 17:53:58 +08:00
d520fe8017
关注 2020-08-14 17:53:23 +08:00
1541851988 Merge pull request '取关' (#201) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/201
2020-08-14 17:46:18 +08:00
ce1c1a4f16
取关 2020-08-14 17:45:52 +08:00
0c40a45155 Merge pull request 'update uview 8.14' (#200) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/200
2020-08-14 17:17:46 +08:00
cb2e91f65a update uview 8.14 2020-08-14 17:17:16 +08:00
f06f211417 Merge pull request 'xbx' (#199) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/199
2020-08-14 17:12:02 +08:00
c0c3f51695
关注列表 2020-08-14 16:51:55 +08:00
aa1d4631b2 Merge pull request 'goods default spec 8.14' (#198) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/198
2020-08-14 15:47:09 +08:00
b266c9c775 goods default spec 8.14 2020-08-14 15:46:43 +08:00
899b93fc4f Merge pull request 'nickname 8.14' (#197) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/197
2020-08-14 14:58:19 +08:00
1f4fac94ae nickname 8.14 2020-08-14 14:57:46 +08:00
12efa8d79c
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-14 14:50:57 +08:00
f6ffcdec64
直播人数 2020-08-14 14:40:01 +08:00
f0c2b00a02 Merge pull request 'goods details spec 8.14' (#196) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/196
2020-08-14 14:04:41 +08:00
9f58e1c7a2 goods details spec 8.14 2020-08-14 14:04:16 +08:00
gyh
cd0e8bbf9e Merge pull request 'gdpaoup' (#195) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/195
2020-08-14 11:35:04 +08:00
Gdpao
ce1a8d6256 gdpaoup 2020-08-14 11:33:57 +08:00
b8681f7c01 Merge pull request 'order spec 8.14' (#194) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/194
2020-08-14 11:31:15 +08:00
505e3354a3 order spec 8.14 2020-08-14 11:30:49 +08:00
4d76db71fe Merge pull request 'order spec 8.14' (#193) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/193
2020-08-14 11:25:26 +08:00
f9224f10cf order spec 8.14 2020-08-14 11:24:44 +08:00
a4a9843bdc Merge pull request '修正了人' (#192) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/192
2020-08-14 11:07:52 +08:00
3713cab533
修正了人 2020-08-14 11:07:17 +08:00
f83fb04e1c Merge pull request 'delete mine history 8.14' (#191) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/191
2020-08-14 10:58:40 +08:00
07ac250ddd delete mine history 8.14 2020-08-14 10:58:05 +08:00
b087d85337 Merge pull request '左滑跳过' (#190) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/190
2020-08-14 10:56:29 +08:00
65c1e2fd63
左滑跳过 2020-08-14 10:55:56 +08:00
736ee9e555 Merge pull request '替换了名字' (#189) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/189
2020-08-14 10:09:09 +08:00
1c3ed37983
替换了名字 2020-08-14 10:07:33 +08:00
0f03c543e1 Merge pull request '红点' (#188) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/188
2020-08-14 10:00:57 +08:00