714 Commits (023539b0db1270265f56bb33cb4ba6ce2d040d48)
 

Author SHA1 Message Date
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
芋道源码 b809945c19
!171 积分模块
Merge pull request !171 from QingX/master
3 years ago
xiaqing 1dca8476b3 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
3 years ago
YunaiV 51e76ffd53 code review:优惠劵管理 3 years ago
芋道源码 7c6d7e8061
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
3 years ago
YunaiV 158585670c code review:商品管理 3 years ago
芋道源码 541b23c8c1
!159 完善商品查看详情,修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
3 years ago
YunaiV 60c1604d49 code review:门店自提、快递运费 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 7fb6258bed fix: 修复善品测试发现的问题 3 years ago
puhui999 6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 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
puhui999 820d8ab76a fix: pnpm 仓库中没有 video.js 8.0.4 这个版本,更改为 8.3.0 3 years ago
YunaiV 3e549a6862 v1.7.3 版本发布! 3 years ago
芋道源码 fa6bcacaef
!157 合并商城部分功能
Merge pull request !157 from 芋道源码/dev
3 years ago
YunaiV ee12fa01c9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
 Conflicts:
	package.json
3 years ago
芋道源码 20426c43e3
!156 新增 路由搜索
Merge pull request !156 from 卡农ding/addRouterSearch
3 years ago
芋道源码 22c022bf90
Merge pull request #8 from HarryQQ/master
fix: 解决vue版本与pinia版本兼容问题
3 years ago
芋道源码 22eeb9c7c8
Merge pull request #9 from cn3lfs/master
fix: 公告内容不能为空
3 years ago
lour6498 257ad9f79f fix: 公告内容不能为空 3 years ago
dhb52 c3b0403ade Merge remote-tracking branch 'yudao/dev' into dev 3 years ago
qiuhuanran 12e6f08f1f fix: 解决vue版本与pinia版本兼容问题 3 years ago
wangding 43f3c67434 add router search 3 years ago
wangding 6768cdea05 新增路由搜索功能 3 years ago
jason 70c5082776 运费模板区域改成多选 3 years ago
dhb52 ed9f042975 feat: mall 优惠券 初稿 3 years ago
YunaiV b12aefe46e review + mall:快递公司管理 3 years ago
YunaiV 349a39e72f review + 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 c296c9e53d 运费模板表格样式调整 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 38545e89c6 fix: 优化相关逻辑,修复遗留bug 3 years ago
puhui999 0c42b76a52 fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 3 years ago
xingyu 9f0065f89f fix: echart color 3 years ago
xingyu 8b3980400a chore: preview 3 years ago
xingyu ba33d8bfd5 docs: update deps 3 years ago
xingyu 45ee4116b7 fix: echart 3 years ago
xingyu 2bd750a3d6 chore: update deps 3 years ago
jason b0984c9013 新增快递公司菜单 3 years ago
puhui999 4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 3 years ago