Block a user
后台-客服页面调整和客服转接功能(前端转接后刷新未实现)
ade1a54439
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
eac7fc313d
Merge pull request 'khy1' (#75) from khy1 into master
e650bab63b
会员支付
0e37da8584
后台-客服页面调整和客服转接功能
32a1f6b109
会员支付
81be16bd6c
后台-客服跳转
314cc090ee
Merge pull request '会员余额支付' (#68) from khy1 into master
41bcb2c9ea
会员余额支付
c613b2e3c1
Merge pull request '会员回显' (#67) from khy1 into master
a35f333ec2
会员回显
2f62a01f02
支付方式接口调整
1b70fdd086
Merge pull request '会员类型列表' (#62) from khy1 into master
9465085136
会员类型列表
6f5f3dd8b2
Merge pull request '重复充值余额处理' (#61) from cxw into master
1d50394776
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
e9609ce7d5
余额充值微信未支付时,重复增加余额处理
5177793676
Merge pull request '修改支付状态' (#60) from khy1 into master
9d92e8c7f0
修改支付状态
334c3efbc0
Merge pull request '会员支付(试用)' (#59) from khy1 into master
aed2d035c1
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
8cc065e598
Merge pull request '添加预约信息' (#52) from sjy-two into master
3bc97951e5
添加预约信息
e3d554da42
退款空指针处理
6ffa6d1af4
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
b9f0591578
Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master
2f7ffb4032
Merge pull request '会员权益列表' (#50) from khy1 into master
138ddc13bb
修改积分商城订单记录时间排序
9860ff79d5
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
3eead082f8
Merge pull request '修改积分商城订单提交报错,增加后台积分订单记录' (#47) from sjy-two into master
6de437634c
修改积分商城订单提交报错,增加后台积分订单记录
8b801be4f3
构建脚本调整
df69d98073
挂载本地图片路径
af92c1ca00
Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master
53128f0685
Merge pull request 'khy' (#45) from khy into master
78d3175151
Merge remote-tracking branch 'origin/master'
13eb6a75a9
1.后台前端-隐藏优惠券折扣选项
b7f71f6018
Merge pull request 'Branch_csl' (#44) from Branch_csl into master
02cc14d9f6
替换图标与宫格导航添加一排五个的按钮
00551ec8fe
Merge pull request '秒杀列表改回获取全部商品' (#43) from cxw into master
d13cfad70c
个人中心装修页面优化与组件图标替换
0da862a180
秒杀列表改回获取全部商品
8fc219ad38
Merge pull request '修改预约提交接口' (#42) from sjy-two into master
6f2f58fbe9
修改预约提交接口
ad20ae2c4b
Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41) from cxw into master
9ecb0ff24a
Merge pull request '秒杀活动和拼团活动接口调整' (#40) from cxw into master
6c1b724d93
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
7581ebfa77
秒杀活动首页显示正在进行活动修改
9ba1fe2fdd
Merge pull request '秒杀和拼团列表过滤已过期活动' (#39) from cxw into master
7954250450
Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
8f7452f7ac
秒杀活动指定显示个数调整
ec7046aab0
小程序秒杀活动接口过滤已过期的
2a93813e68
小程序拼团活动接口过滤已过期的
827563ce06
后台-是否激活卡字段补充
bec58cd7eb
合并
2d18b5fdbe
Merge pull request 'Branch_csl' (#31) from Branch_csl into master
d83522607b
将装修列表页面去掉直接在菜单栏里面添加按钮跳转到对应的装修页面
d477567030
优化3
23fd79bdfe
优化首页装修