YunaiV
|
948ef08533
|
✨ PAY：增加钱包、微信条码支付的渠道配置界面
|
2 years ago |
|
YunaiV
|
bf3e051d74
|
BPM：抄送任务的 code review
|
2 years ago |
|
YunaiV
|
49a806a6f9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
YunaiV
|
2dcd131097
|
✨ 调整启动命令，恢复 npm run dev；如果要连接远程服务
|
2 years ago |
kyle
|
2c9393702d
|
feat: 新增流程抄送
|
2 years ago |
dhb52
|
040b80b35f
|
wip: CRM-代办消息-添加其他页面草稿
|
2 years ago |
|
dhb52
|
48693b50f2
|
wip: CRM-代办消息-修改模块为backlog
|
2 years ago |
|
YunaiV
|
9fa769b16a
|
📖 CRM：跟进记录的 code review
|
2 years ago |
|
芋道源码
|
163613e90c
|
!363 crm：新增跟进组件、转移表单组件封装，完善按钮数据权限控制、客户公海抽离
Merge pull request !363 from puhui999/dev-crm
|
2 years ago |
|
YunaiV
|
1e70a1d57e
|
📖 CRM：待办事项的 code review
|
2 years ago |
|
dhb52
|
24849335a8
|
wip: 待办事项
|
2 years ago |
puhui999
|
2a55d88a44
|
Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
# src/router/modules/remaining.ts
|
2 years ago |
|
puhui999
|
9cbb3aa84a
|
crm-客户：完善转移和按钮权限
|
2 years ago |
|
puhui999
|
5151824110
|
crm-客户：公海抽离，完善跟进
|
2 years ago |
|
puhui999
|
d29dfef7c7
|
新增客户跟进
|
2 years ago |
|
YunaiV
|
26bb847383
|
✨ MALL：简化商品分类的 VO 转化
|
2 years ago |
|
芋道源码
|
fdfb028dd9
|
!360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
|
2 years ago |
|
芋道源码
|
66c48a913c
|
📖 CRM：产品模块的 review
|
2 years ago |
|
YunaiV
|
a9400c5171
|
✨ MALL：简化 SPU 属性的维护逻辑
|
2 years ago |
|
YunaiV
|
10afbe8e2f
|
📖 MALL：商品编辑 => 优化 DescriptionForm 表单
|
2 years ago |
|
YunaiV
|
a38ddb699a
|
📖 MALL：商品编辑 => 优化 DeliveryForm 表单
|
2 years ago |
|
YunaiV
|
20b4a7fd66
|
📖 MALL：商品编辑 => 优化 SKU 表单
|
2 years ago |
anhaohao
|
4f89eb6ba9
|
新增：产品详情页面
|
2 years ago |
owen
|
2b8eb49f71
|
Review代码修改
|
2 years ago |
|
owen
|
bdf95dc0f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
a9c231bed6
|
营销：统一装修预览图片字段名称
|
2 years ago |
|
YunaiV
|
efe702d383
|
📖 MALL：商品编辑 => 简化 InfoForm 基础设置
|
2 years ago |
|
YunaiV
|
2c76d3aeee
|
📖 MALL：商品编辑 => 将 detail 还是使用 form 复用，减少维护成本
|
2 years ago |
|
YunaiV
|
c0905fdc8e
|
📖 MALL：商品编辑的简化
|
2 years ago |
|
YunaiV
|
f1c858b9af
|
📖 MALL：商品编辑的简化
|
2 years ago |
|
YunaiV
|
a5d6d18b6a
|
📖 MALL：优化商品列表的样式
|
2 years ago |
|
YunaiV
|
ab64a1d1df
|
📖 MALL：code review 满减送活动
|
2 years ago |
|
芋道源码
|
1e68cd53a0
|
!352 满减送模块
Merge pull request !352 from Bluemark/dev
|
2 years ago |
|
YunaiV
|
ec87c1b61d
|
📖 CRM：code review crm 客户列表
|
2 years ago |
|
芋道源码
|
4eb3c8a2f9
|
!358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
Merge pull request !358 from puhui999/dev-crm
|
2 years ago |
|
YunaiV
|
a0f7775321
|
📖 CRM：code review crm 联系人新增操作日志
|
2 years ago |
|
芋道源码
|
09fa30b0d6
|
!359 crm联系人新增操作日志
Merge pull request !359 from zyna/dev
|
2 years ago |
|
YunaiV
|
29e7161eba
|
📖 MALL：code review 商品统计的代码
|
2 years ago |
|
芋道源码
|
9bdba0f67e
|
!351 商品统计
Merge pull request !351 from 疯狂的世界/dev
|
2 years ago |
zyna
|
3af6811c72
|
crm联系人新增操作日志
|
2 years ago |
answer-huang
|
8801c82e15
|
fix: remove bg color with xl size
|
2 years ago |
|
puhui999
|
17be1abb65
|
客户详情完善
|
2 years ago |
|
YunaiV
|
d36c4ab36c
|
✨ MALL：去除分销提现的银行配置
|
2 years ago |
|
owen
|
1fb7701e6e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
水人
|
81d84877bc
|
update src/views/bpm/model/ModelForm.vue.
创建的是用路由地址，但那个表单查看的是VUE源码的组件地址，不是路由。给我造成了很大的困扰~
Signed-off-by: 水人 <417693680@qq.com>
|
2 years ago |
|
puhui999
|
7fd564307d
|
fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
|
2 years ago |
|
YunaiV
|
5e265a9094
|
✨ CRM：【联系人】统一字段
|
2 years ago |
|
YunaiV
|
d71097ac31
|
📖 CRM：【客户配置】调整目录结构
|
2 years ago |
|
YunaiV
|
4fbb3b88e6
|
📖 CRM：【客户】微调客户列表界面
|
2 years ago |
|
YunaiV
|
7448f6e08c
|
📖 CRM：【客户】微调客户列表界面
|
2 years ago |
|
YunaiV
|
0a4023ef00
|
📖 CRM：code review 商机模块
|
2 years ago |
|
芋道源码
|
45521c139c
|
!350 crm联系人商机review修改
Merge pull request !350 from zyna/dev
|
2 years ago |
|
芋道源码
|
0338caeef6
|
!355 修复一些 issues 提到的问题
Merge pull request !355 from puhui999/dev-crm
|
2 years ago |
|
YunaiV
|
1eefa02c4c
|
📖 操作日志的界面实现
|
2 years ago |
|
芋道源码
|
631c105f94
|
!346 feat：新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
|
2 years ago |
|
puhui999
|
d766b36e72
|
fix: 修复请假申请提交后页面不返回的bug
|
2 years ago |
|
YunaiV
|
8aa49f2e1d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
ccb997ac2a
|
🐛 修复 Excel 导出失败时，依然下载的问题
|
2 years ago |
|
puhui999
|
aadad39a69
|
fix: 修复文件上传数据回显错误
|
2 years ago |
|
puhui999
|
261d8b2aa4
|
crm-客户：集成操作日志详情组件
|
2 years ago |
AhJindeg
|
2223f7f197
|
fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
|
2 years ago |
落日晚风
|
21e8dbf985
|
满减送数据对接
|
2 years ago |
|
YunaiV
|
9591ed7084
|
📖 code review：店铺装修逻辑
|
2 years ago |
|
YunaiV
|
b86f082306
|
📖 code review：店铺装修逻辑
|
2 years ago |
|
zyna
|
2cfe006def
|
crm联系人商机修改
|
2 years ago |
|
zyna
|
dd4482fad2
|
crm联系人商机修改
|
2 years ago |
|
zyna
|
a1fd3afc32
|
crm联系人商机修改
|
2 years ago |
|
owen
|
ca35e1a4af
|
统计：增加商品统计
|
2 years ago |
|
YunaiV
|
df1c565cd9
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
YunaiV
|
be4750a174
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
水人
|
346863a8a9
|
update src/api/bpm/task/index.ts.
后台接口地址是return-list，前台写成了get-return-list
Signed-off-by: 水人 <417693680@qq.com>
|
2 years ago |
|
owen
|
80355f3acd
|
营销：优化商城装修组件
|
2 years ago |
|
owen
|
33162a12c0
|
营销：适配商城装修组件【标题栏】
|
2 years ago |
|
owen
|
41a404a52c
|
营销：适配商城装修组件【热区】
|
2 years ago |
|
puhui999
|
455688eaa8
|
crm-客户：集成操作日志详情组件
|
2 years ago |
|
puhui999
|
59c6670775
|
feat：新增公共操作日志详情组件
|
2 years ago |
|
owen
|
edfdee8cc1
|
营销：适配商城装修组件【悬浮按钮】
|
2 years ago |
|
owen
|
76025b6821
|
营销：适配商城装修组件【弹窗广告】
|
2 years ago |
|
owen
|
59ff6b13fb
|
封装拖拽组件，提供移动、新增、删除功能
|
2 years ago |
|
owen
|
9ff4f1f7a9
|
商城装修：修复同一类型的组件切换时，右侧属性面板不更新的问题
|
2 years ago |
|
owen
|
a7512ba2c7
|
修复商城首页，快捷入口的图标宽高不一致的问题
|
2 years ago |
|
owen
|
cd89f75b07
|
营销：完善装修编辑器预览功能
|
2 years ago |
|
owen
|
784623724d
|
营销：完善装修编辑器预览功能
|
2 years ago |
|
owen
|
eec3a21852
|
营销：完善装修编辑器重置功能
|
2 years ago |
|
owen
|
9128fa98f5
|
修复首页头像不显示
|
2 years ago |
|
芋道源码
|
b4aa09aa6c
|
!327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
|
2 years ago |
|
芋道源码
|
1e6ceabd3b
|
!343 ✨ 优化：商品库存为0时，商品列表商品封面显示已售罄,商品详情页用户无法下单
Merge pull request !343 from 奕泽云/master
|
2 years ago |
|
YunaiV
|
ce79dd68a3
|
📈 CRM：code review 联系人商机功能
|
2 years ago |
|
芋道源码
|
d6291382e8
|
!341 crm联系人商机功能
Merge pull request !341 from zyna/dev
|
2 years ago |
|
YunaiV
|
f8c4700c2e
|
🔨 CRM：优化产品分类代码的实现
|
2 years ago |
|
YunaiV
|
b3d66cd0aa
|
🔨 CRM：优化产品代码的实现
|
2 years ago |
|
芋道源码
|
ee9667504f
|
!342 【CRM：优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
|
2 years ago |
|
YunaiV
|
0c613e94a8
|
🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确
|
2 years ago |
ZENGlei11350
|
dee8215da2
|
优化：添加商品时0库存商品无法保存改为可以保存
|
2 years ago |
liuhongfeng
|
d9ed3d1a6b
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
ZanGe丶
|
dde61c29a0
|
【crm:优化产品及产品分类】
|
2 years ago |
|
zyna
|
ba49b2851c
|
联系人商机功能
|
2 years ago |
Marvin
|
aac60380bc
|
feat: 跳转到例外一个标签页预览
|
2 years ago |
|
Marvin
|
2a0b329565
|
feat: 新增文件内容项，图片时展示，pdf时跳转到预览，其他文件下载
|
2 years ago |
|
Marvin
|
19e3297667
|
feat: 文件列表增加图片的展示和预览
|
2 years ago |
|
puhui999
|
55c64d9c1b
|
fix:修改 UploadImg 组件预览图片的方式为 createImageViewer，解决商城列表预览图片层级出现错误
|
2 years ago |
Evol郑天
|
3009c04d0a
|
修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2 years ago |
|
YunaiV
|
7748704639
|
🐛 修复 accessLog、errorLog 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
5eb30c7e85
|
🐛 修复 job 在 IDEA 报错的问题
|
2 years ago |
|
liuhongfeng
|
0b9cf35b17
|
【修改】ureport2 集成
|
2 years ago |
|
YunaiV
|
85fe4ad8d6
|
🐛 修复 file 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
aecc9bb8cb
|
🐛 修复 IDEA 在 `v-for="dict in getIntDictOptions(...)"` 时，`el-option` 的 `key` 会告警的问题
|
2 years ago |
|
YunaiV
|
3d2d48b601
|
🐛 修复 user 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
fa421d0895
|
🐛 修复 tenant 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
a6deb69ddc
|
🐛 修复 social 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
3407cc66a9
|
🐛 修复 sms 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
dd4a77ff22
|
🐛 修复 sensitiveWord 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
6593c603a2
|
🐛 修复 menu 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
2ceb3b978c
|
🐛 修复 oauth2 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
5766dc81d1
|
🐛 修复 notify 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
b103c40874
|
🐛 修复 notice 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
1066551fd1
|
🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
757fbddef2
|
🐛 修复 dictType 和 dictData 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
a77173f2ae
|
🐛 修复 post 和 dept 在 IDEA 报错的问题
|
2 years ago |
|
owen
|
b982397449
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
3c8ffc8c21
|
营销：适配商城装修组件【用户卡券】
|
2 years ago |
|
owen
|
c058048fac
|
营销：适配商城装修组件【用户资产】
|
2 years ago |
|
owen
|
2c1edfa781
|
营销：适配商城装修组件【用户订单】
|
2 years ago |
|
owen
|
af67db577d
|
营销：适配商城装修组件【用户卡片】
|
2 years ago |
|
YunaiV
|
b0c1e55c6a
|
crm: 增加基于客户查询回款计划分页
|
2 years ago |
|
owen
|
d5f9d31d32
|
营销：适配商城装修组件【拼团】（待重写）
|
2 years ago |
|
owen
|
7e44b621a5
|
营销：适配商城装修组件【秒杀】（待重写）
|
2 years ago |
|
YunaiV
|
bdc80ea55b
|
crm: 增加基于客户查询回款分页
|
2 years ago |
|
owen
|
b4ba1043d6
|
eslint
|
2 years ago |
|
owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
23a6bf5ef5
|
营销：商城装修增加控件【APP 链接选择】
|
2 years ago |
|
YunaiV
|
88e5e67a89
|
crm: 增加基于客户查询商机分页
|
2 years ago |
|
YunaiV
|
31a42fc3f7
|
crm：增加合同 List 组件
|
2 years ago |
|
YunaiV
|
5f26c4afe9
|
crm：完善数据权限的界面
|
2 years ago |
|
YunaiV
|
7de0e93d5a
|
crm：联系人增加 ContactList 组件，提供给其它模块内嵌
|
2 years ago |
|
YunaiV
|
2cda0cdd9f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/crm/contact/ContactForm.vue
|
2 years ago |
|
YunaiV
|
8b787176b6
|
crm：code review 客户详情
|
2 years ago |
wanwan
|
443f65b5dc
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2 years ago |
|
YunaiV
|
ddfceddf4a
|
crm：code review 联系人详情
|
2 years ago |
|
YunaiV
|
ae8cb9218c
|
crm：code review 客户详情
|
2 years ago |
|
wanwan
|
85810c0786
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2 years ago |
|
YunaiV
|
c5b2fdecd5
|
crm：code review 商机类型
|
2 years ago |
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2 years ago |
|
YunaiV
|
661dc2ff67
|
crm：code review 成员
|
2 years ago |
|
dhb52
|
e106fb73b6
|
Merge remote-tracking branch 'yudao/master' into dhb52_master
|
2 years ago |
|
zyna
|
ed22e02b5b
|
crm联系人review修改
|
2 years ago |
|
芋道源码
|
57b20f1810
|
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
|
2 years ago |
|
YunaiV
|
1ba450103e
|
crm：code review 联系人详情
|
2 years ago |
|
YunaiV
|
24773a6eaa
|
crm：code review 客户详情
|
2 years ago |
|
wanwan
|
e1f9e16a77
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2 years ago |
|
YunaiV
|
3c19cb1a85
|
crm：code review 商机类型
|
2 years ago |
|
ljlleo
|
b3515b2db5
|
商机、商机状态类型
|
2 years ago |
|
YunaiV
|
4e1748caa3
|
crm：code review 成员
|
2 years ago |
|
Evol郑天
|
633965b07d
|
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2 years ago |
|
zyna
|
46a8755c93
|
联系人review修改
|
2 years ago |
|
芋道源码
|
8aa17b673b
|
!331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
|
2 years ago |
|
liuhongfeng
|
7df7719be3
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
owen
|
d4dc105b4f
|
营销：适配商城装修组件【营销文章】
|
2 years ago |
|
芋道源码
|
54897b6d1b
|
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
|
2 years ago |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户：集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
2 years ago |
|
Marvin
|
b95b8008f7
|
feat: 菜单右上角加一个搜索图标
|
2 years ago |
|
liuhongfeng
|
764e1715be
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
owen
|
c3cad3f3ee
|
商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题
|
2 years ago |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2 years ago |
|
puhui999
|
f8b56a8c46
|
crm-客户：公海数据区分
|
2 years ago |
|
dhb52
|
c2038b95bf
|
Merge remote-tracking branch 'yudao/master'
|
2 years ago |
|
liuhongfeng
|
aceac6daae
|
【修改】ureport2 集成
|
2 years ago |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2 years ago |
|
puhui999
|
12b59200c1
|
crm-客户：集成团队成员
|
2 years ago |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
2 years ago |
|
YunaiV
|
f74ddf46ae
|
sms：移除 sendCode、sendMsg 字段
|
2 years ago |
|
owen
|
1bb9df7b3c
|
商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题
|
2 years ago |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2 years ago |
|
owen
|
e0a731dd86
|
商品评论、优惠券模板复用组件【商品橱窗】
|
2 years ago |
|
owen
|
3198688eb5
|
营销：适配商城装修组件【商品栏】
|
2 years ago |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2 years ago |
|
YunaiV
|
ebb19cfe8c
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
YunaiV
|
b1f5ad55b8
|
crm：code review 权限列表
|
2 years ago |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员：完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
2 years ago |
|
芋道源码
|
5f0b0bd21d
|
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
|
2 years ago |
|
芋道源码
|
9d7c578d48
|
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
|
2 years ago |
|
YunaiV
|
526172af60
|
crm：code review 客户配置管理
|
2 years ago |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2 years ago |
|
芋道源码
|
f07d37438d
|
!321 修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题
Merge pull request !321 from 柯杨/master
|
2 years ago |
|
YunaiV
|
85e953b920
|
crm：code review 联系人管理
|
2 years ago |
|
YunaiV
|
7c5ae17d04
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/components/DiyEditor/components/ComponentContainer.vue
|
2 years ago |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2 years ago |
|
YunaiV
|
f1e3eccc8a
|
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
YunaiV
|
652698b871
|
代码生成：增加说明文档
|
2 years ago |
|
芋道源码
|
26dba8b457
|
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
|
2 years ago |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
2 years ago |
口口口
|
68f6683e52
|
update src/views/Profile/components/UserSocial.vue.
在这里绑定，绑定成功后，列表重复
Signed-off-by: 口口口 <17975121@qq.com>
|
2 years ago |
|
owen
|
b4a1772584
|
营销：适配商城装修组件【商品卡片】
|
2 years ago |
|
YunaiV
|
6c405ba420
|
代码生成：增加主子表 inner 模式的示例
|
2 years ago |
|
YunaiV
|
9aca49c1ff
|
代码生成：增加主子表 normal 模式的示例
|
2 years ago |
|
YunaiV
|
bbc37613b6
|
代码生成：增加 tree 树形的示例
|
2 years ago |
|
YunaiV
|
3d0c4f4422
|
代码生成：支持树形表结构的配置
|
2 years ago |
|
YunaiV
|
40b1522ed0
|
代码生成：增加 crud 单表示例
|
2 years ago |
|
Wanwan
|
22206b25e1
|
feat: CRM 客户限制
|
2 years ago |
xingyu
|
821c804189
|
fix: stylelint
|
2 years ago |
|
xingyu
|
249e0d21a3
|
fix: eslint
|
2 years ago |
|
puhui999
|
8e0cf5c1e5
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
|
2 years ago |
|
puhui999
|
ba702d03bc
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
015a1640c1
|
crm-团队成员：完善团队成员通用组件封装
|
2 years ago |
|
YunaiV
|
45656562a8
|
代码生成：支持设置主子表的信息
|
2 years ago |
柯杨
|
8bb9dec328
|
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
|
2 years ago |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
2 years ago |
|
puhui999
|
2385cd9b9a
|
fix：如果已经到重新登录页面则不进行弹窗提示
|
2 years ago |
|
YunaiV
|
999d8de9e9
|
代码生成：增加主子表（内嵌）的示例
|
2 years ago |
|
YunaiV
|
f0f7886025
|
代码生成：增加主子表（普通）的示例
|
2 years ago |
|
YunaiV
|
72c5eaae31
|
代码生成：增加 one 情况下的示例代码
|
2 years ago |
|
owen
|
49ebadd748
|
营销：适配商城装修组件【广告魔方】
|
2 years ago |
|
Wanwan
|
702f23e672
|
feat: CRM 客户限制
|
2 years ago |
|
zyna
|
ed26142bb0
|
crm联系人init
|
2 years ago |
|
Wanwan
|
a7f86dfd8b
|
feat: CRM 客户限制
|
2 years ago |
|
Wanwan
|
6369b334e3
|
feat: CRM 客户限制
|
2 years ago |
|
YunaiV
|
55f6e4ca25
|
主子表：确认列表编辑的支持组件情况
|
2 years ago |
|
Wanwan
|
b63e2a9efb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
9f9e0f8bda
|
主子表：同步三种模式的代码
|
2 years ago |
niou233
|
af5d1cf25e
|
update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
|
2 years ago |
|
niou233
|
1ab5b44254
|
update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
|
2 years ago |
|
niou233
|
2ff97758fd
|
update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
|
2 years ago |
|
YunaiV
|
86d9a97ccb
|
主子表：暂时存储，参数校验-表单数据跑通
|
2 years ago |
|
YunaiV
|
d45ebd4fcf
|
主子表：暂时存储，样式跑通
|
2 years ago |
|
YunaiV
|
4e413a10e6
|
主子表：暂时存储，准备重构
|
2 years ago |
|
YunaiV
|
e9299c6710
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
2 years ago |
|
YunaiV
|
a08e9bea7c
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2 years ago |
|
owen
|
82aed175ab
|
营销：适配商城装修组件【菜单导航】
|
2 years ago |
|
Wanwan
|
59b2d89a18
|
feat: CRM 客户公海配置
|
2 years ago |
|
Wanwan
|
288aa72cdd
|
feat: CRM 客户公海配置
|
2 years ago |
|
owen
|
ac42493659
|
营销：适配商城装修组件【宫格导航】
|
2 years ago |
|
owen
|
325e2e4ff2
|
营销：适配商城装修组件【列表导航】
|
2 years ago |
|
niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
2 years ago |
|
Wanwan
|
57474c0644
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
Wanwan
|
7146fdc9b9
|
style: 客户 review 修改
|
2 years ago |
|
YunaiV
|
eb9f8c9f6f
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
YunaiV
|
85ee558bef
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
2 years ago |
|
YunaiV
|
c0d5c76a06
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2 years ago |
|
owen
|
4253173a2a
|
营销：适配商城装修组件【轮播图】
|
2 years ago |
|
owen
|
6e9e1d0888
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
dhb52
|
89dbb8c9e8
|
perf: 优化.env配置
|
2 years ago |
|
owen
|
bb2b7ffd03
|
营销：增加商城装修组件【视频播放】
|
2 years ago |
VicoHu
|
3f803767c4
|
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
|
2 years ago |
|
YunaiV
|
47bb88d892
|
code review：产品分类
|
2 years ago |
|
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
owen
|
fa710b560d
|
营销：增加商城装修组件【图片展示】
|
2 years ago |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
2 years ago |
|
YunaiV
|
17742988c9
|
code review：回款
|
2 years ago |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
芋道源码
|
f0c45103e1
|
!309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
|
2 years ago |
|
owen
|
434aa864da
|
营销：优化装修编辑器
|
2 years ago |
|
owen
|
0b0ba1f313
|
营销：优化装修编辑器样式
|
2 years ago |
|
owen
|
984351fbf0
|
修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致
|
2 years ago |
|
owen
|
aedf014407
|
营销：装修页面适配搜索框
|
2 years ago |
|
YunaiV
|
4f2f4f72b5
|
优化：社交登录、用户的管理
|
2 years ago |
|
ZanGe丶
|
ff6f05df84
|
【crm:产品及产品分类】
|
2 years ago |
|
YunaiV
|
a9b91e7436
|
优化：社交登录、用户的管理
|
2 years ago |
|
YunaiV
|
ac7f1e29fb
|
Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
芋道源码
|
71e6d51c12
|
!299 update src/layout/components/Message/src/Message.vue.
Merge pull request !299 from lzy/N/A
|
2 years ago |
|
YunaiV
|
f79d31a64a
|
code review：满减送活动
|
2 years ago |
|
芋道源码
|
27defa7268
|
!291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
|
2 years ago |
|
YunaiV
|
a9faeb1bdb
|
code review：客户管理
|
2 years ago |
|
芋道源码
|
09c44cd4fe
|
!306 feat: 客户详情 + review 修改
Merge pull request !306 from wanwan/dev
|
2 years ago |
|
Wanwan
|
23f483ac45
|
feat: 客户详情 + review 修改
|
2 years ago |
|
liuhongfeng
|
8ef5227f88
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
芋道源码
|
f6adb4ebaf
|
!303 商城装修
Merge pull request !303 from 疯狂的世界/dev
|
2 years ago |
jason
|
fcc748dc63
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
753f5de81e
|
转账 - 新增转账订单查询
|
2 years ago |
|
owen
|
3c0f3ceed5
|
营销：装修模板，底部导航适配APP
|
2 years ago |
风狗
|
bf418653e4
|
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改
Signed-off-by: 风狗 <909275705@qq.com>
|
2 years ago |
|
liuhongfeng
|
3d54ad3a6a
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
|
owen
|
9bd33355e2
|
营销：装修编辑器样式优化
|
2 years ago |
dongshanshan
|
18e2c33cef
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
2 years ago |
|
owen
|
881c4f3a29
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
|
xingyu
|
10483577b7
|
fix: types
|
2 years ago |
|
xingyu
|
52755b38a9
|
fix: props
|
2 years ago |
|
xingyu
|
4365ca6177
|
fix: title name
|
2 years ago |
|
xingyu
|
ce93c8d4e9
|
fix: name warn
|
2 years ago |
|
xingyu
|
7321ff2136
|
chore: wh-full
|
2 years ago |
|
xingyu
|
af7c6f3b2c
|
fix: url error
|
2 years ago |
|
xingyu
|
80e72fd924
|
feat: coding
|
2 years ago |
|
xingyu
|
2a029ba35b
|
feat: add useTagsView hooks
|
2 years ago |
|
xingyu
|
57e8256e9a
|
feat: add useNow hooks
|
2 years ago |
|
xingyu
|
bdcef303ff
|
perf: useValidator hooks
|
2 years ago |
|
xingyu
|
f8fdebffe6
|
feat: add useNetwork hooks
|
2 years ago |
|
xingyu
|
4ba264e00d
|
perf: use driver.js
|
2 years ago |
|
xingyu
|
f26a4cae10
|
feat: unocss add shortcuts
|
2 years ago |
|
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
lzy
|
c269cab6b2
|
update src/layout/components/Message/src/Message.vue.
fix: 处理站内信内容过多回显问题
Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
|
2 years ago |
|
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
2 years ago |
|
YunaiV
|
0c81a0d96a
|
code review：客户表的实现
|
2 years ago |
|
owen
|
e9ff8d3237
|
商城装修
|
2 years ago |
|
YunaiV
|
dc5cf9f24c
|
code review：客户表的实现
|
2 years ago |
|
YunaiV
|
690b208a4e
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
Wanwan
|
60d53126c4
|
feat: 调整客户表的字段
|
2 years ago |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
2 years ago |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
2 years ago |
|
芋道源码
|
cca34e0acb
|
!295 订单：解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
|
2 years ago |
|
YunaiV
|
b9ab22dad1
|
code review：客户表的实现
|
2 years ago |
|
芋道源码
|
32b3c874f5
|
!294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
|
2 years ago |
|
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
2 years ago |
|
puhui999
|
88a22d90e5
|
解决钉钉绑定失败的问题
|
2 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
2 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
2 years ago |
|
puhui999
|
d060d27ab2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
ca385bc08e
|
解决列数据中的 table#header 数据不刷新的问题
|
2 years ago |
|
xingyu
|
238537df83
|
fix: ElLoading need import
|
2 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2 years ago |
|
YunaiV
|
539352f598
|
修复 banner 返回字段不对
|
2 years ago |
|
YunaiV
|
6644a4d4a6
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
YunaiV
|
e5d6a9dae1
|
code review：banner 逻辑
|
2 years ago |
|
puhui999
|
95d7d1eb42
|
优惠卷模版样式调整
|
2 years ago |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
2 years ago |
KONGDY-PC\Kongdy
|
7c8f7d570f
|
满减页面布局
|
2 years ago |
|
芋道源码
|
54cce467ab
|
!286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
|
2 years ago |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
2 years ago |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
2 years ago |
|
YunaiV
|
2dbfa77bee
|
code review：banner 逻辑
|
2 years ago |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
2 years ago |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
2 years ago |
|
YunaiV
|
423ea319e0
|
code review：限时折扣
|
2 years ago |
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
2 years ago |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
2 years ago |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
2 years ago |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
2 years ago |
|
913752709@qq.com
|
fb90a85e43
|
feat: crm 线索表完善 review 提到的问题
|
2 years ago |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2 years ago |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
2 years ago |
|
puhui999
|
0730e215d8
|
完善文章管理 review 提到的问题
|
2 years ago |
zhangshuai
|
9f77514c17
|
限时折扣
|
2 years ago |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2 years ago |
|
puhui999
|
1e8945de63
|
SPU: 新增完善活动优先级拖拽排序
|
2 years ago |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2 years ago |
|
YunaiV
|
2457665b55
|
code review：门店自提
|
2 years ago |
|
芋道源码
|
826199dc22
|
!281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
|
2 years ago |
1351515658@qq.com
|
3074adb1df
|
fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
|
2 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2 years ago |
|
puhui999
|
5b3bcecef2
|
OrderTableColumn: 商品信息列样式调整2
|
2 years ago |
|
puhui999
|
094f8e16db
|
OrderTableColumn: 商品信息列样式调整
|
2 years ago |
|
puhui999
|
70778fd9e6
|
UserOrderList 重构完善
|
2 years ago |
|
puhui999
|
5270c83876
|
订单列表：完善表头宽度自适应
|
2 years ago |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
2 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2 years ago |
|
puhui999
|
d1a3fe5d5a
|
营销文章：新增表单属性移除浏览量
|
2 years ago |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
431fff28ce
|
统计卡片修改为全局组件
|
2 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2 years ago |
|
芋道源码
|
d6b0305d78
|
!277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
|
2 years ago |
|
YunaiV
|
8832eafaae
|
code review：crm 合同流程
|
2 years ago |
1163996518@qq.com
|
533b4e5006
|
支付渠道配置--修复权限
|
2 years ago |
|
1163996518@qq.com
|
d5328918ab
|
支付渠道配置--修复权限
|
2 years ago |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2 years ago |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
2 years ago |
|
YunaiV
|
c27685285a
|
code review：修复工作流的审批界面报错问题
|
2 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2 years ago |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
2 years ago |
|
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
2 years ago |
|
jason
|
c3f06f5fbe
|
钱包 - 钱包余额流水
|
2 years ago |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
e3a0cfe5e9
|
统计：修复错误
|
2 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
2 years ago |
|
YunaiV
|
66ec610801
|
code review：文章管理
|
2 years ago |
|
xingyu
|
8c18ad941e
|
perf: is utils
|
2 years ago |
|
xingyu
|
5da9b660bd
|
perf: propTypes
|
2 years ago |
|
xingyu
|
1a1b70a350
|
style: stylelint
|
2 years ago |
|
owen
|
edfd03903f
|
统计：会员终端统计，处理未知终端情况
|
2 years ago |
|
owen
|
2bfc9c3b13
|
统计：处理会员性别统计，存在未知的情况
|
2 years ago |
|
owen
|
661e72bcfd
|
统计：修复错误
|
2 years ago |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2 years ago |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2 years ago |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2 years ago |
|
YunaiV
|
e2a08ddbac
|
恢复 SSO 界面的路由
|
2 years ago |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2 years ago |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2 years ago |
|
dhb52
|
89417ac393
|
fix: 删除SSOLogin.vue组建，解决登录界面不停重定向问题
|
2 years ago |
|
dhb52
|
3587d1ef97
|
fix: 路由缺少name字段，ts不高兴
|
2 years ago |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2 years ago |
|
芋道源码
|
889334bc37
|
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
|
2 years ago |
|
芋道源码
|
b57b45c96f
|
!255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
|
2 years ago |
|
芋道源码
|
fa71f85221
|
!265 修复，刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
|
2 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2 years ago |
|
xingyu
|
e04ca7aac7
|
fix: unocss eslint
|
2 years ago |
|
芋道源码
|
6ed7b3a69e
|
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
|
2 years ago |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
2 years ago |
|
YunaiV
|
855b37c1ab
|
code review：拼团记录列表
|
2 years ago |
|
puhui999
|
b08e0e5ab2
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2 years ago |
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
2 years ago |
|
owen
|
6b7040404e
|
统计：会员统计
|
2 years ago |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
2 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
2 years ago |
|
风狗
|
aa5f27bec7
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
|
2 years ago |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2 years ago |
天痕
|
fff4cfd012
|
修复，刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
|
2 years ago |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
2 years ago |
|
puhui999
|
8c347e5990
|
拼团活动：表单添加虚拟成团控制按钮
|
2 years ago |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
2 years ago |
|
YunaiV
|
24fc36e23a
|
promotion：调整拼团活动的界面
|
2 years ago |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
2 years ago |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
2 years ago |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
2 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
2 years ago |
|
YunaiV
|
42f0bf07f0
|
promotion：优化砍价活动的管理
|
2 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
3 years ago |
|
YunaiV
|
40f44fc78e
|
promotion：优化优惠劵的界面
|
3 years ago |
|
YunaiV
|
59ab6218ca
|
trade：优化分销界面的 width 列宽度，和一些非空判断
|
3 years ago |
|
芋道源码
|
04a94ad941
|
!254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
|
3 years ago |
|
owen
|
a06a63c1be
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
ab95d87c68
|
trade：优化门店的 list 列表，新增是否自提的配置项
|
3 years ago |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
bb08f6f54f
|
trade：完善退款详情
|
3 years ago |
|
owen
|
df8a3941c1
|
对齐面包屑的图标和文字
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
3 years ago |
|
芋道源码
|
a5808c9e9c
|
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
|
3 years ago |
|
YunaiV
|
17c31978f7
|
product：优化商品评论
|
3 years ago |
|
YunaiV
|
8b7543acd5
|
product：优化属性列表
|
3 years ago |
|
YunaiV
|
5f80d1611c
|
product：优化分类列表
|
3 years ago |
|
YunaiV
|
88677ee121
|
product：优化商品发布页
|
3 years ago |
|
YunaiV
|
3a9668d632
|
product：优化商品列表的样式、实现代码
|
3 years ago |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
3 years ago |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
3 years ago |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
3 years ago |
|
owen
|
940a102546
|
会员：会员详情-推广用户列表
|
3 years ago |
|
owen
|
b48f19c646
|
会员：会员详情-优惠券列表
|
3 years ago |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
3 years ago |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
3 years ago |
|
owen
|
150c77cff0
|
fix eslint problems
|
3 years ago |
|
YunaiV
|
fb94ae9674
|
trade：退款理由的维护
|
3 years ago |
|
YunaiV
|
04e02ffbd2
|
trade：分佣界面的微调
|
3 years ago |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
3 years ago |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
888c1371c6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
YunaiV
|
c6031ba2b2
|
增加 user detail 的 todo
|
3 years ago |
绮梦
|
f832d26a0d
|
站内信测试增加 Member 用户类型支持
|
3 years ago |
shizhong
|
361e4fadda
|
解决处理顶级非目录路由的组件名称逻辑缺失的问题
|
3 years ago |
|
youkehai
|
0fba0d9a6a
|
feat: 对齐后端-工作流委派的参数
|
3 years ago |
|
youkehai
|
2aeba127b6
|
Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
芋道源码
|
b9881f2941
|
!252 分销：Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
|
3 years ago |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
3 years ago |
|
YunaiV
|
245147223f
|
code review：驳回逻辑
|
3 years ago |
|
芋道源码
|
ada93a160b
|
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
|
3 years ago |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
3 years ago |
|
kehaiyou
|
f40d1de62a
|
fix: 【工作流】--回退的高亮和api地址更换
|
3 years ago |
|
kehaiyou
|
20fe343646
|
feat: 【工作流】--委派
|
3 years ago |
|
芋道源码
|
0ffd07447b
|
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
|
3 years ago |
|
YunaiV
|
ce78336fca
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
539f8a5bb5
|
修复 member 详情无法展示的问题
|
3 years ago |
|
YunaiV
|
e489627748
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/trade/order/index.vue
# src/views/member/user/detail/index.vue
|
3 years ago |
|
kehaiyou
|
de79e79d91
|
feat: 支持回退按钮
|
3 years ago |
|
owen
|
21c67b1b75
|
Trade: 完善配置
|
3 years ago |
|
xingyu
|
2a58e3f691
|
style: unocss eslint
|
3 years ago |
|
puhui999
|
dd5a1f2d43
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
芋道源码
|
df6a384321
|
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
|
3 years ago |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
owen
|
18b6c70d1a
|
trade: 分销业务review代码修改
|
3 years ago |
|
绮梦
|
245301452c
|
订单详情页面 请求详情接口改为真实携带的id
|
3 years ago |
|
YunaiV
|
1be57ea8d3
|
增加 404 的说明
|
3 years ago |
|
xingyu
|
a6b4908f45
|
!232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
|
3 years ago |
|
puhui999
|
8778f5746f
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
芋道源码
|
de615c2387
|
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
|
3 years ago |
|
YunaiV
|
8b65a2866e
|
code review：订单相关的逻辑
|
3 years ago |
|
xingyu
|
5494756a66
|
fix: eslint
|
3 years ago |
|
xingyu
|
56a71f64e7
|
fix: #I7WY9N
|
3 years ago |
|
xingyu
|
9a6d29b295
|
fix: avatar
|
3 years ago |
|
owen
|
2e830d14d5
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
0582d41972
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
owen
|
2aa372d8f4
|
trade: 分销业务后台功能：推广用户列表
|
3 years ago |
|
puhui999
|
5dc0c6e3da
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
puhui999
|
615763d415
|
order：完善订单聚合搜索
|
3 years ago |
|
puhui999
|
7e511d1e4f
|
mall-order：修复 todo 提到的问题
|
3 years ago |
|
owen
|
87ca916e69
|
trade: 分销业务后台功能：佣金格式化
|
3 years ago |
|
owen
|
5ed909263a
|
trade: 分销业务后台功能：修改上级推广人
|
3 years ago |
|
owen
|
7ea3571356
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
3 years ago |
|
puhui999
|
a79f1452b3
|
登录界面：姐姐点击登录后界面疯狂闪动的问题
|
3 years ago |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
3 years ago |
|
YunaiV
|
30f0c1b351
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
3 years ago |
|
芋道源码
|
e3b9a15c26
|
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
|
3 years ago |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
3 years ago |