Commit Graph

384 Commits

Author SHA1 Message Date
duan
d7a6ba1c62 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-04 15:44:57 +08:00
duan
0d1bde23c3 员工折扣百分比管理 2024-11-04 15:44:55 +08:00
GaoHao
8f9e06bc84 Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-04 15:12:16 +08:00
GaoHao
3cc4b53ddd 店铺详情修改 2024-11-04 15:07:57 +08:00
72702ca3cc 去除子分类 2024-11-04 14:30:55 +08:00
0ad11a9866 修改订单详情切换用户时,将之前的userId字段改为memberId字段 2024-11-04 14:27:16 +08:00
3fb3d89ae3 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-04 10:56:40 +08:00
76d844274a 修改库存记录图标问题 2024-11-04 10:56:22 +08:00
duan
4b0882bbd4 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-11-04 10:51:58 +08:00
duan
172bfa3bab 修改首页自定义报错 2024-11-04 10:51:49 +08:00
d9faed5866 修复库存记录选择时间nan问题 2024-11-04 10:44:31 +08:00
e064484fe2 修复商品库存价格编辑小程序兼容无反应问题 2024-11-04 10:23:40 +08:00
20c4631ad4 修复订单退款价格展示格式为保留两位小数 2024-11-04 10:22:58 +08:00
12890fe257 首页增加霸王餐页面跳转 2024-11-04 09:55:57 +08:00
5ddd7da074 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-04 09:52:46 +08:00
b9c916e226 修复退菜未关闭 2024-11-04 09:50:18 +08:00
duan
4cd503803b 会员修改信息刷新 2024-11-01 17:50:19 +08:00
duan
1528469d88 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-01 17:46:59 +08:00
duan
ab5c746b80 提交耗材问题 2024-11-01 17:46:57 +08:00
073baea2f9 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-01 17:24:34 +08:00
ed6657199a 增加单规格商品绑定至规格时弹窗提醒 2024-11-01 17:23:47 +08:00
f38ff3e3de 优化首页nan问题 2024-11-01 16:55:33 +08:00
c066341ee6 去除app.vue报错 2024-11-01 16:48:44 +08:00
02be200b9b 修改首页样式兼容app 2024-11-01 16:40:48 +08:00
duan
a40d7bf142 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-11-01 16:36:24 +08:00
duan
dc1ff9ba43 修改耗材问题 2024-11-01 16:36:14 +08:00
71cd53dfc4 增加图标 2024-11-01 16:23:03 +08:00
e6f5e93d4b 增加总收入点击提示 2024-11-01 16:22:47 +08:00
1219a53496 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_1.0.0 2024-11-01 15:12:53 +08:00
duan
5e4022f85c Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-11-01 15:12:03 +08:00
duan
7f55234a75 修改问题 2024-11-01 15:11:52 +08:00
788a0c8bdf Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf 2024-11-01 15:01:36 +08:00
24011fab8c 调整首页部分样式 2024-11-01 14:57:40 +08:00
a9ae16d213 去重重复菜单栏 2024-11-01 14:55:28 +08:00
4f9d7b9546 增加菜单栏图标 2024-11-01 14:44:12 +08:00
94823867d6 修改首页将设置中心改到左上角图标跳转 2024-11-01 14:43:42 +08:00
bd003e9d62 增加登录账号密码不对时提示将英文改成中文 2024-11-01 14:27:04 +08:00
aa96ff5848 去除桌台列表定时刷新 2024-11-01 14:26:06 +08:00
49f55e580b Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf 2024-11-01 13:59:29 +08:00
duan
1a2efdf804 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-11-01 13:37:03 +08:00
duan
110e6a0076 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-11-01 13:36:39 +08:00
duan
82d9e44827 员工列表样式 2024-11-01 13:36:37 +08:00
duan
88d2816946 耗材样式 2024-11-01 11:36:33 +08:00
678c325fb6 修复订单列表筛选条件展示不对的问题 2024-11-01 09:14:06 +08:00
745f68f2e4 修复my-date-picker组件开始时间大于结束时间时限制效果未起作用的问题 2024-11-01 09:13:11 +08:00
duan
7605773087 合并代码 2024-10-31 16:47:16 +08:00
duan
70bf859fba 修改耗材盘点 2024-10-31 16:16:06 +08:00
GaoHao
69712862d9 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0 2024-10-31 15:51:17 +08:00
1e8de97835 退菜增加弹框关闭时重置选择原因以及输入 2024-10-31 15:08:10 +08:00
6bf5c69361 增加商品编辑绑定至耗材还是规格默认展示 2024-10-31 15:05:50 +08:00