wangh
|
f2aa5c9533
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-05 10:39:00 +08:00 |
|
wangh
|
8163e11ded
|
no message
|
2023-12-05 10:38:56 +08:00 |
|
wangh
|
2937f621fc
|
no message
|
2023-12-05 10:37:36 +08:00 |
|
|
|
880bb21ae5
|
Merge remote-tracking branch 'origin/master'
|
2023-12-05 09:43:47 +08:00 |
|
|
|
03a83c5702
|
油站活动
|
2023-12-05 09:43:37 +08:00 |
|
|
|
0416cb19d0
|
会员信息
|
2023-12-04 16:35:09 +08:00 |
|
|
|
de13b4e996
|
会员信息
|
2023-12-01 17:57:07 +08:00 |
|
|
|
204a6293e9
|
会员信息
|
2023-12-01 17:43:20 +08:00 |
|
|
|
c09aa948bf
|
会员信息
|
2023-12-01 16:59:31 +08:00 |
|
|
|
cadeccf2f8
|
储值卡
|
2023-12-01 16:49:10 +08:00 |
|
|
|
580f7e483f
|
会员信息
|
2023-12-01 16:47:25 +08:00 |
|
wangh
|
a913c83238
|
no message
|
2023-12-01 16:40:20 +08:00 |
|
|
|
ef2ef63234
|
会员信息
|
2023-12-01 16:26:25 +08:00 |
|
@QQNZX
|
74efa27e2a
|
12.01前端 index
|
2023-12-01 16:20:02 +08:00 |
|
@QQNZX
|
2da1c46915
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/pages/refuel/refuel.vue
|
2023-12-01 16:06:11 +08:00 |
|
@QQNZX
|
0cfc766146
|
12.01前端
|
2023-12-01 16:04:45 +08:00 |
|
|
|
e68128706d
|
会员信息
|
2023-12-01 15:47:01 +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 |
|
|
|
1a43fc6480
|
Merge remote-tracking branch 'origin/master'
|
2023-12-01 15:41:09 +08:00 |
|
|
|
c4839870bc
|
会员信息
|
2023-12-01 15:40:43 +08:00 |
|
wangh
|
8fb4b20d7f
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-01 15:32:46 +08:00 |
|
wangh
|
3cf58ca7b7
|
no message
|
2023-12-01 15:29:00 +08:00 |
|
|
|
d48a4cabe7
|
会员信息
|
2023-11-30 18:30:46 +08:00 |
|
wangh
|
e24a07c0fb
|
积分商城
|
2023-11-30 18:11:49 +08:00 |
|
|
|
02bff90102
|
活动
|
2023-11-30 17:30:54 +08:00 |
|
@QQNZX
|
ac8f2592bf
|
11.29前端
|
2023-11-30 17:29:22 +08:00 |
|
@QQNZX
|
bc09ac8d6a
|
11.29前端
|
2023-11-30 17:28:36 +08:00 |
|
@QQNZX
|
d802a61794
|
11.29前端
|
2023-11-30 15:03:49 +08:00 |
|
@QQNZX
|
3c82e2e420
|
Merge remote-tracking branch 'origin/master'
|
2023-11-30 15:02:35 +08:00 |
|
@QQNZX
|
5e65c8e520
|
11.29前端
|
2023-11-30 15:02:21 +08:00 |
|
wangh
|
eff9fccd2f
|
封面会员价
|
2023-11-30 14:28:12 +08:00 |
|
wangh
|
6229da52c9
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/store/modules/user.js
|
2023-11-30 11:08:38 +08:00 |
|
wangh
|
aef48f943f
|
no message
|
2023-11-30 11:07:48 +08:00 |
|
wangh
|
9ff4038838
|
登录接口
|
2023-11-30 11:07:26 +08:00 |
|
wangh
|
415369a430
|
no message
|
2023-11-30 11:06:37 +08:00 |
|
|
|
c7b9fc8af8
|
11.30
|
2023-11-30 11:00:28 +08:00 |
|
|
|
eecf1a94bd
|
提交忽略文件
|
2023-11-30 10:56:05 +08:00 |
|
wangh
|
2fbeeabba2
|
no message
|
2023-11-30 09:06:08 +08:00 |
|
wangh
|
f45dfbd0de
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/CardManagement/CardManagement.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/Recharge/Recharge.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/feedback/feedback.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/invite/invite.js.map
# gasStation-uni/unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/writeOff/writeOff.js.map
|
2023-11-29 16:50:42 +08:00 |
|
wangh
|
28a26db27c
|
1
|
2023-11-29 16:48:44 +08:00 |
|
|
|
491c8bf426
|
会员信息
|
2023-11-29 16:26:19 +08:00 |
|
wangh
|
069e51d3cf
|
1
|
2023-11-29 14:44:34 +08:00 |
|
@QQNZX
|
7647a92bd6
|
Merge remote-tracking branch 'origin/master'
|
2023-11-29 14:34:55 +08:00 |
|
@QQNZX
|
9503b84e5b
|
11.29前端
|
2023-11-29 14:34:32 +08:00 |
|
wangh
|
7073e91a34
|
1
|
2023-11-29 14:03:47 +08:00 |
|
@QQNZX
|
36dce77987
|
11.29前端
|
2023-11-29 13:58:22 +08:00 |
|
@QQNZX
|
3a8e08b2d1
|
11.29前端
|
2023-11-29 13:11:01 +08:00 |
|
|
|
cec9d85b3a
|
收银台
|
2023-11-28 18:33:35 +08:00 |
|
wangh
|
195a7298e0
|
1
|
2023-11-28 18:10:16 +08:00 |
|
@QQNZX
|
d304650fc2
|
11.28前端
|
2023-11-28 17:53:45 +08:00 |
|
乌云
|
3af015c126
|
删除文件 gasStation-uni/.hbuilderx
|
2023-11-28 09:35:52 +00:00 |
|
@QQNZX
|
b7b317fb7d
|
Merge remote-tracking branch 'origin/master'
|
2023-11-28 17:28:00 +08:00 |
|
@QQNZX
|
3ffad8c89e
|
11.28前端
|
2023-11-28 17:27:10 +08:00 |
|
|
|
37fa476a0f
|
收银台
|
2023-11-28 16:40:05 +08:00 |
|
@QQNZX
|
dea95896c2
|
11.28前端
|
2023-11-28 14:43:36 +08:00 |
|
@QQNZX
|
827fffe279
|
11.28前端
|
2023-11-28 10:44:18 +08:00 |
|
|
|
f30a3556e3
|
收银台
|
2023-11-27 18:28:41 +08:00 |
|
wangh
|
bcb44f5e91
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/package-lock.json
|
2023-11-27 15:56:34 +08:00 |
|
wangh
|
3d27b2c386
|
no message
|
2023-11-27 15:53:53 +08:00 |
|
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
|
160b1e93ef
|
11.27前端
|
2023-11-27 13:18:18 +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 |
|
