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

263 Commits

Author SHA1 Message Date
cun-nan
101ef539c3 bug 2024-02-27 17:59:16 +08:00
wangh
570f8c9c0f no message 2024-02-27 15:32:58 +08:00
wangh
00386746aa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-27 14:03:52 +08:00
wangh
50cd7a5a34 no message 2024-02-27 14:03:47 +08:00
cun-nan
e47d92d168 bug 2024-02-26 19:27:54 +08:00
wangh
a11a04be18 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
 2024-02-26 15:09:55 +08:00
wangh
71ad3c3085 bug处理 2024-02-26 15:08:32 +08:00
cun-nan
a69b4d806e bug 2024-02-26 15:05:21 +08:00
cun-nan
4af99bb62e bug 2024-02-23 18:00:16 +08:00
cun-nan
08d2140ca7 bug 2024-02-22 17:53:41 +08:00
cun-nan
702dceb375 bug 2024-02-21 17:02:13 +08:00
cun-nan
bf998c65b6 bug 2024-02-20 17:52:09 +08:00
wangh
e804dff7d5 退款 2024-02-20 10:58:23 +08:00
wangh
a0629a80fa Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-19 16:38:08 +08:00
wangh
6f6988b8b2 no message 2024-02-19 16:38:03 +08:00
cun-nan
b137edcac0 bug 2024-02-19 16:03:34 +08:00
cun-nan
9b11659153 bug 2024-02-18 18:09:52 +08:00
wangh
e5a24d3c83 no message 2024-02-07 17:29:50 +08:00
wangh
ad7f7356c7 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-07 11:07:07 +08:00
wangh
dd08ddd5f1 no message 2024-02-07 11:07:03 +08:00
cun-nan
3c6defd2c6 bug 2024-02-06 16:48:14 +08:00
cun-nan
fd0091634f bug 2024-02-06 16:35:34 +08:00
wangh
bca15b8ae5 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-06 15:48:31 +08:00
wangh
7e48ac59dd no message 2024-02-06 15:48:25 +08:00
cun-nan
ef6ee5aef0 bug 2024-02-06 13:38:17 +08:00
cun-nan
bfef076269 bug 2024-02-06 11:38:42 +08:00
cun-nan
7c538e5aab bug 2024-02-05 18:09:05 +08:00
wangh
614387248f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-02-05 17:35:47 +08:00
wangh
a32a779fe0 no message 2024-02-05 17:35:38 +08:00
cun-nan
9f5d333798 bug 2024-02-04 18:08:43 +08:00
cun-nan
033a66f12d bug 2024-02-04 13:37:04 +08:00
cun-nan
e38c87edaf bug 2024-02-03 13:47:34 +08:00
cun-nan
206f171544 bug 2024-02-02 18:02:17 +08:00
cun-nan
3bf7dc3b70 bug 2024-02-01 17:52:17 +08:00
wangh
c997873f10 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/details/index.vue
 2024-02-01 11:33:33 +08:00
wangh
d789b8b85a bug修改 2024-02-01 11:31:55 +08:00
cun-nan
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
cun-nan
788fba4dae bug 2024-01-30 19:40:58 +08:00
cun-nan
79c152ca76 bug 2024-01-30 16:04:49 +08:00
wangh
8b907e9ad0 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintAdmin/.env.development
#	fuintAdmin_zt/.env.development
 2024-01-30 09:57:21 +08:00
wangh
189f6dff68 no message 2024-01-30 09:56:03 +08:00
@QQNZX
b5c6f8382f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gasStation-uni/pages/index/index.vue
 2024-01-29 14:50:40 +08:00
