dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
773 Commits 2 Branches 0 Tags 190 MiB
c0d643db47
Commit Graph

148 Commits

Author SHA1 Message Date
zhaohengkun
8746387651 BUG + 收银台调整 2024-10-18 10:04:57 +08:00
zhaohengkun
68a94aa3fc Merge remote-tracking branch 'origin/main' 2024-10-18 09:34:48 +08:00
zhaohengkun
e8a4da0826 BUG + 收银台调整 2024-10-18 09:33:26 +08:00
cun-nan
a7272a1b4f 10.18 2024-10-18 09:30:32 +08:00
cun-nan
a9727156f7 10.17 2024-10-17 17:46:51 +08:00
DESKTOP-369JRHT\12997
46be42fc5a 10.16 2024-10-17 14:35:24 +08:00
DESKTOP-369JRHT\12997
29b603889b 10.16 2024-10-16 20:00:39 +08:00
cun-nan
1da831fd2b 10.16 2024-10-16 11:31:40 +08:00
cun-nan
8a4189a778 10.15 2024-10-15 16:09:34 +08:00
cun-nan
977648f815 10.15 2024-10-15 14:27:49 +08:00
cun-nan
681cfddf20 10.14 2024-10-14 18:00:48 +08:00
zhaohengkun
ce00c3393b 油站端-收银端 复制功能 2024-10-14 17:48:18 +08:00
zhaohengkun
1aee452526 1 2024-10-14 16:32:01 +08:00
cun-nan
987ecc70df 10.14 2024-10-14 16:16:07 +08:00
zhaohengkun
dea17c543e 1 2024-10-14 14:50:36 +08:00
DESKTOP-369JRHT\12997
b3e7f6b61e 10.11 2024-10-12 14:51:25 +08:00
cun-nan
5ec65bef7b 10.12 2024-10-12 11:43:08 +08:00
zhaohengkun
7121aaccf0 1 2024-10-12 09:01:34 +08:00
zhaohengkun
9e6ca618aa Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-10-11 17:23:01 +08:00
zhaohengkun
ac483aee69 1 2024-10-11 17:17:09 +08:00
DESKTOP-369JRHT\12997
e7af9f6b53 10.11 2024-10-11 14:52:33 +08:00
DESKTOP-369JRHT\12997
4ec385d97f 10.10 2024-10-11 09:16:49 +08:00
zhaohengkun
3bc9fcf7ae 对参数 2024-10-10 19:48:32 +08:00
13405411873
fc39df7628 营销活动 2024-10-10 18:52:22 +08:00
DESKTOP-369JRHT\12997
b2012abf88 10.10 2024-10-10 16:51:55 +08:00
DESKTOP-369JRHT\12997
f438ff47b8 10.9 2024-10-10 16:19:07 +08:00
DESKTOP-369JRHT\12997
94fb9e5b34 10.9 2024-10-10 15:07:52 +08:00
cun-nan
7fec6165b5 10.9 2024-10-09 17:48:51 +08:00
13405411873
89fe6b7fa8 营销活动 2024-10-09 17:32:17 +08:00
DESKTOP-369JRHT\12997
3d087f8f5c 10.9 2024-10-09 17:23:11 +08:00
DESKTOP-369JRHT\12997
ec52b4c8ca 10.9 2024-10-09 16:13:41 +08:00
cun-nan
484af8e842 10.9 2024-10-09 15:38:12 +08:00
DESKTOP-369JRHT\12997
d1cd87e387 10.9 2024-10-09 15:24:15 +08:00
DESKTOP-369JRHT\12997
7ed57397c0 10.9 2024-10-09 09:11:59 +08:00
DESKTOP-369JRHT\12997
78effe2560 10.8 2024-10-08 17:58:32 +08:00
DESKTOP-369JRHT\12997
de2de90d64 10.8 2024-10-08 16:02:54 +08:00
DESKTOP-369JRHT\12997
e199d1f848 10.8 2024-10-08 15:48:58 +08:00
13405411873
deb3db0b95 营销活动 2024-10-08 14:11:20 +08:00
DESKTOP-369JRHT\12997
23e9d78e8c 10.8 2024-10-08 13:57:18 +08:00
13405411873
2fc94aad3d 营销活动 2024-10-08 11:38:41 +08:00
DESKTOP-369JRHT\12997
888a6709e2 9.30 2024-09-30 14:10:07 +08:00
DESKTOP-369JRHT\12997
712310817a 9.30 2024-09-30 10:30:55 +08:00
DESKTOP-369JRHT\12997
cc621ac5a2 9.29 2024-09-29 15:34:42 +08:00
DESKTOP-369JRHT\12997
467fb91019 9.27 2024-09-29 15:30:09 +08:00
DESKTOP-369JRHT\12997
6946ba6a15 9.27 2024-09-28 15:11:51 +08:00
DESKTOP-369JRHT\12997
aba8d7a4f6 9.27 2024-09-27 17:33:51 +08:00
DESKTOP-369JRHT\12997
8cea951790 9.27 2024-09-27 14:10:40 +08:00
Vinjor
d0e3751aac Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
 2024-09-27 10:10:29 +08:00
Vinjor
21e34c8ebe 收银台 2024-09-27 10:05:48 +08:00
DESKTOP-369JRHT\12997
b5ee5634d7 9.27 2024-09-27 09:23:47 +08:00
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
13405411873
563bb48cea 营销活动 2024-09-25 15:56:24 +08:00
zhaotianfeng
26df427f9a 修改 2024-09-25 12:00:15 +08:00
cun-nan
146969fdb0 9.24 2024-09-24 17:47:29 +08:00
cun-nan
673c2637d6 9.24 2024-09-24 17:38:35 +08:00
13405411873
9550524c41 收银台 2024-09-24 11:28:46 +08:00
13405411873
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
13405411873
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
13405411873
05c1363139 处理数据 2024-09-22 16:37:06 +08:00
13405411873
a492c42d4e 处理数据 2024-09-22 09:54:04 +08:00
cun-nan
ca6c095895 9.21 2024-09-21 11:33:14 +08:00
13405411873
b49079e40e 处理数据 2024-09-21 11:17:25 +08:00
DESKTOP-369JRHT\12997
314fdca580 9.21 2024-09-21 09:54:19 +08:00
13405411873
e95df63792 处理数据 2024-09-21 09:38:25 +08:00
13405411873
c63f0e378e 处理数据 2024-09-21 09:31:11 +08:00
13405411873
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
cun-nan
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
cun-nan
3a60ce4a65 9.6 2024-09-06 13:40:02 +08:00
cun-nan
703f4e733b 营销 2024-09-05 16:37:42 +08:00
愉快的大福
3eedf15712 12 2024-08-27 10:18:27 +08:00
cun-nan
b6d3e2cbfc init 2024-08-16 18:26:19 +08:00