Commit Graph

1444 Commits

Author SHA1 Message Date
wangh
d0769e8e9e 1 2023-11-27 15:53:33 +08:00
wangh
415b9ca9c1 1 2023-11-27 15:53:06 +08:00
3a0115921e 提交忽略文件 2023-11-27 14:53:59 +08:00
1be25e479a 11.27.14.18 2023-11-27 14:20:20 +08:00
乌云
204512efd3
删除文件 gasStation-uni 2023-11-27 06:02:40 +00:00
01476d8972 11.27 2023-11-27 13:44:50 +08:00
ebcd2dbd39 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gasStation-uni/App.vue
#	gasStation-uni/main.js
#	gasStation-uni/package-lock.json
#	gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
#	gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
2023-11-27 13:38:12 +08:00
f420646fc5 11.27 2023-11-27 13:37:57 +08:00
@QQNZX
610968e85d Merge remote-tracking branch 'origin/master' 2023-11-27 13:18:28 +08:00
@QQNZX
160b1e93ef 11.27前端 2023-11-27 13:18:18 +08:00
wangh
78a7f9d391 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-27 10:51:37 +08:00
wangh
214621d429 1 2023-11-27 10:51:32 +08:00
@QQNZX
e797fad752 11.25前端 2023-11-27 10:42:24 +08:00
577d636b5c uni项目提交 2023-11-27 09:24:16 +08:00
Admin
f9746149a7
删除文件 gasStation-uni 2023-11-27 01:18:02 +00:00
Admin
3869ea6fdd
Create /gasStation-uni 2023-11-27 01:17:20 +00:00
Admin
00508d7325
删除文件 out/production/oilSystem 2023-11-27 01:16:56 +00:00
wangh
b00edb2f12 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:58 +08:00
wangh
7ea34fc665 Merge branch 'master' of https://gitee.com/nny_1/oilSystem 2023-11-25 18:08:29 +08:00
3f76359c59 收银台 2023-11-25 18:08:20 +08:00
wangh
90a3adc44f bug
修改
2023-11-25 18:08:15 +08:00
@QQNZX
ac1c6325de 11.25前端 2023-11-25 18:07:50 +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
ad81a123c6 Merge remote-tracking branch 'origin/master' 2023-11-25 14:42:05 +08:00
492179cb24 修改Bug 2023-11-25 14:41:54 +08:00
71e423f5a5 收银台 2023-11-25 10:27:36 +08:00
@QQNZX
41198cef57 11.22前端 2023-11-25 09:30:24 +08:00
@QQNZX
1088d21953 Merge remote-tracking branch 'origin/master' 2023-11-25 09:04:31 +08:00
@QQNZX
d5b4b7d316 11.22前端 2023-11-25 09:04:19 +08:00
ec27a74ce8 收银台 2023-11-24 18:13:11 +08:00
wangh
f706797001 bug修改 2023-11-24 17:59:53 +08:00
87147fbcf3 Merge remote-tracking branch 'origin/master' 2023-11-24 17:24:20 +08:00
92d425f57c 手机验证码登录 2023-11-24 17:24:10 +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
5963655f43 收银台 2023-11-23 16:28:06 +08:00
58db28edfb 收银台 2023-11-22 18:10:36 +08:00
wangh
b2574cc2cb 会员等级和进油修改 2023-11-22 18:05:02 +08:00
@QQNZX
64ee2829d3 Merge remote-tracking branch 'origin/master' 2023-11-22 17:05:16 +08:00
@QQNZX
d2ae2e29c5 11.22前端 2023-11-22 17:05:07 +08:00
f6a9d94364 Merge remote-tracking branch 'origin/master' 2023-11-22 13:40:06 +08:00
9da6684bf0 修改Bug 2023-11-22 13:39:57 +08:00
wangh
19f521c406 修改bug 2023-11-22 10:53:41 +08:00
efaf87cb3e Merge remote-tracking branch 'origin/master' 2023-11-22 10:47:32 +08:00
916383fe82 修改Bug 2023-11-22 10:47:20 +08:00
@QQNZX
729c9ec320 Merge remote-tracking branch 'origin/master' 2023-11-22 09:06:41 +08:00