Commit Graph

102 Commits

Author SHA1 Message Date
1204b77c7d 变更 2025-02-18 14:06:06 +08:00
9ee59ba57d 变更 2025-02-05 19:31:00 +08:00
79e674a12a 类别管理修改 2025-01-12 10:16:36 +08:00
b38083540f 添加商品和商品中心已完成 2025-01-02 20:27:34 +08:00
71efe041a9 1.0web商城实体类业务流程完成 2024-12-21 21:24:42 +08:00
49a4240438 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-20 15:59:02 +08:00
3b7c1dfb17 暂存 2024-12-20 15:58:58 +08:00
ca77a8dcce 变更 2024-12-20 15:58:31 +08:00
07e41ce272 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/views/test.vue
2024-12-19 18:57:27 +08:00
69df42c194 变更 2024-12-19 18:57:12 +08:00
29d4228b4b 改了实体类商品的部分约束 2024-12-19 18:55:48 +08:00
e63fe5da2c Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-17 14:59:10 +08:00
663fd47765 添加实体类商品格式化成功 2024-12-17 14:59:05 +08:00
051fc00253 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/layout/components/Aside.vue
#	src/views/test.vue
2024-12-10 19:28:30 +08:00
c32f203498 变更 2024-12-10 19:27:49 +08:00
f6e8e0f3c3 修复报错 2024-12-09 08:21:32 +08:00
ff47204947 打标签版本 2024-12-08 22:39:32 +08:00
5151f9efdf 添加服务类商品修改完成 2024-12-08 10:40:37 +08:00
fef1b41ee0 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-04 09:50:03 +08:00
40412a745b 暂存 2024-12-04 09:49:37 +08:00
1be6eb74c6 解决bug 2024-12-04 09:49:16 +08:00
6cf62bedce Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-04 09:38:53 +08:00
a3ff9d1cc2 hello 2024-12-04 09:38:47 +08:00
8b40389be5 暂存 2024-12-04 09:38:32 +08:00
d1cdb9df2b Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-04 08:10:54 +08:00
c897f8ff58 暂存 2024-12-04 08:10:50 +08:00
10feded749 预约时间bug 2024-12-04 02:26:43 +08:00
aa0b756c14 预约时间问题 2024-12-04 02:26:08 +08:00
848d29f81e 添加服务类商品 2024-12-03 19:51:45 +08:00
6e902244c9 后端修改了预约时间 2024-12-03 12:29:33 +08:00
06aa3853f3 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-02 16:31:18 +08:00
f30656ae83 服务类预约时间 2024-12-02 16:30:55 +08:00
ca8b691740 服务类商品预约时间 2024-12-02 16:30:29 +08:00
c6beef1783 修复提交异常 2024-12-02 13:15:12 +08:00
a2c19a215e Merge remote-tracking branch 'origin/main' 2024-12-02 13:08:24 +08:00
f249a057f6 变更 2024-12-02 13:08:11 +08:00
634e468f95 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-12-02 13:06:32 +08:00
c601d106c4 添加服务类商品 2024-12-02 13:04:45 +08:00
dc47628c71 变更 2024-12-02 09:49:09 +08:00
63ad408e0c Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/views/Orders/orderOperations.vue
2024-11-15 10:05:24 +08:00
b647d773fa 新增了服务类商品路由,删除订单批量删除按钮 2024-11-13 09:12:21 +08:00
79da702e4c 表格降序、批量删除、序号化 2024-11-12 19:50:54 +08:00
f494a44d81 订单列表完善 2024-11-11 09:29:36 +08:00
36ac13ab3e Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/views/Orders/OrderList.vue
2024-11-08 15:23:54 +08:00
b667d74070 变更 2024-11-08 15:23:38 +08:00
74c92216f8 图床功能、部分bug修改 2024-11-08 10:05:50 +08:00
f172751e31 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-11-06 09:56:01 +08:00
87f925a9c7 OrderList暂存 2024-11-06 09:55:26 +08:00
10d80f09b9 1 2024-11-06 01:14:31 +08:00
771cd1ede2 解决前面的bug 2024-11-06 01:12:38 +08:00