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

431 Commits

Author SHA1 Message Date
cun-nan
6c039a70c4 bug 2024-03-07 10:36:05 +08:00
cun-nan
9b38ea9a95 bug 2024-03-07 10:04:15 +08:00
cun-nan
ae83dac42d bug 2024-03-06 14:55:15 +08:00
cun-nan
f72028b3b9 bug 2024-03-06 14:22:45 +08:00
cun-nan
fdba33f0d5 bug 2024-03-06 13:39:10 +08:00
wangh
98265a97ba Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-03-06 13:25:53 +08:00
wangh
c962a631bc no message 2024-03-06 13:25:49 +08:00
cun-nan
1fcefbc2c0 bug 2024-03-06 13:15:40 +08:00
cun-nan
cddb9231a5 bug 2024-03-06 11:28:57 +08:00
@QQNZX
43e8fa2e6c 前端 2024-03-06 09:26:20 +08:00
wangh
8ab4844445 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 
# Conflicts:
#	gasStation-uni/config.js
 2024-03-05 16:59:22 +08:00
wangh
6371ca655e no message 2024-03-05 16:45:11 +08:00
cun-nan
83b16a32e3 bug 2024-03-05 15:44:43 +08:00
cun-nan
4b1ee8a19f bug 2024-03-05 14:16:43 +08:00
@QQNZX
8166cc9a1b 前端 2024-03-05 10:06:08 +08:00
@QQNZX
4237f313e8 前端 2024-03-04 18:52:33 +08:00
cun-nan
9d869e404f bug 2024-03-02 16:41:18 +08:00
cun-nan
55e449a45d bug 2024-03-01 15:38:46 +08:00
cun-nan
c71ddb7e82 bug 2024-02-29 18:06:34 +08:00
cun-nan
c79e5b3e9a bug 2024-02-28 18:02:53 +08:00
cun-nan
5fe8443e1b bug 2024-02-27 18:08:55 +08:00
cun-nan
101ef539c3 bug 2024-02-27 17:59:16 +08:00
cun-nan
4af99bb62e bug 2024-02-23 18:00:16 +08:00
cun-nan
bf998c65b6 bug 2024-02-20 17:52:09 +08:00
cun-nan
857f954c2c bug 2024-02-20 13:33:34 +08:00
cun-nan
26555b9dbc bug 2024-02-20 11:00:47 +08:00
cun-nan
87b4f3595b bug 2024-02-19 18:06:02 +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
cun-nan
1ff31e1338 bug 2024-02-06 18:10:15 +08:00
cun-nan
fd0091634f bug 2024-02-06 16:35:34 +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
齐天大圣
96eaddcd7c Merge remote-tracking branch 'origin/master' 2024-02-05 18:00:50 +08:00
齐天大圣
1e9cdce8c3 一键发券 2024-02-05 18:00:37 +08:00
cun-nan
9f5d333798 bug 2024-02-04 18:08:43 +08:00
cun-nan
e38c87edaf bug 2024-02-03 13:47:34 +08:00
@QQNZX
4f377a7212 前端 2024-02-03 09:33:52 +08:00
cun-nan
d463a82cd6 bug 2024-02-02 09:35:14 +08:00
齐天大圣
32959d1641 Merge remote-tracking branch 'origin/master' 2024-02-01 15:54:09 +08:00
齐天大圣
7e11f77a6e 一键发券 2024-02-01 15:53:54 +08:00
cun-nan
8a943fdb10 bug 2024-01-31 17:05:12 +08:00
cun-nan
79c152ca76 bug 2024-01-30 16:04:49 +08:00
cun-nan
cedf3c7281 bug 2024-01-29 18:18:30 +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
58e5f81d8b Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2024-01-29 14:23:44 +08:00
wangh
a2028102d4 支付宝兼容 2024-01-29 14:23:39 +08:00
齐天大圣
ab435b6055 一键发券 2024-01-29 14:11:55 +08:00
cun-nan
237466ee75 bug 2024-01-29 11:51:24 +08:00
cun-nan
0e40832516 bug 2024-01-27 17:58:07 +08:00
齐天大圣
461f6b83a4 领券bug 2024-01-27 15:46:13 +08:00
cun-nan
a51ebc2ce3 bug 2024-01-27 14:10:02 +08:00
齐天大圣
9d96f86dd6 Merge remote-tracking branch 'origin/master' 2024-01-27 13:56:05 +08:00
齐天大圣
39bcd86010 领券bug 2024-01-27 13:55:55 +08:00
cun-nan
de750590f1 bug 2024-01-27 11:35:35 +08:00
cun-nan
32cb50848f bug 2024-01-27 10:51:32 +08:00
cun-nan
249b30da4d bug 2024-01-27 09:05:50 +08:00
cun-nan
c1bb1af124 bug 2024-01-26 13:33:09 +08:00
wangh
bb13e3bd35 验证openId 2024-01-26 10:48:51 +08:00
齐天大圣
b36bd2c463 领券bug 2024-01-25 16:43:19 +08:00
齐天大圣
561542338c 领券bug 2024-01-25 15:55:45 +08:00
cun-nan
fced742168 bug 2024-01-25 13:19:17 +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
齐天大圣
0c151ad2b2 Merge remote-tracking branch 'origin/master' 2024-01-24 15:22:29 +08:00
齐天大圣
8215f03ac9 bug 2024-01-24 15:22:16 +08:00
cun-nan
5470356f7e bug 2024-01-24 15:14:48 +08:00
cun-nan
819624e4e8 bug 2024-01-24 14:35:00 +08:00
cun-nan
cf631ad033 bug 2024-01-23 18:14:56 +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
c2ceb9e13b Merge remote-tracking branch 'origin/master' 2024-01-23 10:45:30 +08:00
齐天大圣
937fcee22f Merge remote-tracking branch 'origin/master' 2024-01-23 10:42:20 +08:00
齐天大圣
49ac39e908 bug 2024-01-23 10:42:12 +08:00
cun-nan
3a6f73f33e bug 2024-01-23 09:55:23 +08:00
@QQNZX
6dada2c04f Merge remote-tracking branch 'origin/master' 2024-01-23 09:47:04 +08:00
@QQNZX
7aab20e954 前端 2024-01-23 09:46:50 +08:00
cun-nan
25cd5cb003 bug 2024-01-23 09:26:10 +08:00
cun-nan
a43012cda0 bug 2024-01-22 18:05:19 +08:00
cun-nan
43b6dad16d bug 2024-01-22 16:14:28 +08:00
cun-nan
cadb4ce475 bug 2024-01-22 14:25:45 +08:00
cun-nan
b2c17babe9 bug 2024-01-22 09:08:20 +08:00
cun-nan
af1a1a25f0 bug 2024-01-20 18:11:29 +08:00
cun-nan
fcb8ddb9ca bug 2024-01-20 11:48:52 +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
e5ab331e71 no message 2024-01-19 18:29:07 +08:00
wangh
75c34d33f3 bug处理 2024-01-19 18:28:40 +08:00
@QQNZX
87b369c62b 前端 2024-01-19 17:08:34 +08:00
@QQNZX
060236f6ce 前端 2024-01-19 16:18:40 +08:00
@QQNZX
f39a17efae Merge remote-tracking branch 'origin/master' 2024-01-19 16:07:23 +08:00
@QQNZX
d406fb97a0 前端 2024-01-19 16:07:11 +08:00
cun-nan
5c4922d656 bug 2024-01-19 14:54:59 +08:00
cun-nan
8d249e7e5e bug 2024-01-19 13:44:13 +08:00
cun-nan
1c806f5c4d bug 2024-01-18 18:15:24 +08:00