Commits · 023539b0db1270265f56bb33cb4ba6ce2d040d48 · phsl / admin

17 Jun, 2023 3 commits
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 023539b0
```
 Conflicts:
	package.json
	src/utils/dict.ts
```
  YunaiV committed Jun 17, 2023
  023539b0 Browse Files
- code review：处理字典数据的冲突 · 8666307d
  YunaiV committed Jun 17, 2023
  
  8666307d Browse Files
- !171 积分模块 · b809945c
```
Merge pull request !171 from QingX/master
```
  芋道源码 committed Jun 17, 2023
  b809945c Browse Files
10 Jun, 2023 1 commit

1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

committed Jun 10, 2023

1dca8476 Browse Files

03 Jun, 2023 5 commits
- code review：优惠劵管理 · 51e76ffd
  YunaiV committed Jun 03, 2023
  
  51e76ffd Browse Files
- !164 优惠券迁移vue3 · 7c6d7e80
```
Merge pull request !164 from dhb52/dev
```
  芋道源码 committed Jun 03, 2023
  7c6d7e80 Browse Files
- code review：商品管理 · 15858567
  YunaiV committed Jun 03, 2023
  
  15858567 Browse Files
- !159 完善商品查看详情，修改了一些问题 · 541b23c8
```
Merge pull request !159 from puhui999/dev-to-dev
```
  芋道源码 committed Jun 03, 2023
  541b23c8 Browse Files
- code review：门店自提、快递运费 · 60c1604d
  YunaiV committed Jun 03, 2023
  
  60c1604d Browse Files
01 Jun, 2023 3 commits
- style: 添加VO · c5a7d058
  dhb52 committed Jun 01, 2023
  
  c5a7d058 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-to-dev · 91a5f804
  puhui999 committed Jun 01, 2023
  
  91a5f804 Browse Files
- fix: 修复善品测试发现的问题 · 7fb6258b
  puhui999 committed Jun 01, 2023
  
  7fb6258b Browse Files
31 May, 2023 3 commits
- fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 · 6a10a81f
  puhui999 committed May 31, 2023
  
  6a10a81f Browse Files
- fix: 完善 SPU 选择快递模版的功能 · 2ddb6050
  puhui999 committed May 31, 2023
  
  2ddb6050 Browse Files
- fix: 完善 SPU 查看详情 · 39c92cb9
  puhui999 committed May 31, 2023
  
  39c92cb9 Browse Files
30 May, 2023 3 commits
- 新增门店自提管理 · 000aa950
  jason committed May 30, 2023
  
  000aa950 Browse Files
- fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 · e5559777
  puhui999 committed May 30, 2023
  
  e5559777 Browse Files
- fix: pnpm 仓库中没有 video.js 8.0.4 这个版本，更改为 8.3.0 · 820d8ab7
  puhui999 committed May 30, 2023
  
  820d8ab7 Browse Files
29 May, 2023 11 commits
- v1.7.3 版本发布！ · 3e549a68
  YunaiV committed May 29, 2023
  
  3e549a68 Browse Files
- !157 合并商城部分功能 · fa6bcaca
```
Merge pull request !157 from 芋道源码/dev
```
  芋道源码 committed May 29, 2023
  fa6bcaca Browse Files
- Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 · ee12fa01
```
 Conflicts:
	package.json
```
  YunaiV committed May 29, 2023
  ee12fa01 Browse Files
- !156 新增路由搜索 · 20426c43
```
Merge pull request !156 from 卡农ding/addRouterSearch
```
  芋道源码 committed May 29, 2023
  20426c43 Browse Files
- Merge pull request #8 from HarryQQ/master · 22c022bf
```
fix: 解决vue版本与pinia版本兼容问题
```
  芋道源码 committed May 29, 2023
  22c022bf Browse Files
- Merge pull request #9 from cn3lfs/master · 22eeb9c7
```
fix: 公告内容不能为空
```
  芋道源码 committed May 29, 2023
  22eeb9c7 Browse Files
- fix: 公告内容不能为空 · 257ad9f7
  lour6498 committed May 29, 2023
  
  257ad9f7 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev · c3b0403a
  dhb52 committed May 29, 2023
  
  c3b0403a Browse Files
- fix: 解决vue版本与pinia版本兼容问题 · 12e6f08f
  qiuhuanran committed May 29, 2023
  
  12e6f08f Browse Files
- add router search · 43f3c674
  wangding committed May 29, 2023
  
  43f3c674 Browse Files
- 新增路由搜索功能 · 6768cdea
  wangding committed May 29, 2023
  
  6768cdea Browse Files
27 May, 2023 1 commit
- 运费模板区域改成多选 · 70c50827
  jason committed May 27, 2023
  
  70c50827 Browse Files
26 May, 2023 1 commit
- feat: mall 优惠券初稿 · ed9f0429
  dhb52 committed May 26, 2023
  
  ed9f0429 Browse Files
24 May, 2023 4 commits
- review + mall：快递公司管理 · b12aefe4
  YunaiV committed May 24, 2023
  
  b12aefe4 Browse Files
- review + mall：商品管理 · 349a39e7
  YunaiV committed May 24, 2023
  
  349a39e7 Browse Files
- Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev · ae49aaff
```
 Conflicts:
	src/views/mall/product/spu/index.vue
```
  YunaiV committed May 24, 2023
  ae49aaff Browse Files
- review + mall：商品管理 · 0fba3fd5
  YunaiV committed May 24, 2023
  
  0fba3fd5 Browse Files
23 May, 2023 1 commit
- fix: 完善善品导出 · d877bfd2
  puhui999 committed May 23, 2023
  
  d877bfd2 Browse Files
22 May, 2023 2 commits
- 运费模板表格样式调整 · c296c9e5
  jason committed May 22, 2023
  
  c296c9e5 Browse Files
- 运费模板性能优化。区域选择使用懒加载 · af2fb4bf
  jason committed May 22, 2023
  
  af2fb4bf Browse Files
21 May, 2023 2 commits
- !153 提交商品管理第二版 · 855e4d3d
```
Merge pull request !153 from puhui999/dev-to-dev
```
  芋道源码 committed May 21, 2023
  855e4d3d Browse Files
- mall: 订单中心->运费模板(第一版性能有问题) · 4e69f151
  jason committed May 21, 2023
  
  4e69f151 Browse Files