Commit Graph

58 Commits

Author SHA1 Message Date
duan 7605773087 合并代码 2024-10-31 16:47:16 +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
duan 042c20a52d 耗材问题提交,盘点传值问题计算问题 2024-10-30 16:02:19 +08:00
duan 8b0e22e2cd Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-29 15:46:56 +08:00
duan 764c9461ae 小程序适配 2024-10-29 15:46:53 +08:00
YeMingfei666 7fcf8f9cde 第一版隐藏优惠券 2024-10-29 09:53:37 +08:00
YeMingfei666 85b92986a7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-28 09:23:22 +08:00
GaoHao b8c603e683 增加消息订阅 2024-10-25 16:49:50 +08:00
GaoHao 865e1780db Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh 2024-10-25 16:23:18 +08:00
YeMingfei666 6c4786876e 更新代客下单无台桌下单,更新台桌列表 2024-10-25 11:41:14 +08:00
GaoHao 4bb4328c2f 增加消息订阅 2024-10-25 11:10:39 +08:00
GaoHao a4b8511822 小程序设置头像显示优化 2024-10-25 10:21:10 +08:00
YeMingfei666 3dea396d0d 修复小程序运行报错bug 2024-10-25 09:29:32 +08:00
GaoHao a67035e2ef 增加优惠券相关 2024-10-24 15:46:44 +08:00
duan f1369caf3a 首页样式修改 2024-10-24 11:15:06 +08:00
duan 5792762c86 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-23 15:11:30 +08:00
duan 0e05b3ea5a 耗材解决问题 2024-10-23 15:11:27 +08:00
YeMingfei666 6383be3082 代码合并 2024-10-23 13:56:39 +08:00
YeMingfei666 076fa01fef 修复订单退菜展示问题,修改推出登录按钮 2024-10-23 13:50:56 +08:00
YeMingfei666 2911f11870 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-22 14:27:34 +08:00
duan 692ca30253 耗材管理修改 2024-10-22 14:18:14 +08:00
YeMingfei666 4e68a0cda3 隐藏发票页面 2024-10-21 17:34:53 +08:00
duan 390f286140 修改冲突 2024-10-21 16:55:58 +08:00
duan c6b4e503dc 登录保存商户信息 2024-10-21 16:55:26 +08:00
YeMingfei666 03d1cf28e6 增加代客下单权限校验 2024-10-21 11:19:22 +08:00
duan 9c97a912a7 打印机字段修改 2024-10-18 11:16:44 +08:00
YeMingfei666 25d10758af 更新增加打折权限校验 2024-10-17 09:48:43 +08:00
YeMingfei666 7030d60847 登录增加切换身份置空商户号 2024-10-16 14:16:06 +08:00
YeMingfei666 982bc23d3f 修复删除带来的列表页面数据为空未自动减少页码请求问题 2024-10-15 16:08:02 +08:00
GaoHao fa5cf04ac1 门店位置编辑更新 2024-10-11 17:41:57 +08:00
GaoHao 71e6eeba5e Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-11 09:13:41 +08:00
GaoHao 3a1e8fa211 店铺详情编辑修改 2024-10-11 09:12:22 +08:00
duan 82ad5973fb Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-10-10 15:22:48 +08:00
duan 16508515c4 供应商列表 2024-10-10 15:22:36 +08:00
YeMingfei666 d8b9bd1ad6 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-09 17:46:23 +08:00
YeMingfei666 bf588ca7fb 增加登录类型 2024-10-09 17:33:54 +08:00
YeMingfei666 d7db3dd7dd Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-08 10:54:50 +08:00
YeMingfei666 f5ac091bfe 更新首页菜单排序 2024-10-08 10:47:54 +08:00
YeMingfei666 a175a76deb Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-28 15:26:40 +08:00
YeMingfei666 624a0ca934 gh代码合并跟新设置店铺页面 2024-09-28 15:24:41 +08:00
GaoHao 78580644f5 店铺详情收款码下载处理,耗材报损增加 2024-09-28 15:16:31 +08:00
YeMingfei666 6feeaf919e 更新页面配置文件,开发文档,登录页面,首页 2024-09-28 15:09:13 +08:00
duan 35811b80a5 拉取叶代码 2024-09-26 11:00:57 +08:00
duan 7d904db9ed 员工编辑 2024-09-24 15:35:01 +08:00
YeMingfei666 657a7c4b7f Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-24 13:21:21 +08:00
YeMingfei666 2b6151c351 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-23 18:22:02 +08:00
YeMingfei666 edcf844adb 更新订单列表详情,更新商品管理,更新代客下单 2024-09-23 17:40:04 +08:00
GaoHao 24afdabe3d 店铺收款码更新 2024-09-19 14:34:20 +08:00
GaoHao be1ef04ec9 店铺详情修改更新 2024-09-19 10:17:34 +08:00
GaoHao d13405ee3f 店铺详情修改 2024-09-18 16:27:53 +08:00