Commit Graph

295 Commits

Author SHA1 Message Date
33dbe4ec6c 优化客服模块 2024-11-08 11:12:51 +08:00
3645ba7148 上传客服页面图片 2024-11-06 18:39:26 +08:00
5e56c2ddd1 Merge pull request '优化客服功能' (#106) from sjy-two into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #106
2024-11-06 18:17:11 +08:00
eb4b68bd36 Merge pull request '首页装修与小程序样式一致调整' (#107) from Branch_chensl into master
Reviewed-on: #107
2024-11-06 18:16:59 +08:00
77
60462fb27d 首页装修与小程序样式一致调整 2024-11-06 18:09:24 +08:00
6fecdf6878 优化客服功能 2024-11-06 17:44:13 +08:00
eaab153631 Merge pull request '会员过期时间' (#105) from khy-two into master
Reviewed-on: #105
2024-11-06 11:10:21 +08:00
22b0abad0b Merge pull request '添加充值记录' (#104) from sjy-two into master
Reviewed-on: #104
2024-11-06 11:10:10 +08:00
khy
ed01e71dc6 会员过期时间 2024-11-05 16:20:09 +08:00
9106348ff2 添加充值记录 2024-11-04 18:57:36 +08:00
335cb58cb0 Merge pull request 'java脚本报错修改' (#103) from cxw into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #103
2024-11-04 14:58:11 +08:00
c72f11f986 java脚本报错修改 2024-11-04 14:46:07 +08:00
985789e601 Merge pull request 'java脚本报错修改' (#102) from cxw into master
Some checks reported errors
continuous-integration/drone Build encountered an error
Reviewed-on: #102
2024-11-04 14:44:32 +08:00
f0a74916c7 java脚本报错修改 2024-11-04 14:43:28 +08:00
7cb178dcc9 Merge pull request '小程序二维码改成正式版,小程序聊天头像恢复' (#101) from sjy-two into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #101
2024-11-04 13:28:47 +08:00
262b098be8 优化后台客服界面 2024-11-04 13:26:06 +08:00
ef9ebbfaba 小程序二维码改成正式版,小程序聊天头像恢复 2024-11-04 13:12:27 +08:00
9443f4959a Merge pull request 'java脚本报错修改' (#100) from cxw into master
Reviewed-on: #100
2024-11-03 18:29:13 +08:00
00d292e5cf java脚本报错修改 2024-11-01 17:12:43 +08:00
837aa53c11 Merge pull request '优化自提门店接口' (#99) from sjy-two into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #99
2024-11-01 16:52:13 +08:00
bd834f366d 优化自提门店接口 2024-11-01 16:48:06 +08:00
e9c46ea4e1 Merge pull request '名字修改' (#97) from cxw into master
Some checks reported errors
continuous-integration/drone Build was killed
Reviewed-on: #97
2024-10-30 14:07:09 +08:00
bca9290872 名字修改 2024-10-30 14:06:34 +08:00
7ad4e0ed52 Merge pull request '构建修改' (#96) from cxw into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #96
2024-10-30 14:05:17 +08:00
c373bcb8e0 构建vue 2024-10-30 14:03:58 +08:00
fb40e7fb15 构建vue 2024-10-30 14:01:27 +08:00
9fd3f4b7e2 构建vue 2024-10-30 13:09:14 +08:00
4fc63dc326 构建java 2024-10-30 13:09:07 +08:00
19c6fec3dc vue和java同时构建 2024-10-30 13:08:53 +08:00
fb3bdc1558 Merge pull request 'cxw' (#95) from cxw into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #95
2024-10-30 11:36:37 +08:00
be9593e214 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw 2024-10-30 11:12:42 +08:00
eead90abb2 新增vue3构建脚本 2024-10-30 11:12:27 +08:00
527e0210de Merge pull request '活动商品接口' (#94) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #94
2024-10-29 18:39:55 +08:00
074278c9bd 活动商品接口 2024-10-29 18:36:11 +08:00
7dcb1ef9a9 Merge pull request '会员支付优化(现金支付)' (#93) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #93
2024-10-29 18:34:46 +08:00
khy
566cf302c4 会员支付优化(现金支付) 2024-10-29 18:29:55 +08:00
232976d532 Merge pull request '提交遗漏文件' (#92) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #92
2024-10-29 13:16:08 +08:00
547448fc44 提交遗漏文件 2024-10-29 13:13:55 +08:00
f2297720fc Merge pull request '会员支付优化' (#91) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #91
2024-10-29 11:53:15 +08:00
khy
e406f885d9 会员支付优化 2024-10-29 11:50:33 +08:00
f7f702673b Merge pull request '客服话术和素材图片添加分类' (#90) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #90
2024-10-29 11:30:45 +08:00
1a0cfaac2b 优化客服话术和图片素材界面 2024-10-29 11:29:11 +08:00
c6c4dd7693 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-29 11:01:31 +08:00
1ca6b87037 客服话术和素材图片添加分类 2024-10-29 10:59:39 +08:00
e68b6ed573 Merge pull request '添加客服话术分类,图片素材分类' (#88) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #88
2024-10-28 11:34:10 +08:00
eadb727812 Merge pull request '会员记录支付状态' (#89) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #89
2024-10-28 11:14:16 +08:00
khy
cbdbf6fa01 会员记录支付状态 2024-10-28 11:09:09 +08:00
ccbdf82114 添加客服话术分类,图片素材分类 2024-10-28 10:36:25 +08:00
5235fae53c Merge pull request 'khy1' (#87) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #87
2024-10-28 10:29:06 +08:00
khy
6c29031b3b Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1 2024-10-28 10:22:58 +08:00