Commit Graph

288 Commits

Author SHA1 Message Date
eae119f033 优化项 2024-01-05 18:27:59 +08:00
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-05 14:30:27 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
wangh
9f3dadf902 no message 2024-01-02 11:22:29 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
830e435b56 子卡信息 2023-12-28 17:31:50 +08:00
cd24222c2a 子卡信息 2023-12-28 13:14:35 +08:00
323add1517 会员信息 2023-12-27 18:44:56 +08:00
wangh
22d78d8b5f 小票打印--积分支付--中台设置流水 2023-12-26 09:50:37 +08:00
9edf62a5a2 二维码 2023-12-25 18:10:00 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
ffeb4a4254 门店信息 2023-12-18 18:44:02 +08:00
217c669407 订单信息 2023-12-13 18:43:50 +08:00
6451143ec3 订单信息 2023-12-07 18:28:31 +08:00
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
@QQNZX
3e22074fa1 12.05前端 2023-12-05 11:41:42 +08:00
@QQNZX
1042b55806 12.05前端 2023-12-05 11:16:58 +08:00
0416cb19d0 会员信息 2023-12-04 16:35:09 +08:00
wangh
81749b3388 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-12-01 15:42:28 +08:00
wangh
78c6d5d5d9 no message 2023-12-01 15:42:23 +08:00
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
e42e7dbbe3 会员信息 2023-11-30 11:48:14 +08:00
cec9d85b3a 收银台 2023-11-28 18:33:35 +08:00
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00
wangh
b00edb2f12 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:58 +08:00
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug
修改
2023-11-25 18:08:15 +08:00
@QQNZX
e7ebac6b34 Merge remote-tracking branch 'origin/master' 2023-11-25 15:31:18 +08:00
@QQNZX
2dee747f0c 11.22前端 2023-11-25 15:31:09 +08:00
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
f706797001 bug修改 2023-11-24 17:59:53 +08:00
wangh
7e8e0fac03 修改 2023-11-24 10:23:59 +08:00
wangh
0aac738281 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-24 09:18:46 +08:00
wangh
7ad76afaca 修改 2023-11-24 09:18:11 +08:00
302a7850fe 收银台 2023-11-23 18:37:40 +08:00
wangh
d68f87b29b bug修改 2023-11-23 18:33:25 +08:00
58db28edfb 收银台 2023-11-22 18:10:36 +08:00
@QQNZX
d2ae2e29c5 11.22前端 2023-11-22 17:05:07 +08:00
@QQNZX
729c9ec320 Merge remote-tracking branch 'origin/master' 2023-11-22 09:06:41 +08:00
@QQNZX
9031fbbe18 11.22前端 2023-11-22 09:06:13 +08:00
f0a970479f 收银台 2023-11-21 18:18:35 +08:00
wangh
b51938071a Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-21 18:12:04 +08:00
wangh
174bfee9d5 bug修改 2023-11-21 18:11:49 +08:00
@QQNZX
3cc308ba41 11.21前端 2023-11-21 18:05:11 +08:00
@QQNZX
5988a46511 11.21前端 2023-11-21 16:44:51 +08:00
7ec55c0386 收银台 2023-11-20 19:53:05 +08:00
@QQNZX
53524364dc 11.20前端 2023-11-20 11:23:38 +08:00
@QQNZX
5009a627aa Merge remote-tracking branch 'origin/master' 2023-11-20 09:29:19 +08:00
@QQNZX
a62eb32734 11.20 2023-11-20 09:28:45 +08:00
273351cb35 收银台 2023-11-17 17:26:12 +08:00
wangh
516f80e57b 收银台 2023-11-17 16:38:17 +08:00
wangh
db19da43e8 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-17 16:37:39 +08:00
wangh
a8898a5140 1 2023-11-17 16:37:33 +08:00
b9b49fcb62 收银台 2023-11-17 16:33:36 +08:00
@QQNZX
0935f6b5f4 11.16 2023-11-17 15:12:06 +08:00
@QQNZX
0747a79c6f 11.16 2023-11-17 13:09:47 +08:00
6f1406f8c6 收银台 2023-11-16 19:00:57 +08:00
wangh
4ef7e1cdca Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintCashierWeb/.env.development
2023-11-16 18:42:37 +08:00
wangh
b1329a0dcc 积分兑换 2023-11-16 18:40:50 +08:00
@QQNZX
dde0c7d4ee 11.16 2023-11-16 17:50:02 +08:00
5bafce40c5 收银台 2023-11-15 18:48:07 +08:00
757d9c5adb 收银台 2023-11-14 19:00:25 +08:00
wangh
9fb78cf532 积分 2023-11-14 18:53:58 +08:00
c06e8b1c59 收银台 2023-11-13 16:51:57 +08:00
79134699fd 收银台 2023-11-11 18:04:49 +08:00
c9c66c61dd 收银台 2023-11-11 13:54:24 +08:00
42b625266d 收银台 2023-11-10 18:10:23 +08:00
79cded741a 收银台 2023-11-09 18:52:12 +08:00
a1138b726d 收银台 2023-11-09 13:59:06 +08:00
8ed145b436 收银台 2023-11-09 13:57:48 +08:00
a3f8c672f1 收银台 2023-11-09 13:51:57 +08:00
3c1a0c7ca9 收银台 2023-11-08 18:07:17 +08:00
67e94f78a8 收银台 2023-11-07 18:12:17 +08:00
17661f6115 收银台 2023-11-06 18:06:29 +08:00
6a815ef61b 便利店 2023-11-03 18:04:15 +08:00
5472e4253b 便利店 2023-11-03 15:59:38 +08:00
486da7ca40 10.17 16:57 2023-10-31 18:16:38 +08:00
38b2b16fce 收银台 2023-10-27 18:06:06 +08:00
99582ce083 收银台 2023-10-27 17:40:18 +08:00
93c1c6e04d 收银台 2023-10-27 16:31:27 +08:00
5040d2d9e1 收银台 2023-10-26 09:32:37 +08:00
8352210bfa 123 2023-10-24 18:52:17 +08:00
18cbb90abd 10.17 16:57 2023-10-23 15:17:08 +08:00
1437fa9ed7 init 2023-10-09 11:12:49 +08:00