Commit Graph

74 Commits

Author SHA1 Message Date
2c875571ee Merge pull request '会员类型列表' (#49) from khy into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #49
2024-10-17 09:28:44 +08:00
khy
228fe0cc82 会员类型列表 2024-10-17 09:19:31 +08:00
6de437634c 修改积分商城订单提交报错,增加后台积分订单记录 2024-10-16 14:35:09 +08:00
af92c1ca00 Merge pull request '1.后台前端-隐藏优惠券折扣选项2.后台前端-优惠券有效期显示调整' (#46) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #46
2024-10-16 13:57:33 +08:00
13eb6a75a9 1.后台前端-隐藏优惠券折扣选项
2.后台前端-优惠券有效期显示调整
2024-10-16 13:41:12 +08:00
khy
78d3175151 Merge remote-tracking branch 'origin/master' 2024-10-15 19:51:27 +08:00
b7f71f6018 Merge pull request 'Branch_csl' (#44) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #44
2024-10-15 19:50:53 +08:00
khy
da363831e8 付费会员类型,权益 2024-10-15 19:49:01 +08:00
77
02cc14d9f6 替换图标与宫格导航添加一排五个的按钮 2024-10-15 09:38:32 +08:00
77
d13cfad70c 个人中心装修页面优化与组件图标替换 2024-10-12 15:20:19 +08:00
d1c9060ee8 Merge pull request '更新自定义页面积分页面' (#37) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2024-10-09 14:22:11 +08:00
77
678b0ef892 优化装修默认列数 2024-10-09 14:20:26 +08:00
0d796f45d6 Merge pull request '修改预约模块' (#34) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #34
2024-10-09 09:18:47 +08:00
09872a3ace 修改预约模块 2024-10-09 09:17:56 +08:00
ba3273db36 Merge pull request '修改积分模块' (#33) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2024-10-09 09:08:58 +08:00
4eed1940b9 修改积分模块 2024-10-08 20:36:57 +08:00
77
4eca4d4119 更新自定义页面积分页面 2024-10-08 19:58:21 +08:00
bec58cd7eb 合并 2024-10-08 17:50:40 +08:00
884b9110c4 会员卡片管理和会员权益移植 2024-10-08 17:40:59 +08:00
38fd2ecc6a 修改余额改为使用芋道新更新的 2024-10-08 14:10:21 +08:00
77
d83522607b 将装修列表页面去掉直接在菜单栏里面添加按钮跳转到对应的装修页面 2024-10-05 11:47:25 +08:00
77
d477567030 优化3 2024-09-30 19:02:16 +08:00
77
23fd79bdfe 优化首页装修 2024-09-30 16:02:23 +08:00
0db74fac5b 会员权益-修改状态字典 2024-09-30 08:55:36 +08:00
1d965addd4 Merge branch 'sjy-one' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-30 01:10:08 +08:00
8a7f2b2b28 修改预约模块构建报错 2024-09-30 00:38:00 +08:00
f7577f961a Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-29 23:44:54 +08:00
9191ca6c59 付费会员列表模块 2024-09-29 23:34:42 +08:00
2d9889af9f 付费会员权益模块 2024-09-29 22:35:34 +08:00
1382e792eb 修改预约模块 2024-09-29 20:43:59 +08:00
1e0ee79fb9 Merge pull request '17、后台选择页面添加新增按钮页面路径' (#27) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #27
2024-09-29 18:38:04 +08:00
8d61fbaef7 Merge pull request '新增积分商品,新增拼团、秒杀的小程序以及后端商品查询接口' (#26) from zzw-one into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is failing
Reviewed-on: #26
2024-09-29 18:05:06 +08:00
adc58e6e05 新增积分商品,新增拼团、秒杀的小程序以及后端商品查询接口 2024-09-29 18:03:25 +08:00
77
03f6ec8547 17、后台选择页面添加新增按钮页面路径 2024-09-29 15:27:17 +08:00
79de0c59ab 页面文字修改 2024-09-29 10:15:12 +08:00
0b8897ecc4 后台-商品查询新增是否仅会员可见 2024-09-27 17:52:33 +08:00
7a73b09b4c 商品推荐和付费会员添加到营销设置页面中 2024-09-27 15:57:11 +08:00
7728cc456a 推荐商品类型-包括促销推荐 2024-09-27 13:55:01 +08:00
b973bee0b3 Merge pull request '用户详情头像调整' (#23) from zzw-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2024-09-27 11:36:27 +08:00
73ce515567 Merge pull request '16、我的服务菜单的四个字用组件标题替换' (#22) from Branch_csl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #22
2024-09-27 11:36:14 +08:00
16bda542c0 用户详情头像调整 2024-09-27 11:30:18 +08:00
77
2f145ec315 15、后台我的菜单图片上传文字修改(修改为52*52) 2024-09-26 11:29:05 +08:00
77
12b71aeb60 16、我的服务菜单的四个字用组件标题替换
All checks were successful
continuous-integration/drone/pr Build is passing
2024-09-26 11:24:43 +08:00
3b70742285 Merge pull request '修改预约模块bug' (#21) from sjy into master
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
Reviewed-on: #21
2024-09-25 18:15:17 +08:00
27faa2438f 修改预约模块bug
Some checks reported errors
continuous-integration/drone/pr Build was killed
2024-09-25 18:12:57 +08:00
46c7ff60c8 用户管理新增余额字段
All checks were successful
continuous-integration/drone/pr Build is passing
2024-09-25 18:06:42 +08:00
fd2b09d680 漏交的前端页面 2024-09-25 17:57:54 +08:00
ae40079e66 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-25 15:44:30 +08:00
b948918240 Merge pull request '9、我的服务后台与小程序的图标大小调整与显示一行四列并且不用轮播直接向下排列' (#16) from Branch_csl into master
Reviewed-on: #16
2024-09-25 15:22:05 +08:00
77
8af485a215 9、我的服务后台与小程序的图标大小调整与显示一行四列并且不用轮播直接向下排列
10、后台 营销文章装修模块调整为列表(无法选择某一篇文章只能显示全部)
 11、后台 装修用户组件隐藏
2024-09-25 15:17:18 +08:00