Commit Graph

231 Commits

Author SHA1 Message Date
zmr900709
7f0d1063f0 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr 2020-08-20 14:23:32 +08:00
zmr900709
c81ee7e961 1 2020-08-20 14:23:21 +08:00
96d7ad439a Merge pull request '优惠券列表显示,使用优惠券价格计算' (#259) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/259
2020-08-20 11:29:22 +08:00
390bda7c0e 优惠券列表显示,使用优惠券价格计算 2020-08-20 11:28:49 +08:00
a34880e6a6
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-20 11:09:49 +08:00
51823edb12 新人优惠券显示问题,使用优惠券价格问题 2020-08-20 10:25:58 +08:00
e58f571de4
直播添加了下拉刷新 2020-08-20 10:16:40 +08:00
gyh
c4821f888f Merge pull request 'gdpao' (#255) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/255
2020-08-19 19:25:14 +08:00
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