yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,483 Commits
9 Branches
21 Tags
30 MiB
Commit Graph

1330 Commits (a574f3ca543f80a4ae540d611fafc773f9ede4e3)

Author SHA1 Message Date
owen 9f64a1093d 修复首页头像不显示 
(cherry picked from commit 9128fa98f5)
 2024-03-07 13:05:12 +08:00
YunaiV 70a8fb7d66 📈 CRM：code review 联系人商机功能 
(cherry picked from commit ce79dd68a3)
 2024-03-07 13:04:08 +08:00
YunaiV 4150ffba48 🔨 CRM：优化产品分类代码的实现 
(cherry picked from commit f8c4700c2e)
 2024-03-07 13:04:01 +08:00
YunaiV 2be6f196e6 🔨 CRM：优化产品代码的实现 
(cherry picked from commit b3d66cd0aa)
 2024-03-07 13:03:54 +08:00
shizhong 72b82625b9 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2024-03-07 13:03:42 +08:00
ZENGlei11350 7b0ff72a2b 优化：添加商品时0库存商品无法保存改为可以保存 
(cherry picked from commit dee8215da2)
 2024-03-07 13:02:26 +08:00
ZanGe丶 776fed6a5d 【crm:优化产品及产品分类】 
(cherry picked from commit dde61c29a0)
 2024-03-07 13:02:07 +08:00
zyna 7c9cf67fb0 联系人商机功能 
(cherry picked from commit ba49b2851c)
 2024-03-07 13:02:00 +08:00
shizhong 021edf5662 🐛 修复 job 在 IDEA 报错的问题 2024-03-07 12:57:05 +08:00
liuhongfeng 91bf155409 【修改】ureport2 集成 
(cherry picked from commit 0b9cf35b17)
 2024-03-07 12:56:23 +08:00
shizhong 963a902eb0 🐛 修复 file 在 IDEA 报错的问题 2024-03-07 12:56:03 +08:00
shizhong 255708beec 🐛 修复 IDEA 在 `v-for="dict in getIntDictOptions(...)"` 时，`el-option` 的 `key` 会告警的问题 2024-03-07 12:55:25 +08:00
shizhong f372fc0cdc 🐛 修复 user 在 IDEA 报错的问题 2024-03-07 12:51:49 +08:00
puhui999 b062da358a fix:修改 UploadImg 组件预览图片的方式为 createImageViewer，解决商城列表预览图片层级出现错误 
(cherry picked from commit f3e89c0c55)
 2024-03-07 12:49:35 +08:00
shizhong 4721455926 🐛 修复 tenant 在 IDEA 报错的问题 2024-03-07 12:49:11 +08:00
YunaiV cb7543ef3d 🐛 修复 social 在 IDEA 报错的问题 
(cherry picked from commit a6deb69ddc)
 2024-03-07 12:47:51 +08:00
shizhong 94a9876204 🐛 修复 sms 在 IDEA 报错的问题 2024-03-07 12:47:29 +08:00
shizhong 2f5d1d0083 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2024-03-07 12:40:54 +08:00
shizhong d4ad7e9013 🐛 修复 notify 在 IDEA 报错的问题 2024-03-07 12:39:20 +08:00
shizhong cd14499226 🐛 修复 notice 在 IDEA 报错的问题 2024-03-07 12:37:53 +08:00
shizhong d4dc61f34f 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2024-03-07 12:35:03 +08:00
shizhong 73f6f15c54 BUG 2024-03-06 22:44:40 +08:00
shizhong 7319d24cbc 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2024-03-06 21:44:22 +08:00
YunaiV 9a49a8ea40 🐛 修复 post 和 dept 在 IDEA 报错的问题 
(cherry picked from commit a77173f2ae)
 2024-03-06 21:37:36 +08:00
owen e39918d794 营销：适配商城装修组件【用户卡券】 
(cherry picked from commit 3c8ffc8c21)
 2024-03-06 21:33:19 +08:00
owen 6c96749d18 营销：适配商城装修组件【用户资产】 
(cherry picked from commit c058048fac)
 2024-03-06 21:33:15 +08:00
owen 848091ea6f 营销：适配商城装修组件【用户订单】 
(cherry picked from commit 2c1edfa781)
 2024-03-06 21:33:02 +08:00
owen adfb2469de 营销：适配商城装修组件【用户卡片】 
(cherry picked from commit af67db577d)
 2024-03-06 21:32:58 +08:00
YunaiV ef2a70e3f8 crm: 增加基于客户查询回款计划分页 
(cherry picked from commit b0c1e55c6a)
 2024-03-06 21:32:52 +08:00
owen 1fa79f9d9e 营销：适配商城装修组件【拼团】（待重写） 
(cherry picked from commit d5f9d31d32)
 2024-03-06 21:32:47 +08:00
owen b0300865f3 营销：适配商城装修组件【秒杀】（待重写） 
(cherry picked from commit 7e44b621a5)
 2024-03-06 21:32:40 +08:00
YunaiV 10b057cc3e crm: 增加基于客户查询回款分页 
(cherry picked from commit bdc80ea55b)
 2024-03-06 21:32:36 +08:00
owen 20382bdb8e eslint 
(cherry picked from commit b4ba1043d6)
 2024-03-06 21:32:28 +08:00
owen a8f9fa152a 营销：商城装修增加控件【APP 链接选择】 
(cherry picked from commit 23a6bf5ef5)
 2024-03-06 21:24:11 +08:00
YunaiV 99a1587113 crm: 增加基于客户查询商机分页 
(cherry picked from commit 88e5e67a89)
 2024-03-06 21:21:34 +08:00
YunaiV affd0c52f2 crm：增加合同 List 组件 
(cherry picked from commit 31a42fc3f7)
 2024-03-06 21:21:29 +08:00
YunaiV 993cb4f216 crm：完善数据权限的界面 
(cherry picked from commit 5f26c4afe9)
 2024-03-06 21:21:11 +08:00
