 YeMingfei666
|
9167ee9a9b
|
增加订单列表优惠券抵扣商品划线，优化价格长度计算
|
2024-11-12 10:51:38 +08:00 |
|
YeMingfei666
|
5476a6af41
|
增加限制，商品券抵扣的商品不可退款
|
2024-11-12 10:01:57 +08:00 |
|
YeMingfei666
|
c41f78fca8
|
增加商品券限制，过滤不满足使用条件的商品券
|
2024-11-12 09:49:34 +08:00 |
duan
|
27deb4db4a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-11 17:06:12 +08:00 |
|
duan
|
2a40135ac0
|
员工管理角色回显
|
2024-11-11 17:05:47 +08:00 |
|
YeMingfei666
|
7d39bc2bee
|
修改订单支付优惠券积分
|
2024-11-11 16:09:25 +08:00 |
|
YeMingfei666
|
2691cf9b53
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 13:20:45 +08:00 |
|
YeMingfei666
|
7d4f1607fe
|
增加隐私政策
|
2024-11-11 11:49:50 +08:00 |
|
YeMingfei666
|
aad78417b8
|
增加商品券选择判断限制
|
2024-11-11 11:17:26 +08:00 |
|
YeMingfei666
|
71535693bb
|
修复组件报错问题
|
2024-11-11 10:12:13 +08:00 |
|
YeMingfei666
|
e0e5f703a1
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 10:07:36 +08:00 |
|
YeMingfei666
|
6f9a35f4d7
|
修改商品编辑保存字段skuSnap里的label换为name,修改商品名称长度为1-40
|
2024-11-11 10:06:24 +08:00 |
|
YeMingfei666
|
1f3a66906f
|
1.0隐藏霸王餐
|
2024-11-11 09:43:17 +08:00 |
|
YeMingfei666
|
7f265b7583
|
增加券
|
2024-11-11 09:38:09 +08:00 |
|
duan
|
ebc7a80feb
|
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-08 14:50:49 +08:00 |
|
duan
|
3838036f8a
|
隐藏年月日
|
2024-11-08 14:50:26 +08:00 |
|
YeMingfei666
|
1836a5b10b
|
增加确认订单会员价
|
2024-11-07 17:26:54 +08:00 |
|
YeMingfei666
|
f2f5bac39e
|
修改订单详情订单列表价格展示，增加会员价
|
2024-11-06 17:37:56 +08:00 |
|
YeMingfei666
|
80a096cd97
|
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-06 17:35:17 +08:00 |
|
YeMingfei666
|
da9d08a91e
|
修复订单支付页面，选择用户未携带orderId
|
2024-11-06 17:34:42 +08:00 |
|
duan
|
885a3a0535
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-06 11:01:59 +08:00 |
|
duan
|
d885fb521d
|
取号换行
|
2024-11-06 11:01:46 +08:00 |
|
YeMingfei666
|
9c2b882478
|
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-05 16:47:42 +08:00 |
|
YeMingfei666
|
3f4d8ac53b
|
增加订单支付优惠券页面
|
2024-11-05 16:47:34 +08:00 |
|
YeMingfei666
|
d4c309cdc7
|
修改时间选择组件部分代码
|
2024-11-05 15:10:56 +08:00 |
GaoHao
|
e0aa83c8d1
|
门店设置修改
|
2024-11-05 10:52:17 +08:00 |
|
duan
|
a4d36b3fa8
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-05 10:33:37 +08:00 |
|
duan
|
cfed8ea183
|
耗材问题修复
|
2024-11-05 10:33:26 +08:00 |
|
GaoHao
|
35ea6dfbfe
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-04 16:02:37 +08:00 |
|
GaoHao
|
e460b5b7be
|
订阅码保存更新
|
2024-11-04 16:01:35 +08:00 |
魏啾
|
4bd5d2b643
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz
|
2024-11-04 15:48:13 +08:00 |
|
魏啾
|
37f7020906
|
注释交班次 增加霸王餐返回提示
|
2024-11-04 15:47:39 +08:00 |
|
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 |
|
YeMingfei666
|
72702ca3cc
|
去除子分类
|
2024-11-04 14:30:55 +08:00 |
|
YeMingfei666
|
0ad11a9866
|
修改订单详情切换用户时，将之前的userId字段改为memberId字段
|
2024-11-04 14:27:16 +08:00 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
d9faed5866
|
修复库存记录选择时间nan问题
|
2024-11-04 10:44:31 +08:00 |
|
YeMingfei666
|
e064484fe2
|
修复商品库存价格编辑小程序兼容无反应问题
|
2024-11-04 10:23:40 +08:00 |
|
YeMingfei666
|
20c4631ad4
|
修复订单退款价格展示格式为保留两位小数
|
2024-11-04 10:22:58 +08:00 |
|
YeMingfei666
|
12890fe257
|
首页增加霸王餐页面跳转
|
2024-11-04 09:55:57 +08:00 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |