魏啾
|
85d5d59863
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz
|
2024-12-06 10:06:05 +08:00 |
|
魏啾
|
51f3953459
|
称重增加
|
2024-12-06 10:05:06 +08:00 |
|
duan
|
b1e90ff1a9
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-12-05 11:23:48 +08:00 |
|
duan
|
de90f1249e
|
套餐优化
|
2024-12-05 11:23:39 +08:00 |
|
魏啾
|
3a5460894b
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz
|
2024-12-05 10:48:31 +08:00 |
|
魏啾
|
e6ccfdafd6
|
核销管理
|
2024-12-05 10:48:11 +08:00 |
|
duan
|
9df5bc0e46
|
套餐
|
2024-12-04 17:46:51 +08:00 |
|
duan
|
4dfa7d627e
|
代客下单bug修改2
|
2024-12-04 10:44:25 +08:00 |
|
duan
|
ff1e6f60e0
|
代课下单bug修改
|
2024-12-04 09:38:18 +08:00 |
|
duan
|
c4f43a0626
|
单品改价
|
2024-12-03 16:19:48 +08:00 |
|
|
|
74d644c46b
|
修复套餐商品展示问题
|
2024-12-03 10:27:18 +08:00 |
|
|
|
3400c9422d
|
增加固定套餐提交时的套餐商品验证
|
2024-12-03 10:02:42 +08:00 |
|
|
|
b88b0b548f
|
修复商品编辑套餐商品保存问题
|
2024-12-03 09:53:11 +08:00 |
|
|
|
005c6336c0
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-12-03 09:27:32 +08:00 |
|
|
|
1582bb85f1
|
商品编辑修改称重商品也展示分类
|
2024-12-03 09:25:27 +08:00 |
|
|
|
c36717a059
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-12-02 15:49:36 +08:00 |
|
|
|
3f2ea98977
|
修复是否允许临时改价点击无反应问题
|
2024-12-02 15:49:16 +08:00 |
|
|
|
0d298f8413
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-12-02 15:44:20 +08:00 |
|
|
|
f6b0db3a70
|
修复商品类型称重type改为weigh
|
2024-12-02 15:40:03 +08:00 |
|
|
|
907ba4f9d5
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-12-02 09:38:23 +08:00 |
|
|
|
63981c9452
|
预准备：表单组件
|
2024-12-02 09:38:03 +08:00 |
|
|
|
854ea15071
|
修复商品编辑小程序无法输入小数问题
|
2024-11-29 14:08:41 +08:00 |
|
|
|
c185dcc3be
|
代码合并
|
2024-11-29 14:01:16 +08:00 |
|
|
|
e17d36bc88
|
部分样式调整
|
2024-11-29 14:00:12 +08:00 |
|
|
|
a8d482edb1
|
修复套餐商品不展示问题
|
2024-11-29 13:53:33 +08:00 |
|
|
|
735afd564c
|
修复部分方法丢失问题
|
2024-11-29 13:53:07 +08:00 |
|
|
|
fb2ac1f7c1
|
代码合并
|
2024-11-29 13:32:28 +08:00 |
|
|
|
23546c7b27
|
商品编辑增加套餐商品，称重商品，定时上下架，是否允许临时改价，限购等
|
2024-11-29 13:30:29 +08:00 |
|
|
|
0f2563af2d
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-27 15:09:54 +08:00 |
|
|
|
38eec83e83
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-27 15:09:36 +08:00 |
|
GaoHao
|
c9ce807a17
|
编辑校验处理更新
|
2024-11-27 13:58:41 +08:00 |
|
GaoHao
|
3440dc9d8d
|
挂账明细分页数修改
|
2024-11-27 13:30:03 +08:00 |
|
GaoHao
|
8d37679bac
|
挂账增加
|
2024-11-27 11:27:54 +08:00 |
|
GaoHao
|
bcb058e136
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh
|
2024-11-25 17:26:42 +08:00 |
|
GaoHao
|
7877bdcfe1
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh
|
2024-11-25 17:26:27 +08:00 |
|
|
|
b562ccc707
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-25 17:02:44 +08:00 |
|
|
|
4e1290fbf7
|
优惠券样式调整
|
2024-11-25 17:01:31 +08:00 |
|
|
|
0a8f5c3a1e
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-25 16:27:08 +08:00 |
|
|
|
e59a18ca52
|
修改订单详情未支付时按照订单返回priceAmount展示
|
2024-11-25 16:23:55 +08:00 |
|
|
|
cff33a9875
|
代码合并
|
2024-11-25 13:53:29 +08:00 |
|
|
|
c9caed9579
|
修改订单详情支付逻辑
|
2024-11-25 13:49:39 +08:00 |
|
|
|
a2a4a1bf96
|
更新计算公公式
|
2024-11-23 16:56:26 +08:00 |
|
|
|
35160c63b4
|
修改订单退款金额，客座费金额
|
2024-11-23 15:44:00 +08:00 |
|
|
|
586f30c4c4
|
修改退款计算公式
|
2024-11-23 15:13:32 +08:00 |
|
|
|
5ae1e4b420
|
订单详情结算后只展示已优惠价格
|
2024-11-23 14:26:43 +08:00 |
|
|
|
00b81e9f1b
|
修改可退款金额计算公式
|
2024-11-23 14:23:25 +08:00 |
|
|
|
0906ab8523
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_2.0.0
|
2024-11-23 09:36:22 +08:00 |
|
|
|
0f2e791557
|
订单支付详情修改部分逻辑
|
2024-11-23 09:35:45 +08:00 |
|
|
|
d36afe0969
|
修改订单详情优惠等展示
|
2024-11-22 18:29:52 +08:00 |
|
|
|
3706573eab
|
修改能退金额计算公式
|
2024-11-22 17:12:06 +08:00 |
|
