niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
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 |
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 |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
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 |
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 |
Wanwan
|
23f483ac45
|
feat: 客户详情 + review 修改
|
2 years ago |
jason
|
fcc748dc63
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
753f5de81e
|
转账 - 新增转账订单查询
|
2 years ago |
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
2 years ago |
owen
|
881c4f3a29
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
|
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
2 years ago |
|
owen
|
e9ff8d3237
|
商城装修
|
2 years ago |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
2 years ago |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
2 years ago |
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
2 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
2 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
2 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2 years ago |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
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 |
|
芋道源码
|
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 |
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 |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2 years ago |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
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
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2 years ago |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
2 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2 years ago |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
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
|
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
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
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 |
|
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
|
4d77d7e136
|
feat: 社交平台登录
|
2 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2 years ago |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
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 |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
3 years ago |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
3 years ago |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
3 years ago |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
3 years ago |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
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
|
675f3df5cb
|
会员详情，查询钱包信息
|
3 years ago |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
3 years ago |
|
kehaiyou
|
b1469669e2
|
Merge branch 'feature/bpm-delegate'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |