 YeMingfei666
|
4e956987d5
|
fix: 代客下单可选套餐确定无法点击，优惠价格计算
|
2025-03-11 11:30:02 +08:00 |
duan
|
e70154f9bd
|
feat: 修改编辑商品后的跳转
|
2025-03-11 11:22:07 +08:00 |
|
duan
|
e7517d3b4c
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-11 10:43:02 +08:00 |
|
duan
|
deec807c98
|
feat: 修改商品分类排序功能
|
2025-03-11 10:42:37 +08:00 |
|
YeMingfei666
|
8bec7f1f6c
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-10 18:34:00 +08:00 |
|
YeMingfei666
|
89fe9b7639
|
fix: 挂账管理更新，邀请列表更新，店铺配置更新
|
2025-03-10 18:33:42 +08:00 |
Tankaikai
|
d710241ff0
|
配合后端修正baseURL
|
2025-03-10 16:49:16 +08:00 |
|
duan
|
f13f042ea0
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-03-10 16:49:07 +08:00 |
|
duan
|
a7e775f5e7
|
feat: 修改商品上架字段
|
2025-03-10 16:36:11 +08:00 |
|
Tankaikai
|
9ff72bc8d5
|
配合后端修正baseURL
|
2025-03-10 14:28:12 +08:00 |
|
YeMingfei666
|
34068cf8dd
|
fix: 修改交班部分文件名称，修改部分深度作用样式
|
2025-03-10 14:11:34 +08:00 |
|
duan
|
62862afc25
|
feat: 修改活动添加
|
2025-03-10 13:53:09 +08:00 |
|
YeMingfei666
|
8026fcb98c
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-10 13:30:45 +08:00 |
|
YeMingfei666
|
f936328a66
|
feat: 增加数据统计，销量统计，桌台统计
|
2025-03-10 13:30:34 +08:00 |
|
duan
|
fd824ab7d7
|
feat: 活动管理
|
2025-03-08 18:27:28 +08:00 |
|
YeMingfei666
|
cec6ea62df
|
feat: 增加美团抖音扫码核销
|
2025-03-07 19:29:10 +08:00 |
|
YeMingfei666
|
63a4ed9e73
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-07 18:56:18 +08:00 |
|
YeMingfei666
|
739f4a1062
|
fix: 重写耗材模块
|
2025-03-07 18:53:31 +08:00 |
|
duan
|
0bd38e29c5
|
feat: 解决上架问题
|
2025-03-07 18:30:30 +08:00 |
|
YeMingfei666
|
73057865da
|
feat: 订单列表页面详情弹窗关闭时刷新列表
|
2025-03-07 11:07:00 +08:00 |
|
YeMingfei666
|
8e52613f08
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-07 10:40:56 +08:00 |
|
YeMingfei666
|
d7ab9c3627
|
feat: 代客下单修改退款退菜
|
2025-03-07 10:40:25 +08:00 |
|
YeMingfei666
|
ef358f33bb
|
fix: 订单管理退款修改，台桌跳转代客下单页面
|
2025-03-06 19:32:13 +08:00 |
|
duan
|
723dee6adb
|
feat: 隐藏存酒搜索
|
2025-03-06 18:30:51 +08:00 |
|
YeMingfei666
|
d6eb27186f
|
fix: 店铺装修刷新后tab被重置问题
|
2025-03-06 11:35:59 +08:00 |
|
YeMingfei666
|
2972e4b610
|
fix: 店铺装修更新后切换tab分类数据还是旧数据
|
2025-03-06 11:31:11 +08:00 |
|
YeMingfei666
|
6a2b6ba9e0
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-06 11:27:31 +08:00 |
|
YeMingfei666
|
dda4db24e0
|
feat: 代客下单优惠券更新，挂账更新
|
2025-03-06 11:27:01 +08:00 |
|
duan
|
26ca040010
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-03-06 10:10:41 +08:00 |
|
duan
|
a8a8a58cad
|
feat: 商品上架优化
|
2025-03-06 10:09:55 +08:00 |
|
YeMingfei666
|
ed9a3335c8
|
feat: 代客下单修改，订单列表详情退款修改
|
2025-03-05 13:39:06 +08:00 |
|
YeMingfei666
|
a7b7c1cd7e
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-04 18:05:49 +08:00 |
|
YeMingfei666
|
833676f545
|
feat: 代客下单更新
|
2025-03-04 18:05:21 +08:00 |
|
duan
|
8838df65fb
|
feat: 存酒模块
|
2025-03-04 17:30:42 +08:00 |
|
YeMingfei666
|
cff5363260
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-04 10:35:42 +08:00 |
|
YeMingfei666
|
bd59f05d26
|
feat: 代客下单更新，修复店铺列表编辑展示问题
|
2025-03-04 10:34:19 +08:00 |
|
duan
|
9e256c664f
|
feat: 修改单位字段
|
2025-03-03 17:12:22 +08:00 |
|
duan
|
250317f1ca
|
feat: 修改按钮颜色，商品添加输入售价其他为0则回填
|
2025-03-03 15:09:26 +08:00 |
|
duan
|
6bf6ee4749
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-03-01 14:31:35 +08:00 |
|
duan
|
3f02f0e6c8
|
feat: 商品列表-单规格删除skulist
|
2025-03-01 13:43:01 +08:00 |
|
YeMingfei666
|
b71ca19c0d
|
fix: 代码合并
|
2025-03-01 11:38:36 +08:00 |
|
YeMingfei666
|
1c0887869e
|
fix: 订单管理页面调整增加退款功能，代客下单调整
|
2025-03-01 11:36:47 +08:00 |
|
duan
|
467bfaa2eb
|
feat: 广告模块，交班记录80%，等用户完成
|
2025-03-01 11:12:29 +08:00 |
|
duan
|
ad52c6bbf9
|
feat: 修改多次绑定on事件
|
2025-02-28 18:14:29 +08:00 |
|
duan
|
03062abfe7
|
feat: 积分模块完成
|
2025-02-28 18:01:53 +08:00 |
|
duan
|
f611d507bc
|
feat: 修改单规格添加时候的skuid取值
|
2025-02-28 15:29:17 +08:00 |
|
duan
|
d4b5164f79
|
feat: 耗材分组
|
2025-02-27 18:07:41 +08:00 |
|
duan
|
b140b6c662
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-02-27 16:30:32 +08:00 |
|
duan
|
6cd651d545
|
feat: 结款记录
|
2025-02-27 16:30:20 +08:00 |
|
YeMingfei666
|
bad3c20724
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-27 16:28:46 +08:00 |
|
YeMingfei666
|
022b88557f
|
fix: 更新优惠券页面，订单列表页面，代客下单页面
|
2025-02-27 16:27:09 +08:00 |
|
duan
|
af5ba4c954
|
feat: 供应商管理
|
2025-02-27 15:55:35 +08:00 |
|
duan
|
0eb09b0aab
|
feat: 修改商品列表字段
|
2025-02-27 10:36:25 +08:00 |
|
duan
|
41cecad886
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-02-27 10:20:27 +08:00 |
|
duan
|
9a16e09fa1
|
feat: 图库功能
|
2025-02-27 10:20:13 +08:00 |
|
YeMingfei666
|
2763ee2a7a
|
feat: pad点单设置修复
|
2025-02-26 17:21:06 +08:00 |
|
YeMingfei666
|
9cab42401a
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-02-26 16:01:57 +08:00 |
|
YeMingfei666
|
509b4fea60
|
feat: 新增系统方式支付设置
|
2025-02-26 15:58:48 +08:00 |
|
duan
|
3d7fa9cadd
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-26 15:52:50 +08:00 |
|
duan
|
5f41da34fb
|
feat: 商品添加图库功能未开始
|
2025-02-26 15:52:22 +08:00 |
|
YeMingfei666
|
118a25306e
|
feat: 代码合并
|
2025-02-26 14:46:24 +08:00 |
|
YeMingfei666
|
aeae74d894
|
feat: 员工账号无法登录
|
2025-02-26 14:44:39 +08:00 |
|
YeMingfei666
|
a4b49d2c57
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-02-26 14:09:18 +08:00 |
|
YeMingfei666
|
2ee461a50f
|
feat: 接入下载桌台码接口，代客下单代码调整
|
2025-02-26 14:09:04 +08:00 |
|
duan
|
36cca7aa34
|
feat: 打印机添加字段
|
2025-02-25 18:04:29 +08:00 |
|
YeMingfei666
|
98403f2acc
|
feat: 版本管理文件上传修改为 oss 真传
|
2025-02-25 17:26:11 +08:00 |
|
duan
|
2e94b34a0e
|
feat: 打印机模块
|
2025-02-25 17:16:55 +08:00 |
|
duan
|
ed2bc04d0a
|
feat: 叫号模块
|
2025-02-25 16:28:47 +08:00 |
|
YeMingfei666
|
5f9e37abaa
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-25 13:37:51 +08:00 |
|
YeMingfei666
|
4eb7744111
|
代客下单页面修改，增加店铺配置页面
|
2025-02-25 13:37:24 +08:00 |
|
duan
|
3bdde435e5
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-02-24 18:03:29 +08:00 |
|
duan
|
6da80d9b23
|
feat: 商品编辑功能
|
2025-02-24 18:03:17 +08:00 |
|
YeMingfei666
|
31fe0ba0bb
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-24 14:55:26 +08:00 |
|
YeMingfei666
|
ffcaaf9e41
|
代客下单增加商品称重弹窗
|
2025-02-24 14:55:04 +08:00 |
|
YeMingfei666
|
2d53c6ee0f
|
去除websocket链接错误失败时的弹窗
|
2025-02-24 14:17:06 +08:00 |
|
YeMingfei666
|
c8a375b492
|
修改店铺管理编辑时账号为非必填
|
2025-02-24 13:35:21 +08:00 |
|
YeMingfei666
|
d401bf442d
|
调整角色管理页面接口
|
2025-02-24 13:23:40 +08:00 |
|
YeMingfei666
|
220332c0e5
|
修复打包失败报错问题，修复菜单管理页面ts类型问题
|
2025-02-24 11:37:27 +08:00 |
|
duan
|
907b763fca
|
feat: 添加可选商品修改
|
2025-02-24 10:26:22 +08:00 |
|
YeMingfei666
|
59e1995253
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-02-24 09:51:59 +08:00 |
|
YeMingfei666
|
0e644c507f
|
增加登录，页面刷新获取店铺详情
|
2025-02-24 09:51:45 +08:00 |
|
duan
|
bad27514f3
|
feat: 修改商品类型错误
|
2025-02-24 09:44:05 +08:00 |
|
duan
|
7a508800f4
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-02-24 09:05:00 +08:00 |
|
duan
|
0354a5d98d
|
feat: 拉取代码
|
2025-02-24 09:03:50 +08:00 |
|
YeMingfei666
|
5a877b550b
|
修改打印机页面，增加叫号管理页面、霸王餐、店铺优惠券
|
2025-02-22 18:13:19 +08:00 |
|
YeMingfei666
|
5238df86e5
|
增加ipad点餐设置
|
2025-02-22 11:09:02 +08:00 |
|
YeMingfei666
|
504aa80c9e
|
代客下单修改，增加线上店铺装修页面
|
2025-02-22 10:00:04 +08:00 |
|
YeMingfei666
|
e0ae1cca67
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-21 14:42:56 +08:00 |
|
YeMingfei666
|
f961bf7d92
|
增加代客下单页面
|
2025-02-21 14:42:38 +08:00 |
|
duan
|
43ae9f371d
|
feat: 商品规格功能调整
|
2025-02-21 14:41:43 +08:00 |
|
duan
|
dc5f664143
|
feat: 商品列表添加完成一半
|
2025-02-19 18:27:12 +08:00 |
|
YeMingfei666
|
e08a2eb4b7
|
增加台桌管理页面，活动管理页面
|
2025-02-19 15:38:27 +08:00 |
|
duan
|
2a7e200015
|
feat: 商品分组
|
2025-02-19 14:10:00 +08:00 |
|
YeMingfei666
|
0758aef0fb
|
店铺管理-》员工管理增加权限设置
|
2025-02-19 11:27:46 +08:00 |
|
duan
|
00ffce98c7
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb
|
2025-02-18 18:47:37 +08:00 |
|
duan
|
dea89010e9
|
feat: 拉取代码
|
2025-02-18 18:47:15 +08:00 |
|
YeMingfei666
|
de74cad167
|
增加websocket连接，增加台桌列表页面，增加用户列表页面
|
2025-02-18 18:46:22 +08:00 |
|
YeMingfei666
|
e7a0d72d91
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-18 15:27:28 +08:00 |
|
YeMingfei666
|
ef45206230
|
增减用户列表页面，修改crud部分代码，修改店铺列表页面增加三方配置弹窗
|
2025-02-18 15:27:07 +08:00 |
|
YeMingfei666
|
964aab217d
|
修改菜单管理页面，角色管理页面，修改后台返回的路由数据适配项目
|
2025-02-17 18:31:33 +08:00 |
|
duan
|
c9a88abade
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-17 14:49:29 +08:00 |
|
duan
|
964616fc41
|
feat: 商品规格模块
|
2025-02-17 14:49:25 +08:00 |
|
YeMingfei666
|
96290b97da
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-17 10:03:39 +08:00 |
|
YeMingfei666
|
960bbada59
|
增加菜单页面，增加小程序管理页面，增加店铺员工页面
|
2025-02-17 10:03:35 +08:00 |
|
duan
|
da0888d87d
|
feat: 商品分类模块
|
2025-02-17 09:47:30 +08:00 |
|
duan
|
78523e85cc
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-14 17:30:17 +08:00 |
|
duan
|
8c70d444ce
|
feat: 添加feat: 开头才能commit代码
|
2025-02-14 17:29:32 +08:00 |
|
YeMingfei666
|
4adee9121e
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-14 17:22:01 +08:00 |
|
YeMingfei666
|
8ea7581113
|
crud编辑添加表单增加disabled属性，增加系统参数页面
|
2025-02-14 17:18:36 +08:00 |
|
duan
|
ae20f703c2
|
feat: git提交修复完成
|
2025-02-14 17:13:23 +08:00 |
|
duan
|
70959adfe9
|
feat: 修改git提交
|
2025-02-14 17:10:26 +08:00 |
|
duan
|
4ca71e7343
|
feat: 修复git提交
|
2025-02-14 17:09:48 +08:00 |
|
duan
|
f693274f85
|
feat: add new feature
|
2025-02-14 16:55:23 +08:00 |
|
duan
|
2cb0e854c7
|
fix: resolve login page layout issue
|
2025-02-14 16:51:11 +08:00 |
|
duan
|
cc6142b617
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-14 16:46:50 +08:00 |
|
duan
|
679c1c85c2
|
fix: resolve login page layout issue
|
2025-02-14 16:46:04 +08:00 |
|
YeMingfei666
|
82a5000678
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-14 15:49:41 +08:00 |
|
YeMingfei666
|
aadc208c73
|
去除订单页面不用的代码
|
2025-02-14 15:49:22 +08:00 |
|
YeMingfei666
|
9dc8e6b866
|
订单列表页面接入，修改crud搜索支持radio-button类型
|
2025-02-14 15:44:42 +08:00 |
|
duan
|
90e1bdaf78
|
常用单位完成，商品分类查询’新增‘详情
|
2025-02-14 15:35:59 +08:00 |
|
YeMingfei666
|
3cd59b4cd7
|
修改crud代码，增加textarea类型支持。修改版本管理展示
|
2025-02-14 13:56:17 +08:00 |
|
duan
|
b6df8c5d21
|
合并代码
|
2025-02-14 09:19:54 +08:00 |
|
duan
|
c918b00887
|
打印机页面添加。使用自带框架
|
2025-02-14 09:18:38 +08:00 |
|
YeMingfei666
|
12c5677a84
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-02-14 09:18:01 +08:00 |
|
YeMingfei666
|
dda2f32ccc
|
增加版本管理页面，修改店铺添加地图组件使用
|
2025-02-14 09:17:34 +08:00 |
|
duan
|
30adf7b9a0
|
添加我的组件搜索、表格、分页二开
|
2025-02-12 18:10:40 +08:00 |
|
YeMingfei666
|
0e3759b34d
|
修复地图搜索不展示搜索结果问题
|
2025-02-12 15:00:13 +08:00 |
|
YeMingfei666
|
81d6ef44ef
|
增加店铺列表页面，增加vue-amap，修改登录相关接口类型
|
2025-02-12 13:52:52 +08:00 |
|
YeMingfei666
|
a599adc63e
|
修改请求接口地址，修改登录参数
|
2025-02-11 18:10:25 +08:00 |
|
YeMingfei666
|
bb52898089
|
修改错误页面跳转以及文字
|
2025-02-08 17:01:57 +08:00 |
|
YeMingfei666
|
7491568c69
|
增加首页
|
2025-02-08 16:31:59 +08:00 |
|
YeMingfei666
|
6d3a3e7f91
|
更新路由配置，修改店铺信息展示，登录拦截
|
2025-02-08 15:52:52 +08:00 |
|
YeMingfei666
|
262bf41379
|
first commiit
|
2025-02-08 10:15:06 +08:00 |