Commit Graph

87 Commits

Author SHA1 Message Date
6b5ba72b0a Merge pull request '修改预约模块添加预约时间段bug' (#74) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #74
2024-10-25 09:58:23 +08:00
01b75abc2d 修改预约模块添加预约时间段bug 2024-10-25 09:13:27 +08:00
e0b7148121 Merge pull request '付费会员配置' (#71) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #71
2024-10-24 16:43:31 +08:00
khy
017aea38da 付费会员配置 2024-10-24 13:59:45 +08:00
f67342d318 Merge pull request '预约模块修改' (#69) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #69
2024-10-24 09:49:48 +08:00
044668a7c7 Merge pull request '会员记录(后台)' (#70) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #70
2024-10-24 09:43:12 +08:00
khy
e90d9dd5ca 会员记录(后台) 2024-10-24 09:33:51 +08:00
1603d9d525 预约模块修改 2024-10-23 23:13:47 +08:00
208d0a6e97 预约模块添加预约项目管理 2024-10-21 15:51:14 +08:00
f94a161b2f 提交客服话术图片 2024-10-21 15:12:15 +08:00
85a0e9a9b1 后台添加客服人员,话术,留言,自动回复 2024-10-21 10:09:16 +08:00
b9f0591578 Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #51
2024-10-17 11:24:41 +08:00
138ddc13bb 修改积分商城订单记录时间排序 2024-10-17 11:22:54 +08:00
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