Commit Graph

120 Commits

Author SHA1 Message Date
wangh
ea900039d4 bug处理 2024-01-05 16:53:19 +08:00
wangh
0ffa106329 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-05 14:30:27 +08:00
wangh
425aace10f 中台bug处理 2024-01-05 14:27:24 +08:00
c671650574 修改bug 2024-01-05 14:24:09 +08:00
@QQNZX
9acd5324d5 前端 2024-01-05 14:02:20 +08:00
cff6a8942b 优化项 2024-01-04 18:44:52 +08:00
wangh
302c39b3dc Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	gasStation-uni/pages/index/index.vue
2024-01-04 15:55:48 +08:00
wangh
29dbbca735 bug修改 2024-01-04 15:52:02 +08:00
ff6396b25e 修改bug 2024-01-04 15:12:35 +08:00
981b6d40a3 修改bug 2024-01-04 12:05:43 +08:00
@QQNZX
d79fe5d247 前端 模板的更新 2024-01-04 09:10:33 +08:00
@QQNZX
0ecf231fd5 Merge remote-tracking branch 'origin/master' 2024-01-04 09:06:45 +08:00
12f4741acf 优化项 2024-01-03 18:40:21 +08:00
@QQNZX
03b512ef75 前端 模板的更新 2024-01-03 14:24:24 +08:00
99767393bc 修改bug 2024-01-03 13:39:21 +08:00
a9b86ff520 Merge remote-tracking branch 'origin/master' 2024-01-03 09:12:08 +08:00
5d2b98d6fa 修改bug 2024-01-03 09:11:56 +08:00
76befae703 优化项 2024-01-02 17:13:25 +08:00
wangh
eac375458b bug修改 2024-01-02 14:24:47 +08:00
ba0c5935ac 充值记录 2024-01-02 13:07:12 +08:00
wangh
adfb53bac2 Merge branch 'master' of https://gitee.com/nny_1/oilSystem
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintBackend/configure/dev/application.properties
#	fuintBackend/fuint-application/src/main/resources/application.properties
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue
2024-01-02 11:29:51 +08:00
wangh
9e403cd413 bug修改+中泰 2024-01-02 11:21:12 +08:00
@QQNZX
9974798e58 前端 2024-01-02 10:04:57 +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
323add1517 会员信息 2023-12-27 18:44:56 +08:00
53288a6e77 意见反馈 2023-12-26 18:44:50 +08:00
dd1a564f60 生成二维码信息 2023-12-23 18:17:19 +08:00
b9bac4a4b0 小程序支付 2023-12-22 16:33:34 +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
@QQNZX
63339f8016 油站小程序 2023-12-18 09:22:30 +08:00
79e2d77212 核销记录 2023-12-15 17:41:25 +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
@QQNZX
96c2c9d7b9 油站小程序 2023-12-11 09:43:13 +08:00
5e2969c04f 订单信息 2023-12-09 15:31:46 +08:00
273f13cae9 礼品卡兑换记录 2023-12-09 13:13:47 +08:00
@QQNZX
742f0f15d9 前端 2023-12-09 09:16:50 +08:00
@QQNZX
50aef3631f 提交 2023-12-08 16:22:35 +08:00
@QQNZX
7d06b718bf 1 2023-12-08 16:16:52 +08:00
31c8f79bc9 订单信息 2023-12-06 18:36:10 +08:00
@QQNZX
3bcbbf5d5d 12.06前端 2023-12-06 09:41:19 +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
2937f621fc no message 2023-12-05 10:37:36 +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
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
c4839870bc 会员信息 2023-12-01 15:40:43 +08:00
d48a4cabe7 会员信息 2023-11-30 18:30:46 +08:00
wangh
eff9fccd2f 封面会员价 2023-11-30 14:28:12 +08:00
491c8bf426 会员信息 2023-11-29 16:26:19 +08:00
cec9d85b3a 收银台 2023-11-28 18:33:35 +08:00
37fa476a0f 收银台 2023-11-28 16:40:05 +08:00
@QQNZX
dea95896c2 11.28前端 2023-11-28 14:43:36 +08:00
f30a3556e3 收银台 2023-11-27 18:28:41 +08:00
wangh
d0769e8e9e 1 2023-11-27 15:53:33 +08:00
577d636b5c uni项目提交 2023-11-27 09:24:16 +08:00