YunaiV 008c125abc crm：联系人增加 ContactList 组件，提供给其它模块内嵌 
(cherry picked from commit 7de0e93d5a)
 2024-03-06 21:21:05 +08:00
YunaiV fff915ce60 crm：code review 客户详情 
(cherry picked from commit 8b787176b6)
 2024-03-06 21:20:49 +08:00
wanwan 5d6457c3ff !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 443f65b5dc)
 2024-03-06 21:20:40 +08:00
YunaiV 81142acf51 crm：code review 联系人详情 
(cherry picked from commit ddfceddf4a)
 2024-03-06 21:20:31 +08:00
YunaiV 5520d43d73 crm：code review 客户详情 
(cherry picked from commit ae8cb9218c)
 2024-03-06 21:20:25 +08:00
wanwan a6b9ce704d !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 85810c0786)
 2024-03-06 21:20:18 +08:00
YunaiV f741523e16 crm：code review 商机类型 
(cherry picked from commit c5b2fdecd5)
 2024-03-06 21:17:08 +08:00
ljlleo 85bd10a1fc 商机、商机状态类型 
(cherry picked from commit 50430bb9cd)
 2024-03-06 21:17:01 +08:00
Evol郑天 2dc6c8ba93 修复公众号-素材管理 上传时缺少accountId参数 
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit fd266516fe)
 2024-03-06 21:16:25 +08:00
zyna 57b3b0499e crm联系人review修改 
(cherry picked from commit ed22e02b5b)
 2024-03-06 21:16:14 +08:00
YunaiV eb84424f87 crm：code review 联系人详情 
(cherry picked from commit 1ba450103e)
 2024-03-06 21:15:53 +08:00
YunaiV e45dd09464 crm：code review 客户详情 
(cherry picked from commit 24773a6eaa)
 2024-03-06 21:15:47 +08:00
wanwan 7eff0e1891 !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit e1f9e16a77)
 2024-03-06 21:15:31 +08:00
YunaiV 1d8a41d0f8 crm：code review 商机类型 
(cherry picked from commit 3c19cb1a85)
 2024-03-06 21:14:58 +08:00
ljlleo acedf99903 商机、商机状态类型 
(cherry picked from commit b3515b2db5)
 2024-03-06 21:14:51 +08:00
Evol郑天 9f33432926 同步公众号粉丝接口调用错误 
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit 633965b07d)
 2024-03-06 21:14:01 +08:00
zyna 2a70d4717b 联系人review修改 
(cherry picked from commit 46a8755c93)
 2024-03-06 21:13:55 +08:00
YunaiV 1cf493dedc crm：code review 客户详情 
(cherry picked from commit cec8582a90)
 2024-03-06 21:13:43 +08:00
wanwan 3853b763a0 !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 324d1e859e)
 2024-03-06 21:13:27 +08:00
owen 687ec00343 营销：适配商城装修组件【营销文章】 
(cherry picked from commit d4dc105b4f)
 2024-03-06 21:03:53 +08:00
YunaiV 73f4521bc7 crm：code review 商机类型 
(cherry picked from commit 36702f5f90)
 2024-03-06 21:03:35 +08:00
YunaiV 98c046ecd7 crm：code review 成员 
(cherry picked from commit eb97447bb7)
 2024-03-06 21:03:22 +08:00
Marvin 0921704a4b feat: 菜单右上角加一个搜索图标 
(cherry picked from commit b95b8008f7)
 2024-03-06 21:02:10 +08:00
owen 42b78d1411 商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题 
(cherry picked from commit c3cad3f3ee)
 2024-03-06 21:01:57 +08:00
ljlleo bafc4ca36c 商机、商机状态类型 
(cherry picked from commit 2700b08c69)
 2024-03-06 21:01:24 +08:00
YunaiV aee411607f websocket 重新封装 
(cherry picked from commit 1744c6ec6f)
 2024-03-06 21:01:13 +08:00
puhui999 79319d3dc8 crm-客户：公海数据区分 
(cherry picked from commit f8b56a8c46)
 2024-03-06 20:56:15 +08:00
liuhongfeng eddf5091a0 【修改】ureport2 集成 
(cherry picked from commit aceac6daae)
 2024-03-06 20:56:01 +08:00
owen a494d2723b 营销：适配商城装修组件【优惠券】 
(cherry picked from commit 253401ace3)
 2024-03-06 20:55:51 +08:00
puhui999 6b43ec9d3c crm-客户：集成团队成员 
(cherry picked from commit 12b59200c1)
 2024-03-06 20:53:49 +08:00
puhui999 6da65b76d0 crm-数据权限：完善团队成员公共组件 
(cherry picked from commit 19a0a83054)
 2024-03-06 20:53:41 +08:00
YunaiV b78421a31e sms：移除 sendCode、sendMsg 字段 
(cherry picked from commit f74ddf46ae)
 2024-03-06 20:52:19 +08:00
owen e2fb9df663 商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题 
(cherry picked from commit 1bb9df7b3c)
 2024-03-06 20:50:08 +08:00
liuhongfeng 2988989b1a 【新增】ureport2 集成 
(cherry picked from commit 4440ec866c)
 2024-03-06 20:49:58 +08:00
owen f0991ddedb 商品评论、优惠券模板复用组件【商品橱窗】 
(cherry picked from commit e0a731dd86)
 2024-03-06 20:49:53 +08:00
owen a616b019b8 营销：适配商城装修组件【商品栏】 
(cherry picked from commit 3198688eb5)
 2024-03-06 20:49:48 +08:00
YunaiV 7f50592069 crm：code review 权限列表 
(cherry picked from commit b1f5ad55b8)
 2024-03-06 20:49:39 +08:00
YunaiV b1892674f6 crm：code review 客户配置管理 
(cherry picked from commit 526172af60)
 2024-03-06 20:49:30 +08:00
