Commit Graph

Select branches

Hide Pull Requests

dev

dev_1.0.0

dwb

gaohao2.0.0

gh

gh_1.0.0

master

test

wwz

ymf

ymf_1.0.0

Mono Color

• bbcf8068c4 1 ymf YeMingfei666 2025-10-13 11:33:03 +0800
• dd42743f26 增加协议文件 YeMingfei666 2025-05-26 17:01:17 +0800
• 1d6ef74781 修改桌台bug test duan 2024-12-24 16:16:45 +0800
• 8df341ff9e 修改套餐添加问题 dwb duan 2024-12-24 11:04:58 +0800
• 13a4e21be5 订单详情，退菜，小计和优惠 duan 2024-12-20 14:01:33 +0800
• db6b1af326 合并桌问题与称重退款 duan 2024-12-19 18:08:44 +0800
• 213bdcba88 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 YeMingfei666 2024-12-17 14:07:23 +0800
• 7599157bfa 增加部分方法 YeMingfei666 2024-12-17 14:06:43 +0800
• f7a9a2b567 并合桌 duan 2024-12-17 09:44:48 +0800
• daa0d18501 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb duan 2024-12-12 17:25:45 +0800
• 06e17a74b3 并转桌子 duan 2024-12-12 17:25:16 +0800
• c63c187ed3 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 YeMingfei666 2024-12-11 16:33:58 +0800
• 79839e3d39 修改最低sdk和目标sdk YeMingfei666 2024-12-11 16:33:43 +0800
• 973450b37a Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test gh GaoHao 2024-12-11 10:41:26 +0800
• 7376e40fe3 app升级更新添加 GaoHao 2024-12-11 10:41:13 +0800
• 6d8284e78f 1 魏啾 2024-12-07 14:15:04 +0800
• cfb461829f Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb duan 2024-12-06 16:43:11 +0800
• 8c15aadf21 添加商品如果套餐没选择规格,默认选中第一条 duan 2024-12-06 16:42:58 +0800
• 65745d3033 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz wwz 魏啾 2024-12-06 15:50:57 +0800
• 3616caac21 称重，默认选择营业时间 魏啾 2024-12-06 15:49:15 +0800
• b4dcfe7879 添加商品几选几总值没传 duan 2024-12-06 14:56:37 +0800
• 38b640e82b 称重钱保留后两位 魏啾 2024-12-06 10:35:56 +0800
• 85d5d59863 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz 魏啾 2024-12-06 10:06:05 +0800
• 51f3953459 称重增加 魏啾 2024-12-06 10:05:06 +0800
• b1e90ff1a9 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb duan 2024-12-05 11:23:48 +0800
• de90f1249e 套餐优化 duan 2024-12-05 11:23:39 +0800
• 3a5460894b Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz 魏啾 2024-12-05 10:48:31 +0800
• e6ccfdafd6 核销管理 魏啾 2024-12-05 10:48:11 +0800
• 9df5bc0e46 套餐 duan 2024-12-04 17:46:51 +0800
• 4dfa7d627e 代客下单bug修改2 duan 2024-12-04 10:44:25 +0800
• ff1e6f60e0 代课下单bug修改 duan 2024-12-04 09:38:18 +0800
• c4f43a0626 单品改价 duan 2024-12-03 16:19:48 +0800
• 74d644c46b 修复套餐商品展示问题 YeMingfei666 2024-12-03 10:27:05 +0800
• 3400c9422d 增加固定套餐提交时的套餐商品验证 YeMingfei666 2024-12-03 10:02:18 +0800
• b88b0b548f 修复商品编辑套餐商品保存问题 YeMingfei666 2024-12-03 09:52:46 +0800
• 005c6336c0 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test YeMingfei666 2024-12-03 09:27:32 +0800
• 1582bb85f1 商品编辑修改称重商品也展示分类 YeMingfei666 2024-12-03 09:25:07 +0800
• c36717a059 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test YeMingfei666 2024-12-02 15:49:36 +0800
• 3f2ea98977 修复是否允许临时改价点击无反应问题 YeMingfei666 2024-12-02 15:49:16 +0800
• 0d298f8413 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test YeMingfei666 2024-12-02 15:44:20 +0800
• f6b0db3a70 修复商品类型称重type改为weigh YeMingfei666 2024-12-02 15:39:45 +0800
• 907ba4f9d5 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test dev YeMingfei666 2024-12-02 09:38:23 +0800
• 63981c9452 预准备：表单组件 YeMingfei666 2024-12-02 09:38:03 +0800
• 854ea15071 修复商品编辑小程序无法输入小数问题 YeMingfei666 2024-11-29 14:08:14 +0800
• c185dcc3be 代码合并 YeMingfei666 2024-11-29 14:01:16 +0800
• e17d36bc88 部分样式调整 YeMingfei666 2024-11-29 14:00:00 +0800
• a8d482edb1 修复套餐商品不展示问题 YeMingfei666 2024-11-29 13:53:15 +0800
• 735afd564c 修复部分方法丢失问题 YeMingfei666 2024-11-29 13:53:00 +0800
• fb2ac1f7c1 代码合并 YeMingfei666 2024-11-29 13:32:28 +0800
• 23546c7b27 商品编辑增加套餐商品，称重商品，定时上下架，是否允许临时改价，限购等 YeMingfei666 2024-11-29 13:29:10 +0800
• 0f2563af2d Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 YeMingfei666 2024-11-27 15:09:54 +0800
• 38eec83e83 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 YeMingfei666 2024-11-27 15:09:36 +0800
• df82d70855 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_2.0.0 ymf_1.0.0 YeMingfei666 2024-11-27 15:08:49 +0800
• 1f826fb87b 订单支付强制将满减券数量定为1 YeMingfei666 2024-11-27 15:08:39 +0800
• c9ce807a17 编辑校验处理更新 GaoHao 2024-11-27 13:58:41 +0800
• 3440dc9d8d 挂账明细分页数修改 GaoHao 2024-11-27 13:30:03 +0800
• 8d37679bac 挂账增加 GaoHao 2024-11-27 11:27:54 +0800
• bcb058e136 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh GaoHao 2024-11-25 17:26:42 +0800
• 7877bdcfe1 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh GaoHao 2024-11-25 17:26:27 +0800
• b562ccc707 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-25 17:02:44 +0800
• 4e1290fbf7 优惠券样式调整 YeMingfei666 2024-11-25 17:01:07 +0800
• 0a8f5c3a1e Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-25 16:27:08 +0800
• e59a18ca52 修改订单详情未支付时按照订单返回priceAmount展示 YeMingfei666 2024-11-25 16:23:27 +0800
• cff33a9875 代码合并 YeMingfei666 2024-11-25 13:53:29 +0800
• c9caed9579 修改订单详情支付逻辑 YeMingfei666 2024-11-25 13:49:28 +0800
• a2a4a1bf96 更新计算公公式 YeMingfei666 2024-11-23 16:56:18 +0800
• 35160c63b4 修改订单退款金额，客座费金额 YeMingfei666 2024-11-23 15:43:46 +0800
• 586f30c4c4 修改退款计算公式 YeMingfei666 2024-11-23 15:13:21 +0800
• 5ae1e4b420 订单详情结算后只展示已优惠价格 YeMingfei666 2024-11-23 14:26:21 +0800
• 00b81e9f1b 修改可退款金额计算公式 YeMingfei666 2024-11-23 14:23:11 +0800
• 0906ab8523 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_2.0.0 YeMingfei666 2024-11-23 09:36:22 +0800
• 0f2e791557 订单支付详情修改部分逻辑 YeMingfei666 2024-11-23 09:35:22 +0800
• d36afe0969 修改订单详情优惠等展示 YeMingfei666 2024-11-22 18:29:34 +0800
• 3706573eab 修改能退金额计算公式 YeMingfei666 2024-11-22 17:11:51 +0800
• 75161519f2 修改订单详情价格展示 YeMingfei666 2024-11-22 16:56:51 +0800
• 70933ce1e4 修改订单支付详情优惠券积分等逻辑 YeMingfei666 2024-11-22 14:41:13 +0800
• 8dfd42f20a 交班和霸王餐 魏啾 2024-11-22 10:48:11 +0800
• 6f38c95892 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test duan 2024-11-22 10:07:59 +0800
• ef5f3e1fe5 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test duan 2024-11-22 10:07:57 +0800
• 9f91ea0c27 员工新增管理 duan 2024-11-22 10:07:40 +0800
• 433479fee7 Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz 魏啾 2024-11-22 10:03:22 +0800
• eb640a1fde 1 魏啾 2024-11-22 10:02:28 +0800
• b69159d965 订单管理详情，支付价格计算逻辑修改 YeMingfei666 2024-11-21 18:10:19 +0800
• 84855194e8 修改商品券抵扣商品也可以退款 YeMingfei666 2024-11-21 18:09:53 +0800
• 47da4d3041 修改折扣返回数据 YeMingfei666 2024-11-21 18:09:12 +0800
• 7e994f84f0 代客下单增加临时菜 YeMingfei666 2024-11-21 09:52:17 +0800
• d8738f4e74 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0 YeMingfei666 2024-11-20 16:48:33 +0800
• 2e77c6a842 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-20 15:34:10 +0800
• 975921014f 修改订单详情客座费判断是否退款方法 YeMingfei666 2024-11-20 15:32:11 +0800
• 10ced0d770 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-20 15:19:45 +0800
• 4f566f37c7 修复客座费退款后还有退款按钮问题 YeMingfei666 2024-11-20 15:19:05 +0800
• fb811fa07e Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-20 15:10:47 +0800
• 698184d561 修改订单详情展示 YeMingfei666 2024-11-20 15:10:19 +0800
• 4204ec8021 Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev YeMingfei666 2024-11-20 15:07:02 +0800
• b0986065f4 修改订单详情优惠计算公司 YeMingfei666 2024-11-20 15:06:27 +0800
• d588fd16ce 增加判断是否退菜方法 YeMingfei666 2024-11-20 14:53:03 +0800
• 0ff2e8f770 修改订单详情优惠逻辑 YeMingfei666 2024-11-20 14:52:01 +0800
• fe441fc471 修改霸王餐输入框类型为number YeMingfei666 2024-11-20 14:51:39 +0800
• df2125f14e Merge branch 'gaohao2.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev gaohao2.0.0 GaoHao 2024-11-20 14:19:45 +0800
• 8c44bbee30 优惠券更新 GaoHao 2024-11-20 14:19:17 +0800