Commit Graph

70 Commits

Author SHA1 Message Date
c32f203498 变更 2024-12-10 19:27:49 +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
5b4d63df01 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-11-05 21:02:51 +08:00
1c7c4370e8 revert 6bd1d4f49f
revert 修改了一些bug
2024-11-05 13:00:52 +00:00
c8adea17e3 Merge remote-tracking branch 'origin/main' 2024-11-05 20:55:30 +08:00
6bd1d4f49f 修改了一些bug 2024-11-05 20:34:10 +08:00
8bdd2ab425 Merge remote-tracking branch 'origin/main' 2024-11-05 20:30:12 +08:00
57d77cc216 变更 2024-11-05 20:30:00 +08:00
393e3d9dc9 修改bug 2024-11-05 20:19:45 +08:00
d6f51ac5f1 变更 2024-11-05 20:13:12 +08:00
ee87e55b63 商品订单还有些问题 2024-11-05 16:45:53 +08:00
4951ab1daf Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-11-04 22:47:27 +08:00
9bcc3fd0b1 变更 2024-11-04 19:57:46 +08:00
dc782cfa39 优惠卷注释 2024-11-04 18:52:33 +08:00
870945deec 变更 2024-11-04 18:51:54 +08:00
44fa7ad077 变更 2024-11-04 18:47:06 +08:00
8dd90f700e 变更 2024-11-04 18:30:18 +08:00
b4be38c2ac Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/views/Coupons/AddCoupons.vue
#	src/views/Home.vue
2024-11-03 19:13:01 +08:00
d691546a80 变更 2024-11-03 19:12:49 +08:00
f87ba4dd24 test 2024-11-03 19:11:40 +08:00
0f33730f93 打包测试 2024-11-03 19:00:42 +08:00
5021be5ea7 变更 2024-11-03 18:59:41 +08:00
658b79a19e Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web
# Conflicts:
#	src/router/routes.ts
#	src/views/Commodity/AddProduct.vue
2024-11-03 13:35:13 +08:00
cd07761392 变更 2024-11-03 13:34:38 +08:00
df41a86572 商品添加,商品修改,类别管理 2024-11-03 12:40:56 +08:00
2743c57e6a 11.1 2024-11-01 13:04:02 +08:00
d1715a03a3 端口号改变 2024-10-31 19:47:25 +08:00
60d9e78b89 Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web 2024-10-31 19:46:37 +08:00
b0615ba36d 变更 2024-10-31 19:43:35 +08:00
3f1c339634 变更 2024-10-31 19:23:27 +08:00
6cb9ae40dc 1 2024-10-31 18:27:18 +08:00
e2bd373db2 121 2024-10-31 18:26:36 +08:00
86fa12d792 变更 2024-10-31 18:26:29 +08:00
e5939bc8b0 商品管理的商品列表分页 2024-10-31 17:56:15 +08:00