432 Commits (3407cc66a97c2cd66e2a30a40a88d85fa25bb86e)

Author SHA1 Message Date
youkehai 2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
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
kehaiyou de79e79d91 feat: 支持回退按钮 3 years ago
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 3 years ago
puhui999 8778f5746f spu:分佣属性和分佣保持一致 3 years ago
芋道源码 de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
3 years ago
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 3 years ago
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 3 years ago
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 3 years ago
owen 7ea3571356 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
YunaiV 3c315cf287 code review:完善订单详情和售后退款 TODO 提到的问题 3 years ago
芋道源码 dbfabcbbb5
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
3 years ago
owen e9d5027e72 trade: 优化分销用户佣金字段名称 3 years ago
owen 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 3 years ago
owen 34ce7f7ec5 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
owen 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 35664d1f32 trade: 增加交易中心配置表 3 years ago
绮梦 fe6cf7ce98 新增用户详情下成长值页面。 3 years ago
owen 73f8cef3b4 member: 佣金记录 3 years ago
owen 5a9764c08c member: 分销配置 3 years ago
puhui999 46fd154e3a 完善订单详情和售后退款日志展示样式重构 3 years ago
owen 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 3 years ago
owen 76c4644b4b mall:优惠券发送优化 3 years ago
芋道源码 190c6e384c
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
3 years ago
puhui999 f0249e94a5 订单管理:完善订单详情 3 years ago
YunaiV 29b8d06ff2 code review:售后详情 3 years ago
owen 27219e1833 mall:优惠券 商品适用范围,增加商品分类 3 years ago
puhui999 ed739aec55 订单售后列表:完善售后详情及相关操作 3 years ago
puhui999 8a51c9c771 订单售后列表:初始化售后详情 3 years ago
puhui999 4f81468695 订单售后列表:重构列表 3 years ago
owen beef6a0a94 mall: 完善后台发送优惠券 3 years ago
YunaiV 2d8d323767 code review:会员中心 3 years ago
绮梦 76e37a3ee7 Merge remote-tracking branch 'origin/dev' into dev-gitee 3 years ago
绮梦 45a6b3bcc7 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
3 years ago
芋道源码 2605cb7de5
!217 完善 TODO 提到的问题,优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
3 years ago
芋道源码 343b6bbf18
!220 商品:完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
3 years ago
YunaiV 1b6c9b2e29 code review:用户详情 3 years ago
YunaiV 415309469c Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/index.vue
3 years ago
owen 814b4631c9 商品:完善后台商品评论功能 3 years ago
绮梦 28951fb31d 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 3 years ago
puhui999 6b487c7e68 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 7db6c121bb 完善 code review 提到的问题 3 years ago
owen 2e68a5239d Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
#	src/views/member/user/UserForm.vue
3 years ago
owen e9120f06cf 会员: 会员等级取消分页功能 3 years ago
YunaiV 55772cbba0 code review:用户详情 3 years ago
YunaiV 746bf864d9 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mall/promotion/combination/record/index.vue
3 years ago
YunaiV cfbc2ed74c code review:订单列表、订单详情 3 years ago
芋道源码 69a66b2a06
!210 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
3 years ago
YunaiV bb0c1cb536 code review:会员等级 3 years ago
puhui999 5dceda614a 订单列表:列表重构 添加门店、物流检索条件 3 years ago
puhui999 be143ea21b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注 3 years ago
绮梦 10d9f11fba 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
3 years ago
芋道源码 40711c0eb8
!209 会员:增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
3 years ago
owen 51738f8f6e 会员: 修改会员等级,使用单独的表单、接口 3 years ago
puhui999 71f9337d82 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 0d202a7a85 订单列表:列表重构 ③ 添加备注表单和发货表单 3 years ago
owen 78917cd2be 会员:增加用户分组 3 years ago
puhui999 345c09ee6c 订单列表:列表重构 ② and 完善订单详情 3 years ago
owen 884bb055b0 会员:用户标签增加下拉框使用的 精简信息列表查询接口 3 years ago
owen 7bef240926 会员:后台调整会员等级 3 years ago
YunaiV be485cc4ab code review:签到记录 3 years ago
YunaiV 82628ce780 code review:签到配置 3 years ago
owen f1735a4010 会员:增加会员等级增删改查 3 years ago
YunaiV 76a63e01c9 code review:会员签到配置 3 years ago
芋道源码 cbd3d6c9a2
!204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
3 years ago
puhui999 161feab244 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 2eb740765e 订单列表:列表重构 ① 3 years ago
owen 334962fe09 会员:
1.增加会员标签功能
3 years ago
xiaqing f96882c841 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
YunaiV 4fd9dfd1f8 会员中心:会员管理 50% 3 years ago
xiaqing 19444021ca 会员积分和会员签到模块todo修改 3 years ago
puhui999 44be35b5ce fix: 完善砍价活动管理对齐后端 3 years ago
YunaiV 127e6b202e 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题
3 years ago
YunaiV 9984de0dc7 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置
3 years ago
YunaiV 90f22934da Merge remote-tracking branch 'origin/dev' into dev 3 years ago
YunaiV 1ab7ea0640 code review:优化支付通知的实现 3 years ago
YunaiV 7625e6757c code review:优化收银台的实现,解决 TODO 3 years ago
YunaiV 551ebbd41d Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
 Conflicts:
	src/utils/constants.ts
