345 Commits

Author SHA1 Message Date
khy
50c479036b 恢复前端配置 2025-04-29 14:52:25 +08:00
khy
d3e589017f 去除无用bouns及结算 2025-04-29 14:49:12 +08:00
khy
dc3c0c4a29 代理商订单修复,去除无用的Bonus以及结算 2025-04-29 14:44:53 +08:00
319c2a09ca Merge pull request 'khy-three' (#126) from khy-three into master
Reviewed-on: #126
2025-04-27 05:49:32 +00:00
1bba180bbc Merge pull request 'main-zjh' (#127) from main-zjh into master
Reviewed-on: #127
2025-04-27 05:49:14 +00:00
490d0a9f4e Merge branch 'master' into main-zjh 2025-04-27 11:11:26 +08:00
9c4b3b0311 Merge branch 'master' of http://101.126.146.73:3000/root/allLikeMall 2025-04-27 11:06:57 +08:00
bb97bfc337 增加新组件 2025-04-27 11:01:33 +08:00
khy
88bcf054fa 移植代理商,等级,后台申请结算,积分协议 2025-04-25 18:02:43 +08:00
khy
1a49792db4 Merge branch 'master' of http://101.126.146.73:3000/root/allLikeMall into khy-three 2025-04-24 17:55:55 +08:00
khy
f3dbebb04e 发票管理和发票抬头 2025-04-24 17:55:31 +08:00
9ce06fe8e9 Merge pull request '会员信息判空' (#125) from khy-three into master
Reviewed-on: #125
2025-04-17 08:53:37 +00:00
216ad338ed 富文本积分 2025-04-17 15:30:46 +08:00
khy
975f8d855e 会员信息判空 2025-04-17 14:31:52 +08:00
61cbfa64f8 Merge pull request '1' (#124) from hokin into master
Reviewed-on: #124
2025-04-15 08:55:07 +00:00
Hokin
907a2c13d2 1 2025-04-15 16:39:44 +08:00
ed47c26c63 Merge pull request '添加开屏广告管理' (#123) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/123
2024-11-19 10:50:42 +08:00
819fd0862a 修改客服工作台商品信息查询分页 2024-11-18 13:35:09 +08:00
35366d583c 修改客服工作台商品查询分页 2024-11-18 13:18:37 +08:00
6f8bd932f1 添加小程序广告开屏数据配置,客服页面优化 2024-11-18 09:14:25 +08:00
58a27586a3 添加开屏广告管理 2024-11-14 19:41:15 +08:00
7ae5762c78 Merge pull request '修改智能表单' (#122) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/122
2024-11-14 15:00:50 +08:00
b64e9830ea 修改智能表单 2024-11-14 14:14:21 +08:00
58ba6d3fe2 Merge pull request '1、替换主题分类展示图片' (#121) from Branch_chensl into master
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/121
2024-11-13 16:38:23 +08:00
77
f3e0692bff 1、替换主题分类展示图片 2024-11-13 14:56:12 +08:00
12c926b103 Merge pull request '修改登录默认账号' (#120) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/120
2024-11-13 13:25:35 +08:00
569cbad572 修改登录默认账号 2024-11-13 12:07:05 +08:00
1538f5620f Merge pull request '修改客服输入框样式' (#119) from sjy-three into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/113
2024-11-11 10:11:25 +08:00
2ad995d565 Merge pull request '素材管理添加图片表格' (#115) from sjy-three into master
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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: http://101.43.112.107:3000/root/allLikeMall/pulls/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