YunaiV c631fa7915 crm：code review 联系人管理 
(cherry picked from commit 85e953b920)
 2024-03-06 20:49:20 +08:00
YunaiV 1a6a68be5a 代码生成：增加说明文档 
(cherry picked from commit 652698b871)
 2024-03-06 20:45:38 +08:00
YunaiV 646f73b923 代码生成：增加主子表 erp 模式的示例 
(cherry picked from commit a42d0695fe)
 2024-03-06 20:44:51 +08:00
口口口 ebfc1b1375 update src/views/Profile/components/UserSocial.vue. 
在这里绑定，绑定成功后，列表重复

Signed-off-by: 口口口 <17975121@qq.com>
(cherry picked from commit 68f6683e52)
 2024-03-06 20:44:48 +08:00
owen d492186d3e 营销：适配商城装修组件【商品卡片】 
(cherry picked from commit b4a1772584)
 2024-03-06 20:44:34 +08:00
YunaiV 262ef0f651 代码生成：增加主子表 inner 模式的示例 
(cherry picked from commit 6c405ba420)
 2024-03-06 20:44:23 +08:00
YunaiV 8d2d1a26b5 代码生成：增加主子表 normal 模式的示例 
(cherry picked from commit 9aca49c1ff)
 2024-03-06 20:43:58 +08:00
YunaiV 59e98a6679 代码生成：增加 tree 树形的示例 
(cherry picked from commit bbc37613b6)
 2024-03-06 20:43:52 +08:00
YunaiV eeaa608995 代码生成：支持树形表结构的配置 
(cherry picked from commit 3d0c4f4422)
 2024-03-06 20:43:44 +08:00
YunaiV 4cf6b9000a 代码生成：增加 crud 单表示例 
(cherry picked from commit 40b1522ed0)
 2024-03-06 20:43:40 +08:00
Wanwan 13d1b3a084 feat: CRM 客户限制 
(cherry picked from commit 22206b25e1)
 2024-03-06 20:43:21 +08:00
xingyu 9d52790910 fix: stylelint 
(cherry picked from commit 821c804189)
 2024-03-06 20:41:49 +08:00
xingyu 18251290f9 fix: eslint 
(cherry picked from commit 249e0d21a3)
 2024-03-06 20:41:08 +08:00
puhui999 76c05964fa crm-团队成员：新增获得权限级别名称函数 getLevelName 
(cherry picked from commit 8e0cf5c1e5)
 2024-03-06 20:36:44 +08:00
puhui999 8e08665344 crm-团队成员：完善团队成员通用组件封装 
(cherry picked from commit 015a1640c1)
 2024-03-06 20:36:29 +08:00
YunaiV 3524e3525b 代码生成：支持设置主子表的信息 
(cherry picked from commit 45656562a8)
 2024-03-06 20:36:07 +08:00
柯杨 9449829fd3 【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec328)
 2024-03-06 20:33:44 +08:00
puhui999 fa1d2f25e7 crm-团队成员： 先提交一波 
(cherry picked from commit 27c9a0f32d)
 2024-03-06 20:33:39 +08:00
puhui999 c58275cd41 fix：如果已经到重新登录页面则不进行弹窗提示 
(cherry picked from commit 2385cd9b9a)
 2024-03-06 20:33:26 +08:00
YunaiV 8823f11109 代码生成：增加主子表（内嵌）的示例 
(cherry picked from commit 999d8de9e9)
 2024-03-06 20:33:21 +08:00
YunaiV 05592577ff 代码生成：增加主子表（普通）的示例 
(cherry picked from commit f0f7886025)
 2024-03-06 20:33:18 +08:00
YunaiV 26e6d287f5 代码生成：增加 one 情况下的示例代码 
(cherry picked from commit 72c5eaae31)
 2024-03-06 20:33:14 +08:00
owen d176271313 营销：适配商城装修组件【广告魔方】 
(cherry picked from commit 49ebadd748)
 2024-03-06 20:33:03 +08:00
Wanwan 291c34f45a feat: CRM 客户限制 
(cherry picked from commit 702f23e672)
 2024-03-06 20:32:59 +08:00
zyna 1f22d9ad0b crm联系人init 
(cherry picked from commit ed26142bb0)
 2024-03-06 20:32:54 +08:00
Wanwan 5a3fcb3b88 feat: CRM 客户限制 
(cherry picked from commit a7f86dfd8b)
 2024-03-06 20:32:47 +08:00
Wanwan f356bf8076 feat: CRM 客户限制 
(cherry picked from commit 6369b334e3)
 2024-03-06 20:32:43 +08:00
YunaiV e7886a1224 主子表：确认列表编辑的支持组件情况 
(cherry picked from commit 55f6e4ca25)
 2024-03-06 20:32:39 +08:00
YunaiV 7613a3b454 主子表：同步三种模式的代码 
(cherry picked from commit 9f9e0f8bda)
 2024-03-06 20:32:30 +08:00
niou233 95f6dd4bbf update src/locales/zh-CN.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit af5d1cf25e)
 2024-03-06 20:32:26 +08:00
niou233 06d62672e9 update src/locales/en.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 1ab5b44254)
 2024-03-06 20:32:22 +08:00
niou233 c0b6729620 update src/hooks/web/useMessage.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 2ff97758fd)
 2024-03-06 20:32:19 +08:00
YunaiV c1d82098f9 主子表：暂时存储，参数校验-表单数据跑通 
(cherry picked from commit 86d9a97ccb)
 2024-03-06 20:32:11 +08:00
YunaiV 980d546b06 主子表：暂时存储，样式跑通 
(cherry picked from commit d45ebd4fcf)
 2024-03-06 20:32:07 +08:00
YunaiV c8a3c5a3ad 主子表：暂时存储，准备重构 
(cherry picked from commit 4e413a10e6)
 2024-03-06 20:31:57 +08:00
