Commit Graph

550 Commits

Author SHA1 Message Date
YeMingfei666 213bdcba88 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 2024-12-17 14:07:23 +08:00
YeMingfei666 7599157bfa 增加部分方法 2024-12-17 14:06:43 +08:00
duan daa0d18501 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-12-12 17:25:45 +08:00
duan 06e17a74b3 并转桌子 2024-12-12 17:25:16 +08:00
YeMingfei666 c63c187ed3 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 2024-12-11 16:33:58 +08:00
YeMingfei666 79839e3d39 修改最低sdk和目标sdk 2024-12-11 16:33:43 +08:00
GaoHao 973450b37a Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-12-11 10:41:26 +08:00
GaoHao 7376e40fe3 app升级更新添加 2024-12-11 10:41:13 +08:00
魏啾 6d8284e78f 1 2024-12-07 14:15:04 +08:00
duan cfb461829f Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-12-06 16:43:11 +08:00
duan 8c15aadf21 添加商品如果套餐没选择规格,默认选中第一条 2024-12-06 16:42:58 +08:00
魏啾 65745d3033 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz 2024-12-06 15:50:57 +08:00
魏啾 3616caac21 称重,默认选择营业时间 2024-12-06 15:49:15 +08:00
duan b4dcfe7879 添加商品几选几总值没传 2024-12-06 14:56:37 +08:00
魏啾 38b640e82b 称重钱保留后两位 2024-12-06 10:35:56 +08:00
魏啾 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
YeMingfei666 74d644c46b 修复套餐商品展示问题 2024-12-03 10:27:18 +08:00
YeMingfei666 3400c9422d 增加固定套餐提交时的套餐商品验证 2024-12-03 10:02:42 +08:00
YeMingfei666 b88b0b548f 修复商品编辑套餐商品保存问题 2024-12-03 09:53:11 +08:00
YeMingfei666 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
YeMingfei666 1582bb85f1 商品编辑修改称重商品也展示分类 2024-12-03 09:25:27 +08:00
YeMingfei666 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
YeMingfei666 3f2ea98977 修复是否允许临时改价点击无反应问题 2024-12-02 15:49:16 +08:00
YeMingfei666 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
YeMingfei666 f6b0db3a70 修复商品类型称重type改为weigh 2024-12-02 15:40:03 +08:00
YeMingfei666 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
YeMingfei666 63981c9452 预准备:表单组件 2024-12-02 09:38:03 +08:00
YeMingfei666 854ea15071 修复商品编辑小程序无法输入小数问题 2024-11-29 14:08:41 +08:00
YeMingfei666 c185dcc3be 代码合并 2024-11-29 14:01:16 +08:00
YeMingfei666 e17d36bc88 部分样式调整 2024-11-29 14:00:12 +08:00
YeMingfei666 a8d482edb1 修复套餐商品不展示问题 2024-11-29 13:53:33 +08:00
YeMingfei666 735afd564c 修复部分方法丢失问题 2024-11-29 13:53:07 +08:00
YeMingfei666 fb2ac1f7c1 代码合并 2024-11-29 13:32:28 +08:00
YeMingfei666 23546c7b27 商品编辑增加套餐商品,称重商品,定时上下架,是否允许临时改价,限购等 2024-11-29 13:30:29 +08:00
YeMingfei666 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
YeMingfei666 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