 YeMingfei666
|
704fee1e2d
|
增加临时菜页面
|
2024-11-19 14:35:36 +08:00 |
|
YeMingfei666
|
f99fcad9bf
|
代客下单确认订单修改根据购物车数据选中就餐模式
|
2024-11-19 11:35:34 +08:00 |
|
YeMingfei666
|
6cf47c6365
|
修改订单支付输入积分弹窗样式
|
2024-11-19 11:34:38 +08:00 |
|
YeMingfei666
|
66685c3d7e
|
修改代客下单确认订单时获取就餐模式代码
|
2024-11-19 11:29:49 +08:00 |
|
YeMingfei666
|
173d73ae70
|
修改是否启用会员价的字段
|
2024-11-19 10:18:19 +08:00 |
|
YeMingfei666
|
86e920017b
|
订单支付增加编辑积分
|
2024-11-18 16:22:37 +08:00 |
|
YeMingfei666
|
66e415051b
|
修复判断是否使用会员价报错问题
|
2024-11-18 16:22:14 +08:00 |
|
YeMingfei666
|
94d91a14b4
|
修改代客下单布局节点信息不再获取缓存，缓存会导致左右联动出现问题
|
2024-11-18 15:20:25 +08:00 |
|
YeMingfei666
|
f80de032d8
|
代码合并,放出霸王餐和优惠券
|
2024-11-18 15:08:14 +08:00 |
|
YeMingfei666
|
2776cbe13c
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev
|
2024-11-18 15:06:38 +08:00 |
|
YeMingfei666
|
40514ef243
|
代客下单，订单管理修改会员价的判断依据，增加isMember字段
|
2024-11-18 15:05:49 +08:00 |
|
YeMingfei666
|
09079c3384
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-18 11:41:30 +08:00 |
|
YeMingfei666
|
16cfbfec63
|
修改时间选择组件小程序上，选择不包含时分秒时返回了错误的时间字符串问题
|
2024-11-18 11:41:17 +08:00 |
|
YeMingfei666
|
67f92a91b8
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-18 11:04:28 +08:00 |
|
YeMingfei666
|
c9825f8df7
|
订单支付增加优惠券积分
|
2024-11-18 11:03:54 +08:00 |
|
YeMingfei666
|
d5dbd51c80
|
修改部分功公共方法
|
2024-11-18 11:03:25 +08:00 |
|
YeMingfei666
|
5a63a8324d
|
修改积分字段
|
2024-11-18 11:02:57 +08:00 |
|
YeMingfei666
|
03d820bc9a
|
代客下单增加扫码选择桌台
|
2024-11-15 15:13:16 +08:00 |
|
YeMingfei666
|
0d1d353830
|
修改代客下单确认订单积分字段
|
2024-11-15 14:26:19 +08:00 |
|
YeMingfei666
|
cb52b972b9
|
修改代客下单选择用户用户积分字段
|
2024-11-15 14:25:50 +08:00 |
|
YeMingfei666
|
fb84f53029
|
修复代客下单左右联动失效问题
|
2024-11-15 14:25:06 +08:00 |
|
YeMingfei666
|
1bf820be53
|
修改支付订单时选择满减券的限制
|
2024-11-13 17:37:53 +08:00 |
|
YeMingfei666
|
d6f148c2a9
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-13 10:08:05 +08:00 |
|
YeMingfei666
|
9167ee9a9b
|
增加订单列表优惠券抵扣商品划线，优化价格长度计算
|
2024-11-12 10:51:38 +08:00 |
|
YeMingfei666
|
5476a6af41
|
增加限制，商品券抵扣的商品不可退款
|
2024-11-12 10:01:57 +08:00 |
|
YeMingfei666
|
c41f78fca8
|
增加商品券限制，过滤不满足使用条件的商品券
|
2024-11-12 09:49:34 +08:00 |
duan
|
27deb4db4a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-11 17:06:12 +08:00 |
|
duan
|
2a40135ac0
|
员工管理角色回显
|
2024-11-11 17:05:47 +08:00 |
|
YeMingfei666
|
7d39bc2bee
|
修改订单支付优惠券积分
|
2024-11-11 16:09:25 +08:00 |
|
YeMingfei666
|
2691cf9b53
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 13:20:45 +08:00 |
|
YeMingfei666
|
7d4f1607fe
|
增加隐私政策
|
2024-11-11 11:49:50 +08:00 |
|
YeMingfei666
|
aad78417b8
|
增加商品券选择判断限制
|
2024-11-11 11:17:26 +08:00 |
|
YeMingfei666
|
71535693bb
|
修复组件报错问题
|
2024-11-11 10:12:13 +08:00 |
|
YeMingfei666
|
e0e5f703a1
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 10:07:36 +08:00 |
|
YeMingfei666
|
6f9a35f4d7
|
修改商品编辑保存字段skuSnap里的label换为name,修改商品名称长度为1-40
|
2024-11-11 10:06:24 +08:00 |
|
YeMingfei666
|
1f3a66906f
|
1.0隐藏霸王餐
|
2024-11-11 09:43:17 +08:00 |
|
YeMingfei666
|
7f265b7583
|
增加券
|
2024-11-11 09:38:09 +08:00 |
|
duan
|
ebc7a80feb
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-08 14:50:49 +08:00 |
|
duan
|
3838036f8a
|
隐藏年月日
|
2024-11-08 14:50:26 +08:00 |
|
YeMingfei666
|
1836a5b10b
|
增加确认订单会员价
|
2024-11-07 17:26:54 +08:00 |
|
YeMingfei666
|
f2f5bac39e
|
修改订单详情订单列表价格展示，增加会员价
|
2024-11-06 17:37:56 +08:00 |
|
YeMingfei666
|
80a096cd97
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_1.0.0
|
2024-11-06 17:35:17 +08:00 |
|
YeMingfei666
|
da9d08a91e
|
修复订单支付页面，选择用户未携带orderId
|
2024-11-06 17:34:42 +08:00 |
|
duan
|
885a3a0535
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-06 11:01:59 +08:00 |
|
duan
|
d885fb521d
|
取号换行
|
2024-11-06 11:01:46 +08:00 |
|
YeMingfei666
|
9c2b882478
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-05 16:47:42 +08:00 |
|
YeMingfei666
|
3f4d8ac53b
|
增加订单支付优惠券页面
|
2024-11-05 16:47:34 +08:00 |
|
YeMingfei666
|
d4c309cdc7
|
修改时间选择组件部分代码
|
2024-11-05 15:10:56 +08:00 |
|
duan
|
a4d36b3fa8
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-05 10:33:37 +08:00 |
|
duan
|
cfed8ea183
|
耗材问题修复
|
2024-11-05 10:33:26 +08:00 |