owen e8ec61a280 营销：适配商城装修组件【菜单导航】 
(cherry picked from commit 82aed175ab)
 2024-03-06 20:30:40 +08:00
Wanwan 2ed3c2a51c feat: CRM 客户公海配置 
(cherry picked from commit 59b2d89a18)
 2024-03-06 20:30:33 +08:00
Wanwan c3dc0836c2 feat: CRM 客户公海配置 
(cherry picked from commit 288aa72cdd)
 2024-03-06 20:30:20 +08:00
owen 2d838325c9 营销：适配商城装修组件【宫格导航】 
(cherry picked from commit ac42493659)
 2024-03-06 20:30:15 +08:00
owen 9bf49b4d38 营销：适配商城装修组件【列表导航】 
(cherry picked from commit 325e2e4ff2)
 2024-03-06 20:30:10 +08:00
niou233 4d02972b86 refactor: 会员商品收藏 
(cherry picked from commit f2c71d5836)
 2024-03-06 20:30:03 +08:00
Wanwan cc577dfc6f style: 客户 review 修改 
(cherry picked from commit 7146fdc9b9)
 2024-03-06 20:29:35 +08:00
shizhong 800c6c83d9 BUG 2024-03-05 20:40:16 +08:00
YunaiV adba0142f1 多租户：登录界面，根据 host 域名获取对应的租户编号 
(cherry picked from commit 85ee558bef)
 2024-03-05 17:57:53 +08:00
shizhong e2047eb6e9 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2024-03-05 17:54:50 +08:00
owen 8f70c7f299 营销：适配商城装修组件【轮播图】 
(cherry picked from commit 4253173a2a)
 2024-03-05 17:52:32 +08:00
dhb52 fa174ba54e perf: 优化.env配置 
(cherry picked from commit 89dbb8c9e8)
 2024-03-05 17:52:24 +08:00
owen 8c2b96afc9 营销：增加商城装修组件【视频播放】 
(cherry picked from commit bb2b7ffd03)
 2024-03-05 17:52:08 +08:00
VicoHu 79cf4d31e8 fix: 修复关闭拼团活动请求URL错误的问题 
Signed-off-by: VicoHu <vicohu@163.com>
(cherry picked from commit 3f803767c4)
 2024-03-05 17:51:58 +08:00
YunaiV e354a6f22e code review：产品分类 
(cherry picked from commit 47bb88d892)
 2024-03-05 17:51:53 +08:00
owen 11a28eb196 营销：增加商城装修组件【图片展示】 
(cherry picked from commit fa710b560d)
 2024-03-05 17:51:08 +08:00
YunaiV e3ef2c7e4c code review：回款 
(cherry picked from commit 17742988c9)
 2024-03-05 17:50:42 +08:00
owen ce5314ab41 营销：优化装修编辑器 
(cherry picked from commit 434aa864da)
 2024-03-05 17:50:00 +08:00
owen cf9691f993 营销：优化装修编辑器样式 
(cherry picked from commit 0b0ba1f313)
 2024-03-05 17:49:53 +08:00
owen f526675293 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 
(cherry picked from commit 984351fbf0)
 2024-03-05 17:49:36 +08:00
owen 8cb041b57a 营销：装修页面适配搜索框 
(cherry picked from commit aedf014407)
 2024-03-05 17:49:29 +08:00
YunaiV b2e9e9273d 优化：社交登录、用户的管理 
(cherry picked from commit 4f2f4f72b5)
 2024-03-05 17:49:22 +08:00
ZanGe丶 618cf7459a 【crm:产品及产品分类】 
(cherry picked from commit ff6f05df84)
 2024-03-05 17:49:15 +08:00
shizhong 18e7aea217 优化：社交登录、用户的管理 2024-03-05 17:47:17 +08:00
YunaiV 98fc2fe327 优化：社交登录、用户的管理 
(cherry picked from commit a9b91e7436)
 2024-03-05 17:44:12 +08:00
YunaiV f575ddacea code review：满减送活动 
(cherry picked from commit f79d31a64a)
 2024-03-05 17:43:11 +08:00
YunaiV 85df91ddab code review：客户管理 
(cherry picked from commit a9faeb1bdb)
 2024-03-05 17:42:57 +08:00
Wanwan f780cf0c7b feat: 客户详情 + review 修改 
(cherry picked from commit 23f483ac45)
 2024-03-05 17:42:31 +08:00
jason 6949c196d0 转账 - 新增转账订单查询 
(cherry picked from commit 753f5de81e)
 2024-03-05 17:41:57 +08:00
owen 2c485504e7 营销：装修模板，底部导航适配APP 
(cherry picked from commit 3c0f3ceed5)
 2024-03-05 17:41:50 +08:00
风狗 d47a60b18d update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue. 
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit bf418653e4)
 2024-03-05 17:41:43 +08:00
liuhongfeng 044ad7740e 【新增】负责人 
【修改】规范命名：期数：indexNo-》period

(cherry picked from commit 3d54ad3a6a)
 2024-03-05 17:41:35 +08:00
owen 0d5e6c4098 营销：装修编辑器样式优化 
(cherry picked from commit 9bd33355e2)
 2024-03-05 17:41:26 +08:00
dongshanshan 525e511670 feat: 会员商品收藏 
(cherry picked from commit 9a3253ad20)
 2024-03-05 17:41:11 +08:00
owen 97a94cd29f 营销：完善商城装修 
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断

(cherry picked from commit 881c4f3a29)
 2024-03-05 17:41:01 +08:00
xingyu d172595f14 fix: types 
(cherry picked from commit 10483577b7)
 2024-03-05 17:40:50 +08:00
xingyu de9e45ba43 fix: props 
(cherry picked from commit 52755b38a9)
 2024-03-05 17:40:33 +08:00
shizhong b0e4735936 fix: title name 2024-03-05 17:40:03 +08:00
xingyu 28485eaf61 fix: name warn 
(cherry picked from commit ce93c8d4e9)
 2024-03-05 17:35:30 +08:00
