owen
|
82aed175ab
|
营销：适配商城装修组件【菜单导航】
|
3 years ago |
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
3 years ago |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
ZanGe丶
|
ff6f05df84
|
【crm:产品及产品分类】
|
3 years ago |
|
YunaiV
|
a9b91e7436
|
优化：社交登录、用户的管理
|
3 years ago |
|
YunaiV
|
ac7f1e29fb
|
Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
xingyu
|
10483577b7
|
fix: types
|
3 years ago |
|
xingyu
|
80e72fd924
|
feat: coding
|
3 years ago |
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
3 years ago |
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
3 years ago |
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
3 years ago |
|
YunaiV
|
e5d6a9dae1
|
code review：banner 逻辑
|
3 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
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 |
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
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
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
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 |
|
xingyu
|
8c18ad941e
|
perf: is utils
|
3 years ago |
|
xingyu
|
5da9b660bd
|
perf: propTypes
|
3 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
3 years ago |
|
芋道源码
|
889334bc37
|
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
|
3 years ago |
|
芋道源码
|
6ed7b3a69e
|
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
|
3 years ago |
|
puhui999
|
b08e0e5ab2
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
3 years ago |
风狗
|
aa5f27bec7
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
|
3 years ago |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
3 years ago |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
芋道源码
|
a5808c9e9c
|
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
|
3 years ago |
|
YunaiV
|
3a9668d632
|
product：优化商品列表的样式、实现代码
|
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 |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
3 years ago |
shizhong
|
361e4fadda
|
解决处理顶级非目录路由的组件名称逻辑缺失的问题
|
3 years ago |
|
owen
|
21c67b1b75
|
Trade: 完善配置
|
3 years ago |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
owen
|
18b6c70d1a
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
2e830d14d5
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
0582d41972
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
owen
|
2aa372d8f4
|
trade: 分销业务后台功能：推广用户列表
|
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 |
|
owen
|
dbb87e3850
|
trade: 分销员表格佣金字段格式化
|
3 years ago |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
3 years ago |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
3 years ago |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
3 years ago |
|
YunaiV
|
4bc3f15571
|
code review：积分记录
|
3 years ago |
dhb52
|
620a2009c3
|
fix: 支付管理/退款订单 对标 vue2
|
3 years ago |
|
YunaiV
|
7625e6757c
|
code review：优化收银台的实现，解决 TODO
|
3 years ago |
|
dhb52
|
a6eab3cc9a
|
feat: 支付功能迁移（初稿）
|
3 years ago |
|
dhb52
|
323417b0d4
|
feat: 支付管理/应用信息(alpha)
|
3 years ago |
|
puhui999
|
4057130275
|
fix: mall SeckillActivity and CombinationActivity
|
3 years ago |
|
puhui999
|
a5330958ba
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
4571f893ed
|
review 积分配置
|
3 years ago |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
3 years ago |
xiaqing
|
4251dc5d61
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
3 years ago |
|
YunaiV
|
5d613e69b3
|
review 营销活动
|
3 years ago |
|
puhui999
|
c9ae0fbdbe
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
b159240824
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/infra/build/index.vue
src/views/mall/product/spu/components/DescriptionForm.vue
src/views/mall/product/spu/components/OtherSettingsForm.vue
src/views/mall/product/spu/components/ProductPropertyAddForm.vue
src/views/mall/product/spu/components/SkuList.vue
|
3 years ago |
|
puhui999
|
ee698fd8b2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
a75720ec06
|
feat: 秒杀时段管理
|
3 years ago |
|
YunaiV
|
e3f250fff0
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
867c47de61
|
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
|
3 years ago |
|
芋道源码
|
1e49a8eaf0
|
!170 Expiration time should not set on the refresh token
Merge pull request !170 from 呵呵大/N/A
|
3 years ago |
|
YunaiV
|
5eaf054646
|
code review：会员积分配置
|
3 years ago |
|
YunaiV
|
023539b0db
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
package.json
src/utils/dict.ts
|
3 years ago |
|
YunaiV
|
8666307d47
|
code review：处理字典数据的冲突
|
3 years ago |
|
xiaqing
|
1dca8476b3
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
3 years ago |
呵呵大
|
5554d7c995
|
Expiration time should not set on the refresh token
登录接口返回的过期时间是`access token` 的过期时间，但是被错误地设置在了`refresh token` 上，这导致过了几分钟登录状态便失效要求重新登录
|
3 years ago |
|
puhui999
|
b89db1af55
|
fix: review
|
3 years ago |
xiaobai
|
e2d795f49d
|
add trade order 20230606
|
3 years ago |
|
xiaobai
|
ec3b028d55
|
sync dev-20230606
|
3 years ago |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
3 years ago |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
3 years ago |