Commit Graph

993 Commits

Author SHA1 Message Date
ad68dd81d4 Merge pull request '拼团列表加载更多' (#398) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/398
2020-11-25 09:02:42 +08:00
3840074b00 拼团列表加载更多 2020-11-25 09:00:41 +08:00
3a880711ad Merge pull request '秒杀查看更多' (#397) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/397
2020-11-24 12:09:13 +08:00
5cd7597068 秒杀查看更多 2020-11-24 12:07:33 +08:00
qxf
e916119b2b Merge pull request 'qxf' (#396) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/396
2020-11-20 15:56:24 +08:00
亓雪峰
1ce56510b1 Merge branch 'master' of https://git.luyuan.tk/luyuan/deming into qxf 2020-11-20 11:18:49 +08:00
d552a03ab4 Merge pull request '添加拒绝协议按钮' (#395) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/395
2020-11-20 10:22:12 +08:00
9f6bcdfa94 添加拒绝协议按钮 2020-11-20 10:20:51 +08:00
亓雪峰
63353b6877 新增 设置页新增“用户协议与隐私政策”的选项卡 2020-11-19 18:09:17 +08:00
qxf
74f083d6c1 Merge pull request 'qxf' (#394) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/394
2020-11-19 17:08:26 +08:00
亓雪峰
7977bd795c 优化 初次登录的“用户协议”改为“用户协议与隐私” 2020-11-19 17:05:45 +08:00
亓雪峰
e044812a7c 修复 添加iOS审核所需要的位置信息 2020-11-13 10:34:05 +08:00
亓雪峰
363349afe6 修复 添加iOS审核所需要的位置信息 2020-11-12 16:18:51 +08:00
亓雪峰
456edb252e 修复 登录时iOS平台暂时隐藏第三方登录,方便过审 2020-11-12 15:19:15 +08:00
亓雪峰
ecfc79fbf8 优化 图标路径 2020-11-12 15:11:00 +08:00
亓雪峰
fb297e8a8c 修复 nvue部分样式编译错误的问题 2020-11-11 12:00:07 +08:00
qxf
1a15f1e3e6 Merge pull request 'qxf 修复订单列表中退款状态显示错误的问题' (#393) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/393
2020-10-19 11:49:52 +08:00
亓雪峰
497d49eceb fix 修复订单列表中退款状态显示错误的问题 2020-10-19 11:46:50 +08:00
亓雪峰
0886ec74ea Update chatservice.js 2020-10-14 23:22:26 +08:00
qxf
ebff801c7e Merge pull request 'Update manifest.json' (#392) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/392
2020-10-14 11:00:47 +08:00
亓雪峰
215730f8d1 Update manifest.json 2020-10-14 10:47:00 +08:00
483dfba475 Merge pull request 'qxf 修改申请退款成功的提示框, 消息-关注达人改为展示用户昵称' (#391) from qxf into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/391
2020-10-14 10:45:39 +08:00
亓雪峰
f8f3cf08f2 修改申请退款成功的提示框 2020-10-13 14:30:01 +08:00
亓雪峰
55e0bc7cd9 消息-关注达人改为展示用户昵称
This reverts commit 7a2edcfd1c0fc7c546389a3e63dd0d7892e65e0a.
2020-10-13 14:29:20 +08:00
f87bd2cfba Merge pull request '更换' (#390) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/390
2020-09-25 17:43:29 +08:00
9f5498ac7c
更换 2020-09-25 17:42:36 +08:00
gyh
d33bc8965a Merge pull request 'avater' (#389) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/389
2020-09-23 09:56:49 +08:00
Gdpao
3115ac9447 avater 2020-09-23 09:55:30 +08:00
gyh
b914ba7c58 Merge pull request '更新 'pageE/mine/MineInfo.vue'' (#388) from gyh-patch-1 into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/388
2020-09-22 09:36:50 +08:00
gyh
990db30e77 更新 'pageE/mine/MineInfo.vue' 2020-09-22 09:36:39 +08:00
gyh
875aeeb63a Merge pull request 'gdpao' (#387) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/387
2020-09-22 09:34:31 +08:00
Gdpao
7304d3edb6 gdpao 2020-09-22 09:32:56 +08:00
aebdb23b6d Merge pull request '商品分类' (#386) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/386
2020-09-22 09:14:53 +08:00
c4c19871d8 商品分类 2020-09-22 09:13:54 +08:00
c85f1aeead
修改字体大小 2020-09-21 17:37:29 +08:00
977d38ce18 Merge pull request '增加订单平台已退款状态' (#385) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/385
2020-09-21 17:03:28 +08:00
194710f97b 增加订单平台已退款状态 2020-09-21 16:58:25 +08:00
1c14a23d76 Merge pull request '增加订单平台已退款状态' (#384) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/384
2020-09-21 16:43:31 +08:00
611066e778 增加订单平台已退款状态 2020-09-21 16:42:38 +08:00
bc1d0b8e4c Merge pull request '增加订单平台已退款状态' (#383) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/383
2020-09-21 15:51:23 +08:00
31027d10e4 增加订单平台已退款状态 2020-09-21 15:50:26 +08:00
c606b9b3ce Merge pull request '修改字体大小' (#382) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/382
2020-09-21 08:41:39 +08:00
gyh
bf765ba231 Merge pull request 'gdpao' (#381) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/381
2020-09-19 20:02:01 +08:00
Gdpao
645b3f65c1 gdpao 2020-09-19 20:01:07 +08:00
ded4488f89 Merge pull request '实体店送洗可不传图片' (#380) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/380
2020-09-19 16:44:04 +08:00
2b2667df2a 实体店送洗可不传图片 2020-09-19 16:43:01 +08:00
79f0040688 Merge pull request '图标' (#379) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/379
2020-09-18 16:41:00 +08:00
00670f4501
图标 2020-09-18 16:40:21 +08:00
db20e52e48 Merge pull request '去掉首页下拉刷新' (#378) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/378
2020-09-18 16:37:11 +08:00
d5cf7ae2fb 去掉首页下拉刷新 2020-09-18 16:36:35 +08:00