xingyu 1d518c2826 chore: wh-full 
(cherry picked from commit 7321ff2136)
 2024-03-05 17:35:17 +08:00
xingyu 709f3cfbd6 feat: coding 
(cherry picked from commit 80e72fd924)
 2024-03-05 17:34:25 +08:00
xingyu 5eea8d1681 feat: add useTagsView hooks 
(cherry picked from commit 2a029ba35b)
 2024-03-05 17:34:14 +08:00
xingyu ea3249c421 feat: add useNow hooks 
(cherry picked from commit 57e8256e9a)
 2024-03-05 17:34:10 +08:00
xingyu 3a402d51dc perf: useValidator hooks 
(cherry picked from commit bdcef303ff)
 2024-03-05 17:34:04 +08:00
xingyu 56e3a69188 feat: add useNetwork hooks 
(cherry picked from commit f8fdebffe6)
 2024-03-05 17:34:00 +08:00
xingyu 2d0d8eadd8 perf: use driver.js 
(cherry picked from commit 4ba264e00d)
 2024-03-05 17:33:51 +08:00
xingyu 8b8d7451e0 feat: unocss add shortcuts 
(cherry picked from commit f26a4cae10)
 2024-03-05 17:33:45 +08:00
liuhongfeng bccd02a53f 【新增】负责人 
【修改】规范命名：期数：indexNo-》period

(cherry picked from commit 2b84de7e09)
 2024-03-05 17:33:13 +08:00
lzy fae715c01f update src/layout/components/Message/src/Message.vue. 
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
(cherry picked from commit c269cab6b2)
 2024-03-05 17:33:00 +08:00
jason 18cd9dde6e 转账 - 管理后台新增转账示例 
(cherry picked from commit 55a961e862)
 2024-03-05 17:32:29 +08:00
YunaiV ef7156cc97 code review：客户表的实现 
(cherry picked from commit 0c81a0d96a)
 2024-03-05 17:31:37 +08:00
owen d12dcde81d 商城装修 
(cherry picked from commit e9ff8d3237)
 2024-03-05 17:31:22 +08:00
YunaiV ce97304056 code review：客户表的实现 
(cherry picked from commit dc5cf9f24c)
 2024-03-05 17:31:18 +08:00
Wanwan 40e64ecaf3 feat: 调整客户表的字段 
(cherry picked from commit 60d53126c4)
 2024-03-05 17:30:15 +08:00
Wanwan 7923078e17 feat: 调整客户表的字段 
(cherry picked from commit 59cf0c29f0)
 2024-03-05 17:30:11 +08:00
Wanwan ed9ae42ba8 feat: 调整客户表的字段 
(cherry picked from commit 4cdab6fb3e)
 2024-03-05 17:30:07 +08:00
YunaiV 3d5fcaf50b code review：客户表的实现 
(cherry picked from commit b9ab22dad1)
 2024-03-05 17:29:53 +08:00
puhui999 0cddb9c370 三方应用新增授权方的网页应用 agentId 属性 
(cherry picked from commit a624db04e9)
 2024-03-05 17:29:45 +08:00
puhui999 68b2571c0c 解决钉钉绑定失败的问题 
(cherry picked from commit 88a22d90e5)
 2024-03-05 17:29:36 +08:00
puhui999 ca7c311f88 新增社交用户 RUD 
(cherry picked from commit 6ee2492ff1)
 2024-03-05 17:25:31 +08:00
puhui999 212d40f290 新增社交客户端 CRUD 
(cherry picked from commit 8935188a82)
 2024-03-05 17:24:58 +08:00
puhui999 5359c4c862 解决列数据中的 table#header 数据不刷新的问题 
(cherry picked from commit ca385bc08e)
 2024-03-05 17:24:50 +08:00
xingyu 16e0486768 fix: ElLoading need import 
(cherry picked from commit 238537df83)
 2024-03-05 17:24:10 +08:00
Wanwan c0a10146d6 feat: 客户表的 crud 
(cherry picked from commit 044754cdb4)
 2024-03-05 17:23:20 +08:00
YunaiV 9bc0638598 修复 banner 返回字段不对 
(cherry picked from commit 539352f598)
 2024-03-05 17:22:51 +08:00
YunaiV 6ca92b9251 code review：banner 逻辑 
(cherry picked from commit e5d6a9dae1)
 2024-03-05 17:22:30 +08:00
puhui999 11bc949309 优惠卷模版样式调整 
(cherry picked from commit 95d7d1eb42)
 2024-03-05 17:22:21 +08:00
puhui999 8c5cdd0ea5 商品 spu 脱离优惠卷模块 
(cherry picked from commit 75135e1e4f)
 2024-03-05 17:22:16 +08:00
puhui999 1298c3dd52 完善 banner 管理 
(cherry picked from commit a7439ee08b)
 2024-03-05 17:22:09 +08:00
KONGDY-PC\Kongdy 5a67f1c051 满减页面布局 
(cherry picked from commit 7c8f7d570f)
 2024-03-05 17:22:06 +08:00
YunaiV eecf209aad code review：banner 逻辑 
(cherry picked from commit 2dbfa77bee)
 2024-03-05 17:21:37 +08:00
YunaiV b7c81fb37d code review：限时折扣 
(cherry picked from commit 423ea319e0)
 2024-03-05 17:21:27 +08:00
kehaiyou 6bffc7991f fix: 【工作流】--加签减签review修改接口地址 
(cherry picked from commit 5cfb67d047)
 2024-03-05 17:21:22 +08:00
jason 16aba063d1 钱包 - 优化 
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958b)
 2024-03-05 17:21:11 +08:00
puhui999 4fcdd63e51 新增 banner 管理 
(cherry picked from commit 491b3a5018)
 2024-03-05 17:21:03 +08:00
