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 |