|
|
7154546662
|
充值记录
|
2024-01-02 09:18:45 +08:00 |
|
|
|
2bc16929cf
|
优化项
|
2023-12-29 18:09:33 +08:00 |
|
|
|
b2bf1bd8ba
|
首页banner图
|
2023-12-29 16:52:08 +08:00 |
|
|
|
b5341ed627
|
首页banner图
|
2023-12-29 16:50:44 +08:00 |
|
|
|
a5d998b02d
|
满减
|
2023-12-29 15:27:06 +08:00 |
|
|
|
c70ce36aa3
|
登录
|
2023-12-29 09:15:55 +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 |
|
|
|
53288a6e77
|
意见反馈
|
2023-12-26 18:44:50 +08:00 |
|
wangh
|
22d78d8b5f
|
小票打印--积分支付--中台设置流水
|
2023-12-26 09:50:37 +08:00 |
|
|
|
9edf62a5a2
|
二维码
|
2023-12-25 18:10:00 +08:00 |
|
|
|
92aac838c5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/xml/CardValueOrdersMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
|
2023-12-25 14:44:23 +08:00 |
|
|
|
42869c8cd7
|
充值记录
|
2023-12-25 14:41:17 +08:00 |
|
|
|
dd1a564f60
|
生成二维码信息
|
2023-12-23 18:17:19 +08:00 |
|
wangh
|
8148002ce2
|
no message
|
2023-12-22 18:18:21 +08:00 |
|
|
|
b9bac4a4b0
|
小程序支付
|
2023-12-22 16:33:34 +08:00 |
|
|
|
11bcdbd3e8
|
小程序支付
|
2023-12-22 14:44:26 +08:00 |
|
|
|
a96f61ecc8
|
小程序支付
|
2023-12-21 18:43:22 +08:00 |
|
|
|
90dda4de11
|
充值记录
|
2023-12-21 18:11:46 +08:00 |
|
|
|
dbf7d7a72a
|
小程序端推荐有礼
|
2023-12-21 17:50:14 +08:00 |
|
|
|
536614d596
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# gasStation-uni/pages/my/my.vue
|
2023-12-21 17:49:34 +08:00 |
|
|
|
cc69c78e3e
|
小程序端推荐有礼
|
2023-12-21 17:48:13 +08:00 |
|
|
|
8a3ee12f1d
|
小程序支付
|
2023-12-20 16:04:56 +08:00 |
|
|
|
52379f54d0
|
加油信息
|
2023-12-19 18:03:05 +08:00 |
|
@QQNZX
|
a02adf35a6
|
油站小程序 两个弹窗
|
2023-12-19 09:31:53 +08:00 |
|
|
|
ffeb4a4254
|
门店信息
|
2023-12-18 18:44:02 +08:00 |
|
|
|
65ba434d19
|
子卡管理
|
2023-12-18 17:54:43 +08:00 |
|
|
|
18551be789
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 17:32:45 +08:00 |
|
|
|
0a4cde035f
|
子卡管理
|
2023-12-18 17:32:37 +08:00 |
|
@QQNZX
|
42dd71dcc4
|
油站小程序
|
2023-12-18 16:32:08 +08:00 |
|
@QQNZX
|
447bf6c744
|
油站小程序
|
2023-12-18 16:31:53 +08:00 |
|
@QQNZX
|
5891934b1b
|
油站小程序
|
2023-12-18 15:43:32 +08:00 |
|
@QQNZX
|
4d5b7529e4
|
油站小程序
|
2023-12-18 15:19:34 +08:00 |
|
|
|
f8a1fdea61
|
修改小程序端的活动展示方式
|
2023-12-18 15:10:29 +08:00 |
|
@QQNZX
|
1b9036ffb0
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 11:32:54 +08:00 |
|
@QQNZX
|
936812a15e
|
油站小程序
|
2023-12-18 11:32:45 +08:00 |
|
|
|
aed22bb5a0
|
核销记录
|
2023-12-18 11:15:19 +08:00 |
|
|
|
134ce14aa3
|
Merge remote-tracking branch 'origin/master'
|
2023-12-18 11:15:03 +08:00 |
|
|
|
711d4a4e90
|
核销记录
|
2023-12-18 11:14:51 +08:00 |
|
@QQNZX
|
f4e97540f3
|
油站小程序
|
2023-12-18 11:10:15 +08:00 |
|
@QQNZX
|
63339f8016
|
油站小程序
|
2023-12-18 09:22:30 +08:00 |
|
|
|
ad65f4e8df
|
Merge remote-tracking branch 'origin/master'
|
2023-12-15 17:41:34 +08:00 |
|
|
|
79e2d77212
|
核销记录
|
2023-12-15 17:41:25 +08:00 |
|
@QQNZX
|
c30f6ff2cd
|
油站小程序
|
2023-12-15 15:11:42 +08:00 |
|
@QQNZX
|
8022856572
|
油站小程序
|
2023-12-15 14:34:59 +08:00 |
|
@QQNZX
|
c90136e79b
|
油站小程序
|
2023-12-15 14:00:09 +08:00 |
|
|
|
407af8365e
|
用户余额查询
|
2023-12-15 13:48:17 +08:00 |
|
@QQNZX
|
bfd2ed0eeb
|
油站pc
|
2023-12-14 15:26:00 +08:00 |
|
wangh
|
29b2f0f586
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
# gasStation-uni/pages/index/index.vue
|
2023-12-14 13:40:31 +08:00 |
|
wangh
|
0b4359a2e5
|
小程序签到处理
|
2023-12-14 13:38:01 +08:00 |
|
wangh
|
1956d1a25b
|
自定义充值bug处理+pom引入rocket和rdisson+rocketmq配置+aes加密测试（前后端）
|
2023-12-14 13:36:36 +08:00 |
|
|
|
f6c574e4aa
|
小程序活动加载页
|
2023-12-13 18:19:52 +08:00 |
|
|
|
b429636651
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
|
2023-12-13 17:11:02 +08:00 |
|
|
|
e00b708435
|
小程序我的券
|
2023-12-13 17:09:31 +08:00 |
|
@QQNZX
|
96c2c9d7b9
|
油站小程序
|
2023-12-11 09:43:13 +08:00 |
|
wangh
|
1cf76004b4
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
|
2023-12-11 09:21:36 +08:00 |
|
wangh
|
0fab8cd1d4
|
订单详情页
|
2023-12-11 09:21:21 +08:00 |
|
|
|
5e2969c04f
|
订单信息
|
2023-12-09 15:31:46 +08:00 |
|
wangh
|
841b823692
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
# fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
|
2023-12-09 15:27:17 +08:00 |
|
wangh
|
e09841a85a
|
信息统计
|
2023-12-09 15:23:37 +08:00 |
|
@QQNZX
|
78c5c4c595
|
前端
|
2023-12-09 15:10:30 +08:00 |
|
@QQNZX
|
a3e8c82806
|
前端
|
2023-12-09 15:10:18 +08:00 |
|
@QQNZX
|
9397009e36
|
前端
|
2023-12-09 13:21:01 +08:00 |
|
|
|
273f13cae9
|
礼品卡兑换记录
|
2023-12-09 13:13:47 +08:00 |
|
|
|
230bee5a9c
|
礼品卡兑换记录
|
2023-12-09 09:34:35 +08:00 |
|
@QQNZX
|
3e703613b9
|
前端
|
2023-12-09 09:28:30 +08:00 |
|
@QQNZX
|
a692fcdeb1
|
Merge remote-tracking branch 'origin/master'
|
2023-12-09 09:17:39 +08:00 |
|
@QQNZX
|
742f0f15d9
|
前端
|
2023-12-09 09:16:50 +08:00 |
|
|
|
e7f8a5bfc9
|
礼品卡兑换记录
|
2023-12-08 17:01:33 +08:00 |
|
@QQNZX
|
97b28daba3
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 16:26:57 +08:00 |
|
@QQNZX
|
89c2340190
|
前端 路由跳转
|
2023-12-08 16:24:02 +08:00 |
|
@QQNZX
|
50aef3631f
|
提交
|
2023-12-08 16:22:35 +08:00 |
|
@QQNZX
|
7d06b718bf
|
1
|
2023-12-08 16:16:52 +08:00 |
|
|
|
4599d08df9
|
订单信息
|
2023-12-08 15:48:54 +08:00 |
|
@QQNZX
|
e5535b1968
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 15:40:12 +08:00 |
|
|
|
2b1888b719
|
获取员工列表
|
2023-12-08 15:34:38 +08:00 |
|
@QQNZX
|
5f62e8d72d
|
1
|
2023-12-08 15:24:30 +08:00 |
|
|
|
116141d547
|
礼品卡兑换记录
|
2023-12-08 15:15:03 +08:00 |
|
|
|
ce0c69be7a
|
bug 12.08
|
2023-12-08 13:33:52 +08:00 |
|
|
|
4c674b0109
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 13:13:31 +08:00 |
|
|
|
9d1eb21787
|
礼品卡兑换
|
2023-12-08 13:13:21 +08:00 |
|
|
|
6451143ec3
|
订单信息
|
2023-12-07 18:28:31 +08:00 |
|
wangh
|
b40a9d8efe
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# fuintBackend/fuint-application/src/main/resources/application.properties
|
2023-12-07 10:24:29 +08:00 |
|
wangh
|
f50982f0e6
|
充值订单
|
2023-12-07 10:22:52 +08:00 |
|
|
|
31c8f79bc9
|
订单信息
|
2023-12-06 18:36:10 +08:00 |
|
|
|
19fc2fdb2b
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 18:01:06 +08:00 |
|
|
|
fbbe572286
|
优化活动
|
2023-12-06 18:00:48 +08:00 |
|
|
|
e70e41434f
|
订单信息
|
2023-12-06 10:28:49 +08:00 |
|
@QQNZX
|
899623c5b0
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 09:41:27 +08:00 |
|
@QQNZX
|
3bcbbf5d5d
|
12.06前端
|
2023-12-06 09:41:19 +08:00 |
|
wangh
|
32caf8bd60
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
|
2023-12-06 09:26:53 +08:00 |
|
wangh
|
6ab150b251
|
no message
|
2023-12-06 09:25:45 +08:00 |
|
@QQNZX
|
1194f7db5c
|
12.05前端
|
2023-12-06 09:20:25 +08:00 |
|
|
|
426cd1ca30
|
订单信息
|
2023-12-05 17:18:27 +08:00 |
|
@QQNZX
|
0ce3aa8b89
|
12.05前端
|
2023-12-05 15:49:40 +08:00 |
|
@QQNZX
|
e7d735e93e
|
12.05前端
|
2023-12-05 15:43:39 +08:00 |
|
wangh
|
6dd43b9d68
|
积分详情
|
2023-12-05 15:16:15 +08:00 |
|
@QQNZX
|
72519e32b8
|
12.05前端
|
2023-12-05 14:30:22 +08:00 |
|
wangh
|
49529cd230
|
调整
|
2023-12-05 13:33:30 +08:00 |
|
@QQNZX
|
ec5443d79c
|
Merge remote-tracking branch 'origin/master'
|
2023-12-05 11:41:51 +08:00 |
|
@QQNZX
|
3e22074fa1
|
12.05前端
|
2023-12-05 11:41:42 +08:00 |
|
wangh
|
23275a4d52
|
Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
# gasStation-uni/config.js
|
2023-12-05 11:27:32 +08:00 |
|
wangh
|
81afa52f73
|
no message
|
2023-12-05 11:26:48 +08:00 |
|
@QQNZX
|
6a67ef9347
|
12.05前端
|
2023-12-05 11:21:21 +08:00 |
|
@QQNZX
|
1042b55806
|
12.05前端
|
2023-12-05 11:16:58 +08:00 |
|
|
|
e0816ddbc8
|
会员信息
|
2023-12-05 10:47:00 +08:00 |
|
|
|
a369c89237
|
会员信息
|
2023-12-05 10:46:04 +08:00 |
|
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 |
|
