188 Commits

Author SHA1 Message Date
YunaiV
0ad7f0acfb ERP:初始化其它入库的表单 40%
(cherry picked from commit 53c94af0271aba3dd0620970745b997a19bf4797)
2024-03-11 13:05:25 +08:00
owen
818dc4d8e3 基础设施:前端直连上传,优先使用自定义域名
(cherry picked from commit 89fdb5ced9a8fdcef1a066f7b14071541dda1eb0)
2024-03-11 13:02:19 +08:00
owen
c26eb543e0 基础设施:增加前端直连上传文件到S3服务的功能
(cherry picked from commit 490bb901e175abe1d2b4c198a7c0a0424218c6df)
2024-03-11 12:53:14 +08:00
puhui999
1cbc8a29da CRM-合同:完善 TODO
(cherry picked from commit 6d0e242387476f7cff3902b1a07e4e224843a397)
2024-03-11 12:49:57 +08:00
YunaiV
ff84ef64a5 CRM:合同的 code review
(cherry picked from commit 956f19d9d08930f2617ca76a96e841e86b7a9e91)
2024-03-11 12:49:03 +08:00
puhui999
0ada34de16 CRM-合同:完善合同表单
(cherry picked from commit ed94205fa7c0fa3f0fcaae88d0a59e727a625f0f)
2024-03-11 12:45:19 +08:00
AKING
a81b4f6b06 update src/components/Descriptions/src/Descriptions.vue.
字段映射的功能点添加,已测

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 24062c7a3b8fa5a424471889d4d2cd0b2ab64211)
2024-03-08 21:45:11 +08:00
puhui999
3fec9de1cf 多图上传组件优化
(cherry picked from commit f88b26e3c3b4f602bd53e463e06520b4158f6bb9)
2024-03-08 21:43:09 +08:00
YunaiV
748eb2b576 📖 CRM:跟进记录的 code review
(cherry picked from commit 9fa769b16aa76b73843a55e9c8a8c7c6837ca36d)
2024-03-08 21:36:13 +08:00
puhui999
bb694349f1 新增客户跟进
(cherry picked from commit d29dfef7c70c6f13b988586f00a4c8ec9168f856)
2024-03-08 21:27:10 +08:00
owen
a959935cf8 Review代码修改
(cherry picked from commit 2b8eb49f7115d04f14a09c860f02b309969df8e5)
2024-03-08 21:14:40 +08:00
YunaiV
d1c9f702d9 📖 MALL:商品编辑 => 简化 InfoForm 基础设置
(cherry picked from commit efe702d383b4b805614d90879bc7c2389ff9a414)
2024-03-08 21:13:52 +08:00
YunaiV
f8b0250def 📖 CRM:code review crm 客户列表
(cherry picked from commit ec87c1b61d8cb77e62142cf2c7607a8732433163)
2024-03-08 21:12:10 +08:00
puhui999
b211e245db 客户详情完善
(cherry picked from commit 17be1abb65cfaf5166bb62e8335d86b1a86a6674)
2024-03-08 21:11:08 +08:00
YunaiV
9286010e77 MALL:去除分销提现的银行配置
(cherry picked from commit d36c4ab36cebed14100d8eb72c4bb5cf2726ed01)
2024-03-08 21:11:01 +08:00
puhui999
4ddf19a601 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
(cherry picked from commit 7fd564307d3bef974f2a0c99632e5020f38fda98)
2024-03-08 21:04:38 +08:00
YunaiV
6fe6e51b2f 📖 操作日志的界面实现
(cherry picked from commit 1eefa02c4c54749e0f93d563349c35d913f6a5f5)
2024-03-08 21:03:11 +08:00
puhui999
c124ca4879 fix: 修复文件上传数据回显错误
(cherry picked from commit aadad39a69b49d1f7f94373dd41082933e92bb2e)
2024-03-08 20:54:03 +08:00
puhui999
2b1c12eb4b crm-客户:集成操作日志详情组件
(cherry picked from commit 261d8b2aa4775b8453dc2368eb1ecb78e8ee4cbf)
2024-03-08 20:53:54 +08:00
YunaiV
b890915539 📖 code review:店铺装修逻辑
(cherry picked from commit 9591ed70849c59ae6d8c2bd57cbc63cf9b012191)
2024-03-08 20:53:04 +08:00
YunaiV
c57db2bf09 📖 code review:店铺装修逻辑
(cherry picked from commit b86f08230687d85a0ea379efe38d22568e80ba23)
2024-03-08 20:52:59 +08:00
owen
f07b7dbbb0 营销:优化商城装修组件
(cherry picked from commit 80355f3acd7d00f9bba752756f80e7555ae9f940)
2024-03-08 20:51:29 +08:00
owen
6a7c04db5e 营销:适配商城装修组件【标题栏】
(cherry picked from commit 33162a12c0569056730bd7d06d3c5ea2b1bcb650)
2024-03-08 20:51:24 +08:00
owen
67b24d61b6 营销:适配商城装修组件【热区】
(cherry picked from commit 41a404a52c64e2a1d47ab7fc4269e1fb56181a4a)
2024-03-08 20:51:14 +08:00
puhui999
f9c272ad0d feat:新增公共操作日志详情组件
(cherry picked from commit 59c66707753f81d369d952caee9ebc65d29bc472)
2024-03-08 20:50:45 +08:00
owen
156e7ccb53 营销:适配商城装修组件【悬浮按钮】
(cherry picked from commit edfdee8cc1f3030df613fdddf7a64de7924d69a2)
2024-03-08 20:48:47 +08:00
owen
5d527672a1 营销:适配商城装修组件【弹窗广告】
(cherry picked from commit 76025b6821983d0ae0407a734e48d6f5088543ff)
2024-03-08 20:48:35 +08:00
owen
91db4949d5 封装拖拽组件,提供移动、新增、删除功能
(cherry picked from commit 59ff6b13fbec66e0fe85db7c867ba365b1df3ddd)
2024-03-08 20:48:27 +08:00
owen
2438f65d9e 商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题
(cherry picked from commit 9ff4f1f7a91ce6df7871dab3cfef7e434777763c)
2024-03-07 13:10:11 +08:00
owen
59ebc1ea8f 营销:完善装修编辑器预览功能
(cherry picked from commit 784623724d7f37260440fea2c566d603f74f3577)
2024-03-07 13:05:23 +08:00
owen
898faf0999 营销:完善装修编辑器重置功能
(cherry picked from commit eec3a2185262535f6ef9167eaa6c34f322aea356)
2024-03-07 13:05:16 +08:00
puhui999
b062da358a fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误
(cherry picked from commit f3e89c0c553cf48ed59cf91b9425efbc97ad652b)
2024-03-07 12:49:35 +08:00
owen
e39918d794 营销:适配商城装修组件【用户卡券】
(cherry picked from commit 3c8ffc8c21c6297263ad0b3a980c1bc07c8adc87)
2024-03-06 21:33:19 +08:00
owen
6c96749d18 营销:适配商城装修组件【用户资产】
(cherry picked from commit c058048face364b0e84d9bb076144bf86dfc3e87)
2024-03-06 21:33:15 +08:00
owen
848091ea6f 营销:适配商城装修组件【用户订单】
(cherry picked from commit 2c1edfa781c549742a014213c6840f00dd432fe3)
2024-03-06 21:33:02 +08:00
owen
adfb2469de 营销:适配商城装修组件【用户卡片】
(cherry picked from commit af67db577d8348e0fb0a743de07da856cf3aea6b)
2024-03-06 21:32:58 +08:00
owen
1fa79f9d9e 营销:适配商城装修组件【拼团】(待重写)
(cherry picked from commit d5f9d31d327b361089e987fe247a57534d3a9531)
2024-03-06 21:32:47 +08:00
owen
b0300865f3 营销:适配商城装修组件【秒杀】(待重写)
(cherry picked from commit 7e44b621a5785878416367cd4e29404be243f4c1)
2024-03-06 21:32:40 +08:00
owen
20382bdb8e eslint
(cherry picked from commit b4ba1043d6d8d65b63df1c4d08188d9bab9a13a9)
2024-03-06 21:32:28 +08:00
owen
a8f9fa152a 营销:商城装修增加控件【APP 链接选择】
(cherry picked from commit 23a6bf5ef5aaca20bc83cfe12313f3adb0a46c3b)
2024-03-06 21:24:11 +08:00
owen
687ec00343 营销:适配商城装修组件【营销文章】
(cherry picked from commit d4dc105b4f4341cbfa0357a6c90bf30ff32aad50)
2024-03-06 21:03:53 +08:00
Marvin
0921704a4b feat: 菜单右上角加一个搜索图标
(cherry picked from commit b95b8008f7356aac7c57a0548e1e7d6c605bf987)
2024-03-06 21:02:10 +08:00
owen
42b78d1411 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题
(cherry picked from commit c3cad3f3ee4f23e5caabea83d08d42eaf955cc1d)
2024-03-06 21:01:57 +08:00
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3578ed3118b912b039304e40ee95399)
2024-03-06 20:55:51 +08:00
owen
a616b019b8 营销:适配商城装修组件【商品栏】
(cherry picked from commit 3198688eb53ae39f76472643c8ee80db903e7ab2)
2024-03-06 20:49:48 +08:00
owen
d492186d3e 营销:适配商城装修组件【商品卡片】
(cherry picked from commit b4a177258467e3a08c33524e50c80b46eaca5215)
2024-03-06 20:44:34 +08:00
xingyu
9d52790910 fix: stylelint
(cherry picked from commit 821c804189ffc81b8d8f8444076ab8948dcd3615)
2024-03-06 20:41:49 +08:00
柯杨
9449829fd3 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec32867881f0555a81268b8f096b2251863)
2024-03-06 20:33:44 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
2024-03-06 20:33:14 +08:00
owen
d176271313 营销:适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748157cb814a7a203f449a0feb2ed23c3)
2024-03-06 20:33:03 +08:00