@QQNZX
83629529d5 前端 2024-01-29 14:50:20 +08:00
cun-nan
d7d8256135 bug 2024-01-29 14:26:14 +08:00
wangh
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
cun-nan
0e40832516 bug 2024-01-27 17:58:07 +08:00
cun-nan
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
cun-nan
249b30da4d bug 2024-01-27 09:05:50 +08:00
wangh
a89ca421cd Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-26 16:57:35 +08:00
wangh
50dcb6898c 验证码登录 2024-01-26 16:57:27 +08:00
cun-nan
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
wangh
3d3ea7ba06 no message 2024-01-25 16:48:08 +08:00
wangh
0760093344 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-25 10:25:02 +08:00
wangh
a09d3208af no message 2024-01-25 10:24:55 +08:00
cun-nan
18ce89b555 bug 2024-01-25 09:18:06 +08:00
cun-nan
cd43e4f48a bug 2024-01-24 18:11:58 +08:00
wangh
661fb65605 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 17:33:02 +08:00
wangh
f4f9ec07ff no message 2024-01-24 17:32:57 +08:00
cun-nan
803e28bdcd bug 2024-01-24 17:10:37 +08:00
wangh
149d4120ae no message 2024-01-24 15:22:32 +08:00
cun-nan
5470356f7e bug 2024-01-24 15:14:48 +08:00
wangh
e423293f5c Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-24 15:07:35 +08:00
wangh
13af4ffd80 打印 2024-01-24 15:07:26 +08:00
cun-nan
819624e4e8 bug 2024-01-24 14:35:00 +08:00
cun-nan
15ca62967e bug 2024-01-23 16:02:28 +08:00
wangh
3646bc94b9 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-23 14:19:42 +08:00
wangh
5aa43002fd 打印处理 2024-01-23 14:19:35 +08:00
cun-nan
fc1ccdd60e bug 2024-01-22 14:28:30 +08:00
cun-nan
179f49c58f bug 2024-01-22 11:51:12 +08:00
N
c1e0c75bca bug 2024-01-20 23:17:50 +08:00
cun-nan
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
cun-nan
06fcb5fe98 bug 2024-01-19 18:48:13 +08:00
wangh
662f21012d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
 2024-01-19 18:32:13 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
齐天大圣
f467023ba0 bug 2024-01-19 14:28:32 +08:00
wangh
66910b4bf4 bug处理 2024-01-18 18:06:07 +08:00
wangh
46913be03f Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
 2024-01-18 09:03:42 +08:00
wangh
5c65399290 退款以及订单统计 2024-01-18 09:01:26 +08:00
cun-nan
0111c8055c bug 2024-01-17 17:36:21 +08:00
cun-nan
e9dd0600c2 bug 2024-01-17 14:14:19 +08:00
wangh
82a739ce75 退款处理 2024-01-16 16:10:28 +08:00
cun-nan
4cddc769d1 bug 2024-01-16 14:42:20 +08:00
cun-nan
41bf52b5bf bug 2024-01-16 14:19:08 +08:00
cun-nan
2398ead499 bug 2024-01-16 11:30:23 +08:00
wangh
6e16f6ac5d Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-16 09:38:22 +08:00
wangh
7768b2faf3 退款接口 2024-01-16 09:38:15 +08:00
cun-nan
298977bb25 bug 2024-01-15 18:17:40 +08:00
cun-nan
8ca3554f0c bug 2024-01-15 16:10:11 +08:00
cun-nan
3f243f5c63 bug 2024-01-15 14:00:24 +08:00
wangh
a3c31a8d59 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-01-15 13:43:41 +08:00
wangh
a92a25fb28 bug 2024-01-15 13:41:32 +08:00
@QQNZX
0ec2ff3c91 前端 2024-01-15 13:36:34 +08:00
@QQNZX
89d2d71152 前端 2024-01-15 11:39:48 +08:00
cun-nan
ea8bab751a bug 2024-01-13 18:01:23 +08:00
cun-nan
536428b2c2 bug 2024-01-13 15:16:57 +08:00
cun-nan
87f9377e74 bug 2024-01-13 14:21:09 +08:00
齐天大圣
18d96bb254 Merge remote-tracking branch 'origin/master' 2024-01-13 13:50:29 +08:00
齐天大圣
7d9d150c38 修改bug 2024-01-13 13:50:18 +08:00
wangh
0ed07ccd49 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-13 13:24:02 +08:00
齐天大圣
77df396e46 Merge remote-tracking branch 'origin/master' 2024-01-13 13:22:42 +08:00