Commit Graph

318 Commits

Author SHA1 Message Date
1538f5620f Merge pull request '修改客服输入框样式' (#119) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #119
2024-11-13 11:28:47 +08:00
7224c710d4 修改客服输入框样式 2024-11-13 11:27:13 +08:00
912e23ad44 Merge pull request 'sjy-three' (#118) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #118
2024-11-13 10:47:08 +08:00
5d5dadf0d5 添加客服配置 2024-11-13 10:43:51 +08:00
2fa158d3ff 添加客服配置 2024-11-13 10:39:51 +08:00
8d77b9855c Merge pull request 'Branch_chensl' (#117) from Branch_chensl into master
Reviewed-on: #117
2024-11-13 10:36:31 +08:00
77
f98b460c14 1、添加主题色粉色与橙色2、替换分类商品的展示图片 2024-11-12 18:13:06 +08:00
ce06bcd7b6 Merge pull request '修改客服输入框样式' (#116) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #116
2024-11-12 15:51:10 +08:00
9690df6930 修改客服输入框样式 2024-11-12 15:43:21 +08:00
77
377888d6e2 1、优化魔方装修实现链接可以动态更改2、解决上次隐藏首页装修底部,把底部装修页面也隐藏的问题 2024-11-11 18:45:55 +08:00
40c8ca0565 Merge pull request 'Branch_chensl' (#113) from Branch_chensl into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #113
2024-11-11 10:11:25 +08:00
2ad995d565 Merge pull request '素材管理添加图片表格' (#115) from sjy-three into master
Reviewed-on: #115
2024-11-11 10:11:13 +08:00
20c946cdee 素材管理添加图片表格 2024-11-08 18:59:44 +08:00
77
8ebe23bf49 隐藏首页装修首页底部导航 2024-11-08 18:05:56 +08:00
77
ecef636640 1、实现主题颜色与分类样式的互通切换 2024-11-08 17:27:58 +08:00
c1a5340a73 Merge pull request '优化客服模块' (#112) from sjy-two into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #112
2024-11-08 12:10:36 +08:00
33dbe4ec6c 优化客服模块 2024-11-08 11:12:51 +08:00
77
b93d0f1515 1、将小程序有的页面添加到链接选择页面 2024-11-08 09:56:18 +08:00
7984b7bc65 Merge pull request '1、解决选中自定义页面的按钮导致全部选中的问题' (#111) from Branch_chensl into master
Reviewed-on: #111
2024-11-08 09:06:57 +08:00
77
04decd7050 1、解决选中自定义页面的按钮导致全部选中的问题 2024-11-07 17:54:06 +08:00
7298bd3347 Merge pull request '初步完成魔方与小程序的互通' (#109) from Branch_chensl into master
Reviewed-on: #109
2024-11-07 16:46:55 +08:00
77
b2a10eb187 1、添加主题风格的样式2、添加商品分类的样式 2024-11-07 16:01:15 +08:00
77
3c62621bca 初步完成魔方与小程序的互通 2024-11-07 12:58:08 +08:00
d7e760c920 Merge pull request '上传客服页面图片' (#108) from sjy-two into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #108
2024-11-06 18:41:12 +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