3 years ago
xiaqing de941ec6ba 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
3 years ago
xiaqing f310f65842 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码
3 years ago
dhb52 a6eab3cc9a feat: 支付功能迁移(初稿) 3 years ago
puhui999 79413e0ae2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 4947716983 feat: 完善砍价活动管理 3 years ago
YunaiV 0139443909 Merge remote-tracking branch 'origin/master' 3 years ago
YunaiV ef31ec7aaf bugfix:分配角色菜单时,调用接口 404 问题 3 years ago
芋道源码 7c87f94985
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
3 years ago
dhb52 323417b0d4 feat: 支付管理/应用信息(alpha) 3 years ago
puhui999 c327f79177 fix: combinationActivity 调整 3 years ago
YunaiV ee802d6335 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度 3 years ago
YunaiV a003b59e39 review 秒杀、拼团活动的 CRUD 3 years ago
puhui999 dc39ad0cd1 fix: 完善拼团活动 CRUD 3 years ago
puhui999 3fd9f1b43e fix: mall SeckillConfig 3 years ago
puhui999 4057130275 fix: mall SeckillActivity and CombinationActivity 3 years ago
puhui999 ce3ca7c6ce fix: mall SeckillActivity 3 years ago
puhui999 36c0bce184 fix: mall SeckillActivity 3 years ago
puhui999 b98149f1a7 fix: mall SeckillActivity 3 years ago
puhui999 a5330958ba Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
芋道源码 032d5a0a06
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
3 years ago
puhui999 2e96b1c984 feat: mall CombinationActivity 3 years ago
xiaqing 4251dc5d61 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
3 years ago
puhui999 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 3 years ago
YunaiV 5d613e69b3 review 营销活动 3 years ago
芋道源码 fa71d3e7dd
!175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
3 years ago
puhui999 b1e7f14963 fix:完善秒杀活动管理① 3 years ago
puhui999 3d47d6744e feat:添加秒杀活动管理 3 years ago
xiaobai ca01b16096 提交订单列表和详情20230619 3 years ago
xiaobai 42a7aec0b5 提交订单页面和详情页面 20230619 3 years ago
puhui999 f7b195b226 feat: 完事秒杀时段管理 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
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
xiaqing 1dca8476b3 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
3 years ago
xiaobai e2d795f49d add trade order 20230606 3 years ago
xiaobai ec3b028d55 sync dev-20230606 3 years ago
xiaobai 985d764f62 20230606 add trade-order and details 3 years ago
YunaiV 51e76ffd53 code review:优惠劵管理 3 years ago
芋道源码 7c6d7e8061
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
3 years ago
芋道源码 541b23c8c1
!159 完善商品查看详情,修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
3 years ago
YunaiV 60c1604d49 code review:门店自提、快递运费 3 years ago
xiaobai 505f5cfa0c 临时提交 3 years ago
dhb52 c5a7d05821 style: 添加VO 3 years ago
puhui999 91a5f8044c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 2ddb605076 fix: 完善 SPU 选择快递模版的功能 3 years ago
puhui999 39c92cb944 fix: 完善 SPU 查看详情 3 years ago
jason 000aa95012 新增门店自提管理 3 years ago
puhui999 e555977757 fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示 3 years ago
dhb52 c3b0403ade Merge remote-tracking branch 'yudao/dev' into dev 3 years ago
jason 70c5082776 运费模板区域改成多选 3 years ago
dhb52 ed9f042975 feat: mall 优惠券 初稿 3 years ago
YunaiV ae49aaffcf Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mall/product/spu/index.vue
3 years ago
YunaiV 0fba3fd503 review + mall:商品管理 3 years ago
puhui999 d877bfd26e fix: 完善善品导出 3 years ago
jason af2fb4bf5f 运费模板性能优化。区域选择使用懒加载 3 years ago
芋道源码 855e4d3d02
!153 提交商品管理第二版
Merge pull request !153 from puhui999/dev-to-dev
3 years ago
jason 4e69f15128 mall: 订单中心->运费模板(第一版 性能有问题) 3 years ago
puhui999 39e329b8a3 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 0c42b76a52 fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 3 years ago
jason b0984c9013 新增快递公司菜单 3 years ago
puhui999 4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 3 years ago
puhui999 52bfc4dac0 fix: 进一步完善商品列表,修复TODO 3 years ago
puhui999 50b181318b fix: 整合spu,移动相关类型到spu删除对应文件和文件夹 3 years ago
YunaiV 16561b1238 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	build/vite/optimize.ts
3 years ago
cxr01 a788921d51 修复后台”在线用户强退“功能 3 years ago
YunaiV e92361ed40 code review 商品管理的实现 3 years ago
puhui999 0c6e3a39c9 商品管理: 打通所有接口(第一版) 3 years ago
puhui999 9ee35fc165 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 3 years ago
puhui999 1116fb278b 商品管理: 调整相关组件优化逻辑 3 years ago
puhui999 6478d295df 商品管理: 调整相关组件优化逻辑 3 years ago
puhui999 538d1e0b6c 商品管理: fix:根据商品属性动态生成表格值 3 years ago
puhui999 61218ae711 商品管理: 初步完成相关组件 3 years ago
puhui999 ab1685a741 商品管理: 完善选择商品分类 3 years ago
puhui999 5c52c17227 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 c38abc365c 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑 3 years ago
芋道源码 0ceddc9c91
!137 MP模块重构,功能增强
Merge pull request !137 from dhb52/dev
3 years ago
YunaiV 9680a204ca 调整商品分类的实现 3 years ago
xingyu 6b7d092c29 fix: api error 3 years ago
dhb52 198752868c refactor: mp模块统一accountId未初始化值为-1,删除QueryParams定义 3 years ago
YunaiV e3660e0b20 REVIEW 站内信模版的发送 3 years ago
咱哥丶 776eb3a7b0 重构VUE3【站内信-模板管理】 3 years ago
YunaiV 8863d1d080 REVIEW 支付应用、支付订单 3 years ago
YunaiV 47b5ce2f35 REVIEW OA 请假 3 years ago
YunaiV 276e82c5a8 REVIEW 单点登录界面 3 years ago
芋道源码 0f0ba8b8a9
!95 新增SSO登录
Merge pull request !95 from puhui999/dev
3 years ago
YunaiV 1e0f613449 REVIEW 商品品牌 3 years ago
puhui999 841040b41e Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
3 years ago
芋道源码 5f10efbf39
!104 新增商品品牌功能
Merge pull request !104 from Aix/dev
3 years ago
YunaiV 31dfa86783 REVIEW 公众号的粉丝管理 3 years ago
Aix ef4f6bda5c 【feature】新增商品品牌功能 3 years ago
puhui999 d679a7a3be Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/config/axios/service.ts
#	src/types/auto-components.d.ts
3 years ago
puhui999 e22363d061 完善SSO单点登录 3 years ago
puhui999 2d019f1bf9 增加SSO单点登录 3 years ago
YunaiV 87ac04d9a7 Redis 菜单的重构,移除对 key 的管理 3 years ago
YunaiV 4404554cfc 1. 统一化代码
2. 增加 DocAlert 关联文档
3 years ago
Chika c1e760da6d 流程-已办任务路由中增加详情Model 3 years ago
YunaiV 0d6ecfb45c 1. 统一删除 dialog-footer,包括代码生成的模版
2. 查询参数列表,改下
3. 简化 formatDate
4. 看看是不是有部分新增的 plain 不对
5. modelVisible 改成 dialogVisible?modelTitle 改成 dialogTitle
3 years ago
YunaiV a56a2f6099 REVIEW OAuth2 客户端 3 years ago
YunaiV a319d090bb REVIEW 支付商户 3 years ago
YunaiV 5a5202d483 REVIEW 商品属性 3 years ago
芋道源码 616243a0ab
!83 商品属性模块
Merge pull request !83 from 孔思宇/feat/mall-product-property
3 years ago
芋道源码 59c44d9819
!82 商品分类管理
Merge pull request !82 from 孔思宇/feat/mall-product-category
3 years ago
YunaiV 7b700d875c REVIEW 角色管理(设置数据权限) 3 years ago
YunaiV ecde723fa2 REVIEW 角色管理(设置菜单权限) 3 years ago
YunaiV 8810cb953e REVIEW 定时日志 3 years ago
YunaiV cebe6f93db REVIEW 用户管理(导入用户) 3 years ago
YunaiV 0a69041602 REVIEW 用户管理(修改用户) 3 years ago
YunaiV 7d84f86081 REVIEW 用户管理(分配用户角色) 3 years ago