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 |
|
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 属性
|
3 years ago |
|
puhui999
|
88a22d90e5
|
解决钉钉绑定失败的问题
|
3 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
3 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
3 years ago |
|
puhui999
|
d060d27ab2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
ca385bc08e
|
解决列数据中的 table#header 数据不刷新的问题
|
3 years ago |
|
xingyu
|
238537df83
|
fix: ElLoading need import
|
3 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
3 years ago |
|
YunaiV
|
539352f598
|
修复 banner 返回字段不对
|
3 years ago |
|
YunaiV
|
6644a4d4a6
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
YunaiV
|
e5d6a9dae1
|
code review：banner 逻辑
|
3 years ago |
|
puhui999
|
95d7d1eb42
|
优惠卷模版样式调整
|
3 years ago |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
3 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
3 years ago |
KONGDY-PC\Kongdy
|
7c8f7d570f
|
满减页面布局
|
3 years ago |
|
芋道源码
|
54cce467ab
|
!286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
|
3 years ago |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
3 years ago |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
3 years ago |
|
YunaiV
|
2dbfa77bee
|
code review：banner 逻辑
|
3 years ago |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
3 years ago |
|
YunaiV
|
423ea319e0
|
code review：限时折扣
|
3 years ago |
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
3 years ago |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
3 years ago |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
3 years ago |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
3 years ago |
|
913752709@qq.com
|
fb90a85e43
|
feat: crm 线索表完善 review 提到的问题
|
3 years ago |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
3 years ago |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
3 years ago |
|
puhui999
|
0730e215d8
|
完善文章管理 review 提到的问题
|
3 years ago |
zhangshuai
|
9f77514c17
|
限时折扣
|
3 years ago |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
3 years ago |
|
puhui999
|
1e8945de63
|
SPU: 新增完善活动优先级拖拽排序
|
3 years ago |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
3 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
3 years ago |
|
YunaiV
|
2457665b55
|
code review：门店自提
|
3 years ago |
|
芋道源码
|
826199dc22
|
!281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
|
3 years ago |
1351515658@qq.com
|
3074adb1df
|
fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
|
3 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
3 years ago |
|
puhui999
|
5b3bcecef2
|
OrderTableColumn: 商品信息列样式调整2
|
3 years ago |
|
puhui999
|
094f8e16db
|
OrderTableColumn: 商品信息列样式调整
|
3 years ago |
|
puhui999
|
70778fd9e6
|
UserOrderList 重构完善
|
3 years ago |
|
puhui999
|
5270c83876
|
订单列表：完善表头宽度自适应
|
3 years ago |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
3 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
3 years ago |
|
puhui999
|
d1a3fe5d5a
|
营销文章：新增表单属性移除浏览量
|
3 years ago |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
431fff28ce
|
统计卡片修改为全局组件
|
3 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
3 years ago |
|
芋道源码
|
d6b0305d78
|
!277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
|
3 years ago |
|
YunaiV
|
8832eafaae
|
code review：crm 合同流程
|
3 years ago |
1163996518@qq.com
|
533b4e5006
|
支付渠道配置--修复权限
|
3 years ago |
|
1163996518@qq.com
|
d5328918ab
|
支付渠道配置--修复权限
|
3 years ago |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
3 years ago |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
3 years ago |
|
YunaiV
|
c27685285a
|
code review：修复工作流的审批界面报错问题
|
3 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 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
|
3 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
3 years ago |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
3 years ago |
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
3 years ago |
|
jason
|
c3f06f5fbe
|
钱包 - 钱包余额流水
|
3 years ago |