Commit Graph

190 Commits

Author SHA1 Message Date
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
3713cab533
修正了人 2020-08-14 11:07:17 +08:00
1c3ed37983
替换了名字 2020-08-14 10:07:33 +08:00
bc2731f1f9
红点 2020-08-14 10:00:27 +08:00
90e9e06915
名字 2020-08-14 09:26:59 +08:00
2a58f2f63f
收起键盘 2020-08-14 09:19:11 +08:00
7393fefdf4 Merge pull request '修复' (#186) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/186
2020-08-14 08:50:27 +08:00
572271d807
修复 2020-08-13 17:28:08 +08:00
b9b32fb655 mine index css 8.13 2020-08-13 17:18:44 +08:00
ed6674f3ff
直播分也 2020-08-13 16:21:53 +08:00
1b0528f7dc
直播聊天是状态 2020-08-13 16:05:43 +08:00
3b01c1acca order 8.13 2020-08-13 12:13:12 +08:00
1936105b1b Merge pull request 'store 8.13' (#170) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/170
2020-08-13 11:55:13 +08:00
02639fc9e1 store 8.13 2020-08-13 11:54:44 +08:00
54dd8a6eb0
添加了分也 2020-08-13 11:52:05 +08:00
eb886368e9
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-13 10:09:49 +08:00
e55aa62bcc
一部分完成 2020-08-13 10:04:50 +08:00
Gdpao
6d4d8c5675 gdpaoup 2020-08-12 22:00:01 +08:00
gyh
529325e203 Merge pull request 'GDPAO' (#164) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/164
2020-08-12 15:36:55 +08:00
Gdpao
22812469a8 GDPAO 2020-08-12 15:35:47 +08:00
ab4e50a9ae
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-12 11:33:34 +08:00
d2c6bcb1bc
列表刷新 2020-08-12 10:43:47 +08:00
d19771b182 show price 8.12 2020-08-12 10:10:59 +08:00
a45db4afbf
赋值page1 2020-08-12 09:32:02 +08:00
gyh
1db45d40a7 Merge pull request 'gdpaoup' (#157) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/157
2020-08-11 22:18:08 +08:00
Gdpao
ef79718190 gdpaoup 2020-08-11 22:15:58 +08:00
0e7139bc16
红点 这找曾 2020-08-11 18:27:19 +08:00
9a0dc4c6d1 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 15:40:53 +08:00
37d8ab7a2b fixing bug 8.11 2020-08-11 15:38:43 +08:00
Gdpao
703689d272 gdpaomg1 2020-08-11 11:12:32 +08:00
def8f0cf1b Merge pull request 'xbx' (#151) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151
2020-08-11 10:26:19 +08:00
6984ea9374
消息 2020-08-11 10:25:41 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
Gdpao
e6f73f01cd gdpao 2020-08-10 19:19:29 +08:00
gyh
52bce327cc Merge pull request 'gdpaoup' (#145) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
2020-08-10 19:08:19 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
33b0137c06 Merge pull request 'zhy' (#144) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
2020-08-10 17:47:31 +08:00
8c3121d5ed new member 8.9 2020-08-10 17:38:54 +08:00
8df5bc2701
状态 2020-08-10 17:30:41 +08:00
Gdpao
2e95172a75 upct 2020-08-09 19:11:12 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +08:00
9a4e4f5efe Merge pull request 'bug 8.9' (#140) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/140
2020-08-09 18:40:07 +08:00
9b93b6a5a9 bug 8.9 2020-08-09 18:39:35 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
d00b4a75ac Merge pull request 'specil 8.9' (#138) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/138
2020-08-09 14:24:30 +08:00