913752709@qq.com 772ded7eca feat: crm 线索表完善 review 提到的问题 
(cherry picked from commit fb90a85e43)
 2024-03-05 17:20:59 +08:00
liuhongfeng 47f948f26b 【新增】回款计划 功能 
(cherry picked from commit 26780c3525)
 2024-03-05 17:20:37 +08:00
liuhongfeng 7b020781f0 【新增】回款管理 功能 
(cherry picked from commit 7ad1457f79)
 2024-03-05 17:20:32 +08:00
puhui999 ea546e4831 完善文章管理 review 提到的问题 
(cherry picked from commit 0730e215d8)
 2024-03-05 17:20:29 +08:00
zhangshuai 9f04b8e34b 限时折扣 
(cherry picked from commit 9f77514c17)
 2024-03-05 17:20:00 +08:00
puhui999 139f45003d SPU: 新增完善活动优先级拖拽排序 
(cherry picked from commit 1e8945de63)
 2024-03-05 17:16:39 +08:00
puhui999 ccec7ad410 SPU: 完善优惠卷选择 
(cherry picked from commit 01d78429cc)
 2024-03-05 17:15:16 +08:00
puhui999 de53601fcb SPU: 完善优惠卷选择 
(cherry picked from commit 18df708b49)
 2024-03-05 17:14:29 +08:00
YunaiV 801ea4c176 code review：门店自提 
(cherry picked from commit 2457665b55)
 2024-03-05 17:14:23 +08:00
puhui999 e9da54b100 SPU: 新增优惠卷选择 
(cherry picked from commit 3464bb9c74)
 2024-03-05 17:12:24 +08:00
puhui999 b8b549462d OrderTableColumn: 商品信息列样式调整2 
(cherry picked from commit 5b3bcecef2)
 2024-03-05 17:12:20 +08:00
puhui999 a313663c99 OrderTableColumn: 商品信息列样式调整 
(cherry picked from commit 094f8e16db)
 2024-03-05 17:12:15 +08:00
puhui999 067c89d987 UserOrderList 重构完善 
(cherry picked from commit 70778fd9e6)
 2024-03-05 17:12:09 +08:00
puhui999 9dae60b597 订单列表：完善表头宽度自适应 
(cherry picked from commit 5270c83876)
 2024-03-05 17:11:37 +08:00
913752709@qq.com a5f21a9b9f feat: CRM 线索表 crud 
(cherry picked from commit 7af2a3bcc3)
 2024-03-05 17:11:33 +08:00
puhui999 bb18f469de 订单列表：自定义列抽离封装为组件 
(cherry picked from commit 04d88ce1a6)
 2024-03-05 17:11:17 +08:00
puhui999 432620ffec 营销文章：新增表单属性移除浏览量 
(cherry picked from commit d1a3fe5d5a)
 2024-03-05 17:10:30 +08:00
owen d04c1f0213 统计卡片修改为全局组件 
(cherry picked from commit 431fff28ce)
 2024-03-05 17:08:22 +08:00
owen 174b95fdef 交易：核销订单 
(cherry picked from commit 61b3bdfd4c)
 2024-03-05 17:07:35 +08:00
YunaiV 56b7e35d49 code review：crm 合同流程 
(cherry picked from commit 8832eafaae)
 2024-03-05 17:07:27 +08:00
1163996518@qq.com 0e0456d4f8 支付渠道配置--修复权限 
(cherry picked from commit 533b4e5006)
 2024-03-05 17:07:21 +08:00
1163996518@qq.com 6721122bc2 支付渠道配置--修复权限 
(cherry picked from commit d5328918ab)
 2024-03-05 17:07:17 +08:00
YunaiV 231285a4ef code review：修复工作流的审批界面报错问题 
(cherry picked from commit c27685285a)
 2024-03-05 17:06:53 +08:00
owen 18b7dd3b7e 交易：订单核销 
(cherry picked from commit 6fc232b758)
 2024-03-05 17:06:12 +08:00
dhb52 d85494bf05 feat: CRM/合同 crud 
(cherry picked from commit dced551698)
 2024-03-05 17:05:58 +08:00
jason 1d602e0a31 钱包 - 钱包余额流水 
(cherry picked from commit c3f06f5fbe)
 2024-03-05 17:03:59 +08:00
jason b3b9fbc201 钱包 - 钱包余额流水 
(cherry picked from commit 8626bccc4c)
 2024-03-05 17:03:54 +08:00
owen aaead6c2b9 统计：修复错误 
(cherry picked from commit e3a0cfe5e9)
 2024-03-05 17:03:47 +08:00
owen 1dba566d1d 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 
(cherry picked from commit 6204ce6c1b)
 2024-03-05 17:03:42 +08:00
owen 25a1e27a12 统计：Review修改 
(cherry picked from commit cd4b4cd322)
 2024-03-05 17:03:35 +08:00
YunaiV e3f1c21e53 code review：文章管理 
(cherry picked from commit 66ec610801)
 2024-03-05 17:03:19 +08:00
xingyu 16eb97e366 perf: is utils 
(cherry picked from commit 8c18ad941e)
 2024-03-05 17:03:10 +08:00
xingyu 5ef9a14f3a perf: propTypes 
(cherry picked from commit 5da9b660bd)
 2024-03-05 17:02:56 +08:00
xingyu d02f5570f5 style: stylelint 
(cherry picked from commit 1a1b70a350)
 2024-03-05 16:59:51 +08:00
owen 35803ba77a 统计：会员终端统计，处理未知终端情况 
(cherry picked from commit edfd03903f)
 2024-03-05 16:53:34 +08:00
owen d46adb0683 统计：处理会员性别统计，存在未知的情况 
(cherry picked from commit 2bfc9c3b13)
 2024-03-05 16:53:25 +08:00
owen eddac7c9be 统计：修复错误 
(cherry picked from commit 661e72bcfd)
 2024-03-05 16:53:16 +08:00
