Commit Graph

104 Commits

Author SHA1 Message Date
0dbf080c99 延长构建超时时间 2024-09-30 09:47:29 +08:00
ba3fcd940e Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-09-30 09:46:36 +08:00
60839f8f7d Merge pull request '修改预约模块构建报错' (#29) from sjy-one into master
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
Reviewed-on: #29
2024-09-30 09:43:26 +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
9dd4345b7d Merge pull request '修改预约模块' (#28) from sjy-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #28
2024-09-29 22:53:59 +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
07f352c820 更新 yudao-server/run.sh
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-29 18:28:41 +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
53e30aebaa Merge pull request 'cxw' (#25) from cxw into master
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #25
2024-09-29 18:04:43 +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
95ae012aab 商品查询参数新增 是否付费会员 2024-09-27 17:51:44 +08:00
88ac93c477 商品新增仅会员查看字段 2024-09-27 15:57:40 +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
fb91cef9e9 更新 .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-09-26 09:21:56 +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
9b66eb560e Merge pull request '构建脚本微调' (#20) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2024-09-25 18:15:06 +08:00
25b5767474 构建脚本微调 2024-09-25 18:14:05 +08:00
27faa2438f 修改预约模块bug
Some checks reported errors
continuous-integration/drone/pr Build was killed
2024-09-25 18:12:57 +08:00
5f347db62b 构建脚本微调
All checks were successful
continuous-integration/drone/pr Build is passing
2024-09-25 18:12:23 +08:00
8543ddd8be Merge pull request '用户管理新增余额字段' (#19) from zzw-one into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #19
2024-09-25 18:09:35 +08:00
46c7ff60c8 用户管理新增余额字段
All checks were successful
continuous-integration/drone/pr Build is passing
2024-09-25 18:06:42 +08:00
c8d08a9963 Merge pull request 'cxw' (#18) from cxw into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #18
2024-09-25 18:00:07 +08:00
4d03375b41 构建脚本 2024-09-25 17:59:13 +08:00
fd2b09d680 漏交的前端页面 2024-09-25 17:57:54 +08:00
7ba3baef66 Merge pull request 'cxw' (#17) from cxw into master
Some checks reported errors
continuous-integration/drone Build was killed
Reviewed-on: #17
2024-09-25 17:07:27 +08:00
268bc18530 后台-修改余额功能存入钱包流水 2024-09-25 17:05:46 +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
cc63700872 后台-修改余额功能 2024-09-25 14:58:50 +08:00
3909ce665e 后台-修改余额功能 2024-09-25 14:24:12 +08:00
326dac91b5 Merge pull request '新增积分商品选择、满减送优化' (#14) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #14
2024-09-24 18:06:18 +08:00
3dd6b19205 新增积分商品选择、满减送优化 2024-09-24 18:01:05 +08:00
de0408aaad Merge pull request '优化1' (#13) from Branch_csl into master
Reviewed-on: #13
2024-09-20 18:01:44 +08:00
77
dd810ca199 优化1 2024-09-20 17:56:51 +08:00