Commit Graph

148 Commits

Author SHA1 Message Date
Vinjor
e71c53ef96 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-26 13:45:56 +08:00
Vinjor
0f2503f73a 收银台 2024-09-26 13:45:48 +08:00
563bb48cea 营销活动 2024-09-25 15:56:24 +08:00
zhaotianfeng
26df427f9a 修改 2024-09-25 12:00:15 +08:00
146969fdb0 9.24 2024-09-24 17:47:29 +08:00
673c2637d6 9.24 2024-09-24 17:38:35 +08:00
9550524c41 收银台 2024-09-24 11:28:46 +08:00
1d6fa2c014 收银台 2024-09-24 11:26:20 +08:00
Vinjor
c7be416570 收银台优惠活动查询 2024-09-22 20:24:44 +08:00
Vinjor
a352d84ed6 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-22 18:53:19 +08:00
Vinjor
8c5c07aa0e 收银台 2024-09-22 18:53:15 +08:00
0417b46d55 处理数据 2024-09-22 18:34:17 +08:00
Vinjor
f7f711e3f2 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/src/api/newHome/newHome.js
2024-09-22 17:32:26 +08:00
Vinjor
aa58951e10 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
2024-09-22 16:37:43 +08:00
05c1363139 处理数据 2024-09-22 16:37:06 +08:00
a492c42d4e 处理数据 2024-09-22 09:54:04 +08:00
ca6c095895 9.21 2024-09-21 11:33:14 +08:00
b49079e40e 处理数据 2024-09-21 11:17:25 +08:00
DESKTOP-369JRHT\12997
314fdca580 9.21 2024-09-21 09:54:19 +08:00
e95df63792 处理数据 2024-09-21 09:38:25 +08:00
c63f0e378e 处理数据 2024-09-21 09:31:11 +08:00
b68287a4dc 处理数据 2024-09-21 09:24:50 +08:00
Vinjor
76407ff2ca Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-21 09:14:18 +08:00
Vinjor
776ab61925 收银台 2024-09-21 09:14:15 +08:00
DESKTOP-369JRHT\12997
67ab67e6ac 9.19 2024-09-19 17:22:30 +08:00
zhaotianfeng
353ef5a01c 积分商城 点击事件 移到外层 2024-09-18 10:21:13 +08:00
e55d2df123 9.14 2024-09-14 11:46:31 +08:00
zhaotianfeng
d30610dff5 收银台 商品 按钮样式调试 2024-09-14 11:03:53 +08:00
zhaotianfeng
d67892841f 注释掉新查询 2024-09-14 10:38:48 +08:00
zhaotianfeng
5c77701eca 收银台 前端页面 商品油品订单挂单 2024-09-14 10:09:23 +08:00
zhaotianfeng
490ac37b45 收银端-会员 交班 和 油站端同步 2024-09-12 14:15:24 +08:00
DESKTOP-369JRHT\12997
9c4b6eba7f 9.12 2024-09-12 13:58:21 +08:00
DESKTOP-369JRHT\12997
93d5e26b8c 9.12 2024-09-12 12:03:37 +08:00
DESKTOP-369JRHT\12997
db30072802 9.12 2024-09-12 11:49:20 +08:00
DESKTOP-369JRHT\12997
dc2764b990 9.9 2024-09-12 11:28:21 +08:00
DESKTOP-369JRHT\12997
ad1f4b2934 Merge remote-tracking branch 'origin/main' 2024-09-12 11:20:06 +08:00
DESKTOP-369JRHT\12997
98cc76570c 9.9 2024-09-12 11:19:56 +08:00
zhaotianfeng
0469990593 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-12 09:27:22 +08:00
zhaotianfeng
3c54e50b7d 订单相关 2024-09-12 09:26:32 +08:00
DESKTOP-369JRHT\12997
49ff4c0281 9.9 2024-09-11 18:14:20 +08:00
DESKTOP-369JRHT\12997
9322714578 9.9 2024-09-11 16:45:25 +08:00
DESKTOP-369JRHT\12997
469a62f562 9.9 2024-09-11 11:06:27 +08:00
DESKTOP-369JRHT\12997
bea205f876 9.9 2024-09-10 14:58:47 +08:00
DESKTOP-369JRHT\12997
cdc81391c8 9.8 2024-09-08 17:38:26 +08:00
3a60ce4a65 9.6 2024-09-06 13:40:02 +08:00
703f4e733b 营销 2024-09-05 16:37:42 +08:00
愉快的大福
3eedf15712 12 2024-08-27 10:18:27 +08:00
b6d3e2cbfc init 2024-08-16 18:26:19 +08:00