owen 3c51e98682 统计：Review修改 
(cherry picked from commit e1a72779d4)
 2024-03-05 16:53:07 +08:00
YunaiV f0542fef06 code review：文章管理 
(cherry picked from commit 99172ea088)
 2024-03-05 16:52:46 +08:00
owen 230d073fb8 商城：增加商城首页 
(cherry picked from commit 3802fee661)
 2024-03-05 16:52:31 +08:00
YunaiV e35ef6fec7 恢复 SSO 界面的路由 
(cherry picked from commit e2a08ddbac)
 2024-03-05 16:51:13 +08:00
jason e5f043c24b 钱包- 钱包余额查询 
(cherry picked from commit 90d6f4da9f)
 2024-03-05 16:51:04 +08:00
puhui999 7c41ce1796 营销活动：新增文章管理。 
(cherry picked from commit befffb3f7d)
 2024-03-05 16:50:47 +08:00
dhb52 50197497b3 fix: 删除SSOLogin.vue组建，解决登录界面不停重定向问题 
(cherry picked from commit 89417ac393)
 2024-03-05 16:50:43 +08:00
dhb52 f1909bf365 fix: 路由缺少name字段，ts不高兴 
(cherry picked from commit 3587d1ef97)
 2024-03-05 16:50:37 +08:00
dhb52 5bf9baf456 feat: 社交平台登录 
(cherry picked from commit 4d77d7e136)
 2024-03-05 16:50:30 +08:00
puhui999 54e1a8843b 营销活动：新增文章分类管理 
(cherry picked from commit 36bb90fbb8)
 2024-03-05 16:50:22 +08:00
jason 7162525bc7 钱包-充值套餐 
(cherry picked from commit f9d0c1aa1c)
 2024-03-05 16:49:58 +08:00
xingyu 46bce2750f fix: unocss eslint 
(cherry picked from commit e04ca7aac7)
 2024-03-05 16:49:25 +08:00
YunaiV 721fc5c026 code review：拼团记录列表 
(cherry picked from commit 855b37c1ab)
 2024-03-05 16:48:59 +08:00
puhui999 d4d41701ab 营销活动：完善 review 提到的问题，添加拼团列表查看弹窗 
(cherry picked from commit b08e0e5ab2)
 2024-03-05 16:48:39 +08:00
puhui999 848e0b7023 营销活动：完善 review 提到的问题，添加拼团列表查看弹窗 
(cherry picked from commit 3500a20630)
 2024-03-05 16:33:41 +08:00
youkehai dbcefcca9b fix: 减签按钮显示和api地址修改 
(cherry picked from commit 62a953815d)
 2024-03-05 16:33:32 +08:00
owen c4e6163437 统计：会员统计 
(cherry picked from commit 22adab8590)
 2024-03-05 16:32:14 +08:00
shizhong f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
风狗 a2c4cb22f4 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C 
Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit aa5f27bec7)
 2024-03-05 16:05:34 +08:00
YunaiV a06369d427 code review：拼团记录列表 
(cherry picked from commit 86323f970b)
 2024-03-05 16:05:22 +08:00
天痕 abca5a7669 修复，刷新菜单缓存失效问题 
Signed-off-by: 天痕 <614891294@qq.com>
(cherry picked from commit fff4cfd012)
 2024-03-05 16:05:13 +08:00
puhui999 9f836ad25b 拼团记录：优化页面布局，添加日期快捷选项 
(cherry picked from commit 5b4983a3e9)
 2024-03-05 16:04:54 +08:00
puhui999 799ec653dd 拼团活动：表单添加虚拟成团控制按钮 
(cherry picked from commit 8c347e5990)
 2024-03-05 16:04:45 +08:00
puhui999 22449ed21a 拼团记录：接口对接 
(cherry picked from commit c445173855)
 2024-03-05 16:04:39 +08:00
YunaiV edfc7e7c01 promotion：调整拼团活动的界面 
(cherry picked from commit 24fc36e23a)
 2024-03-05 16:04:34 +08:00
puhui999 8346717986 拼团记录： 完成 UI 部分 
(cherry picked from commit eee3d0fef5)
 2024-03-05 16:04:27 +08:00
owen e30e0e2d32 统计：交易统计Review修改 
(cherry picked from commit 2a58b04a98)
 2024-03-05 16:03:05 +08:00
YunaiV 2b4c192423 promotion：调整拼团活动的界面 
(cherry picked from commit 78062dd474)
 2024-03-05 16:03:00 +08:00
YunaiV be2f92754b promotion：新增记录记录列表 
(cherry picked from commit cf7ac2cb10)
 2024-03-05 15:58:09 +08:00
YunaiV d9ec3f6e61 promotion：新增砍价记录列表 
(cherry picked from commit 860872a890)
 2024-03-05 15:58:04 +08:00
YunaiV 171bf0154a promotion：优化砍价活动的管理 
(cherry picked from commit 42f0bf07f0)
 2024-03-05 15:57:52 +08:00
owen cbba91dac5 交易：核销 
(cherry picked from commit 58b6b1ba57)
 2024-03-05 15:57:14 +08:00
YunaiV e92709da70 promotion：优化秒杀活动的界面 
(cherry picked from commit 7c491ff62a)
 2024-03-05 15:57:09 +08:00
YunaiV 517d4ac28e promotion：优化优惠劵的界面 
(cherry picked from commit 40f44fc78e)
 2024-03-05 15:55:09 +08:00
YunaiV 72681f209b trade：优化分销界面的 width 列宽度，和一些非空判断 
(cherry picked from commit 59ab6218ca)
 2024-03-05 15:55:05 +08:00
YunaiV f98f79235e trade：优化门店的 list 列表，新增是否自提的配置项 
(cherry picked from commit ab95d87c68)
 2024-03-05 15:54:54 +08:00
