Commit Graph

273 Commits

Author SHA1 Message Date
Gdpao
69760e6377 gdpao 2020-08-19 19:24:14 +08:00
dc636e30b7 广告位跳转 2020-08-19 16:59:06 +08:00
5dd4023f97 调整个人中心首页,添加物流无信息提示 2020-08-19 15:19:25 +08:00
86d765d6ba order number 8.19 2020-08-19 11:21:31 +08:00
9c388e898c
替换域名 2020-08-18 15:29:52 +08:00
711eeadc28 Merge pull request 'xbx' (#237) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/237
2020-08-18 15:11:24 +08:00
8286dbfa58
替换url 2020-08-18 15:10:43 +08:00
cb95d1ead1
链接登录退出 2020-08-18 15:08:42 +08:00
689aecc572 写死首页拼团推荐的头像 2020-08-18 12:12:01 +08:00
9f17c5478c
提交 2020-08-18 10:43:15 +08:00
Gdpao
2a5e4b89b2 gdpao2 2020-08-17 20:32:11 +08:00
gyh
fd31d14881 Merge pull request 'gdpaon' (#226) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/226
2020-08-17 19:34:48 +08:00
Gdpao
aae9f78a91 gdpaon 2020-08-17 19:33:55 +08:00
d0d034cd7f
直播暂无消息 2020-08-17 17:49:18 +08:00
d8a92db5c2
直播关注 2020-08-17 17:30:51 +08:00
gyh
f77b4ebc02 Merge pull request 'gdpao' (#223) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/223
2020-08-17 16:58:52 +08:00
Gdpao
b1a705e0f8 gdpao 2020-08-17 16:57:23 +08:00
e7932d26ce
新增 701 2020-08-17 15:14:32 +08:00
884bf6945f
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-17 09:45:42 +08:00
3be650b24e
修复链接失败 2020-08-17 09:44:47 +08:00
gyh
9029e3c8ba Merge pull request 'gdpaoup' (#216) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/216
2020-08-15 19:14:58 +08:00
Gdpao
c2346375c8 gdpaoup 2020-08-15 19:14:12 +08:00
e427748a79 delete chat 8.15 2020-08-15 17:44:49 +08:00
27470faee1
完成 2020-08-15 15:47:29 +08:00
05aa790d32
添加默认头像 2020-08-15 15:42:00 +08:00
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
7d13fc8e85
直播 2020-08-15 13:36:16 +08:00
e784bbf596 bug 8.14 2020-08-14 21:38:23 +08:00
41d2258a5d mine css 8.14 2020-08-14 20:19:04 +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
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
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
9631e9f827 specil 8.9 2020-08-09 14:23:59 +08:00
gyh
097f7e3cba Merge pull request 'gdpao' (#137) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/137
2020-08-09 11:33:25 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
817c886d84 Merge branch 'master' into xbx 2020-08-08 17:31:25 +08:00
5abe5620f5
勉强解决 2020-08-08 16:14:25 +08:00
9e96eeb575
成功 2020-08-08 15:40:48 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00
6eeebf25c0
清空消息 2020-08-07 17:37:23 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +08:00
57fcf69974
聊天完成 2020-08-07 16:54:54 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
fc86ad2579
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 11:41:03 +08:00
eb0d648f6a
完成 2020-08-07 11:40:13 +08:00
Gdpao
2afd55f79e gdpaomg 2020-08-06 20:46:40 +08:00
Gdpao
090b7cc753 gdpaoup 2020-08-06 20:42:03 +08:00
e6b7b50a1e
聊天本地缓存 2020-08-06 15:57:56 +08:00