Commit Graph
138 Commits
Author SHA1 Message Date
dzc a23504355b fix:商户bug修改 2025-01-14 09:32:39 +08:00
ctw 92c5680ed7 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-13 16:03:20 +08:00
ctw 7f09bed91d 食堂的所有表单校验修改 2025-01-13 16:03:13 +08:00
zjf 6ceaa905cb 整理 2025-01-13 15:48:39 +08:00
dzc a094b69647 1 2025-01-13 10:59:27 +08:00
dzc 5765c40a75 Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud 2025-01-13 10:57:49 +08:00
dzc 670d81415d feat:批量充值统计 2025-01-13 10:57:44 +08:00
ctw 8af084c695 Merge remote-tracking branch 'biz-pc-cloud/master' 2025-01-13 10:48:51 +08:00
ctw d5b5c463e8 1 2025-01-13 10:48:00 +08:00
ctw ab7ca3fc04 1 2025-01-12 21:59:44 +08:00
ctw de2c93c4c8 Merge remote-tracking branch 'biz-pc-cloud/master' 2025-01-12 21:58:41 +08:00
ctw 33d90c45b0 修改每日菜谱 2025-01-12 21:51:34 +08:00
dzc cd86ae5521 feat:审批 2025-01-12 20:49:49 +08:00
ctw 002f8ad6b1 修改每日菜谱 2025-01-12 15:42:17 +08:00
dzc f5c3e0b0ea feat:订单页面 2025-01-11 18:08:01 +08:00
dzc e572860a0c Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-11 15:53:45 +08:00
dzc 087d49c6ac fix:硬件管理 2025-01-11 15:53:42 +08:00
ctw b4ff730fc8 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-11 12:08:30 +08:00
ctw 29e9f30eb7 添加首页的导航菜单是否显示 2025-01-11 12:08:02 +08:00
zjf 4d2494aab0 整理 2025-01-10 13:22:43 +08:00
zjf 9f73360b42 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
# Conflicts:
#	.env.development
2025-01-10 12:36:06 +08:00
zjf 7ffa55a2d6 env 2025-01-10 12:35:24 +08:00
dzc 5f757796c8 feat:商户权限 2025-01-10 11:23:44 +08:00
dzc 6fefe9d69c Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-09 20:51:28 +08:00
dzc 28447c4a6c feat:二维码核销 2025-01-09 20:51:24 +08:00
ctw 9821ae2345 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-09 19:55:48 +08:00
ctw 293beedcf8 每日菜品 2025-01-09 19:55:43 +08:00
dzc dbe572a155 fix:商户下拉 2025-01-09 13:27:09 +08:00
dzc 4891ac46b2 feat:退款详情 2025-01-09 13:02:54 +08:00
dzc 1b31fe32f9 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-09 09:21:35 +08:00
dzc 99676b6e09 feat:订单页面 2025-01-09 09:21:31 +08:00
ctw 53d8d1f811 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-08 17:53:00 +08:00
ctw 9413207905 超市表单修改布局并添加商户选项 2025-01-08 17:29:53 +08:00
zjf fc4f974171 Merge remote-tracking branch 'origin/master' 2025-01-08 17:03:59 +08:00
zjf 41d4439efe 整理 2025-01-08 17:03:42 +08:00
ctw 1a8f5192cb 调整部分价格换算,调整部分表单布局 2025-01-08 16:24:57 +08:00
ctw 39bc822b2c 商品价格换算 2025-01-08 12:59:08 +08:00
ctw 40896dfb18 1 2025-01-08 12:38:52 +08:00
ctw ad895f0b3e Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-08 11:02:23 +08:00
ctw 7059d55377 商品分类下拉选择 2025-01-08 11:02:16 +08:00
dzc ce253b22ee 1111111 2025-01-08 11:00:54 +08:00
ctw 75750cea2f Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 18:25:40 +08:00
ctw 79497d7b05 商户下拉选择 2025-01-07 18:25:20 +08:00
dzc d940000ef0 feat:充值、消费、退款记录 2025-01-07 18:22:21 +08:00
dzc 301c290a42 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud
# Conflicts:
#	.env.development
2025-01-07 17:40:51 +08:00
dzc 79be4b989d feat:售后订单代码生成 2025-01-07 17:40:38 +08:00
ctw 5da50dbc19 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 17:04:44 +08:00
ctw 96d803a6db 样式优化 2025-01-07 17:03:45 +08:00
dzc d547d8eef8 Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud 2025-01-07 16:09:15 +08:00
dzc 48b5ad63d4 feat:二维码列表 2025-01-07 16:09:12 +08:00