YunaiV 7d44b98116 trade：优化运费模版的实现 
(cherry picked from commit a9bbbc7b0a)
 2024-03-05 15:54:35 +08:00
YunaiV de47866f49 trade：完善退款详情 
(cherry picked from commit bb08f6f54f)
 2024-03-05 15:54:27 +08:00
owen d4a9f844dc 对齐面包屑的图标和文字 
(cherry picked from commit 4c077711a1)
 2024-03-05 15:54:04 +08:00
YunaiV 6a8aa02960 trade：完善订单详情 
(cherry picked from commit 4fddbccea1)
 2024-03-05 15:53:59 +08:00
YunaiV a83db39abf trade：微调 order 列表界面 
(cherry picked from commit 588ce1c9ae)
 2024-03-05 15:53:54 +08:00
YunaiV 23c4bde627 product：优化商品评论 
(cherry picked from commit 17c31978f7)
 2024-03-05 15:53:47 +08:00
YunaiV 41b30ed659 product：优化属性列表 
(cherry picked from commit 8b7543acd5)
 2024-03-05 15:53:43 +08:00
YunaiV 74a43565f6 product：优化分类列表 
(cherry picked from commit 5f80d1611c)
 2024-03-05 15:53:39 +08:00
YunaiV 1ddd72cc46 product：优化商品发布页 
(cherry picked from commit 88677ee121)
 2024-03-05 15:53:35 +08:00
YunaiV f1900d7717 product：优化商品列表的样式、实现代码 
(cherry picked from commit 3a9668d632)
 2024-03-05 15:53:27 +08:00
owen e05b749e4d 会员：会员配置的积分相关字段加上point前缀 
(cherry picked from commit 3a96812d47)
 2024-03-05 15:53:20 +08:00
owen 24a650d89b 会员：积分配置改为会员配置 
(cherry picked from commit 3ab1ed707f)
 2024-03-05 15:53:16 +08:00
owen 6b6c9f5f02 签到：签到后增加用户积分、经验 
(cherry picked from commit 0066d79876)
 2024-03-05 15:52:41 +08:00
owen 18bdea83be 会员详情，修改会员积分 
(cherry picked from commit 4b7e57e67d)
 2024-03-05 15:52:21 +08:00
owen f9ff762977 会员：会员详情-推广用户列表 
(cherry picked from commit 940a102546)
 2024-03-05 15:52:12 +08:00
owen 5a2d22d285 会员：会员详情-优惠券列表 
(cherry picked from commit b48f19c646)
 2024-03-05 15:52:06 +08:00
owen 05e6668322 会员详情，查询钱包信息 
(cherry picked from commit 675f3df5cb)
 2024-03-05 15:50:46 +08:00
owen 9b4bb4025b 统计：交易统计 
(cherry picked from commit c322fb3d0d)
 2024-03-05 15:50:37 +08:00
owen 7412d02e67 fix eslint problems 
(cherry picked from commit 150c77cff0)
 2024-03-05 15:50:20 +08:00
YunaiV 106e6ceada trade：退款理由的维护 
(cherry picked from commit fb94ae9674)
 2024-03-05 15:50:03 +08:00
YunaiV 8d57126589 trade：分佣界面的微调 
(cherry picked from commit 04e02ffbd2)
 2024-03-05 13:19:36 +08:00
YunaiV bf4ab7e58b trade：优化交易配置的参数校验 
(cherry picked from commit 74de8e9687)
 2024-03-05 13:17:57 +08:00
YunaiV d299ad9395 增加 user detail 的 todo 
(cherry picked from commit c6031ba2b2)
 2024-03-05 13:17:30 +08:00
owen 75e0a701f3 分销：修正分享海报 
(cherry picked from commit a5dd7f4a81)
 2024-03-05 13:14:55 +08:00
owen 28d312c857 分销：重命名提现类型字段 
(cherry picked from commit 2c22ef8ef1)
 2024-03-05 13:14:11 +08:00
shizhong 6be1aac0af BUG 2024-02-19 22:33:40 +08:00
shizhong e89c48933f feat: 【工作流】--委派 2023-10-02 12:54:22 +08:00
shizhong 1b9bdf851c feat: 【工作流】--委派 2023-09-27 16:22:37 +08:00
shizhong 842ca8f672 feat: 【工作流】--委派 2023-09-27 16:13:42 +08:00
shizhong 76f8f9d942 feat: 【工作流】--委派 2023-09-27 16:00:40 +08:00
shizhong 3e08217c0d feat: 【工作流】--委派 2023-09-27 11:22:19 +08:00
youkehai 1b30ca07ed feat: 对齐后端-工作流委派的参数 
(cherry picked from commit 0fba0d9a6a)
 2023-09-26 19:57:05 +08:00
shizhong 2c74888712 feat: 【工作流】--委派 2023-09-26 19:56:57 +08:00
shizhong b80702cd9d refactor: vue3.3 defineOptions 2023-09-26 19:43:55 +08:00
shizhong 37a5531132 解决import问题 2023-09-25 17:39:25 +08:00
shizhong 0670facae4 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:08:24 +08:00
YunaiV d46b9deb18 code review：驳回逻辑 
(cherry picked from commit 245147223f)
 2023-09-25 13:32:48 +08:00
shizhong 715cf6c85f fix: 【工作流】--回退的高亮和api地址更换 2023-09-25 13:32:35 +08:00
kehaiyou 0bef9924fe fix: 【工作流】--回退的高亮和api地址更换 
(cherry picked from commit f40d1de62a)
 2023-09-25 13:30:17 +08:00
shizhong 05e3f9ad02 修复 member 详情无法展示的问题 2023-09-25 13:29:16 +08:00
YunaiV fa3acb21b0 修复 member 详情无法展示的问题 
(cherry picked from commit 539f8a5bb5)
 2023-09-25 13:24:41 +08:00
shizhong 3542b50f7d feat: 支持回退按钮 2023-09-25 13:23:11 +08:00