YunaiV
|
0395b8f138
|
review 订单
|
2023-06-23 21:28:41 +08:00 |
|
芋道源码
|
70a6d28edd
|
!174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
|
2023-06-23 13:23:02 +00:00 |
|
YunaiV
|
e1b1c134d9
|
合并 master 代码的冲突
|
2023-06-23 14:08:09 +08:00 |
|
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
|
2023-06-23 13:54:43 +08:00 |
|
xingyu
|
c1a4edf7b1
|
refactor: 统一 setup 格式
|
2023-06-21 19:35:11 +08:00 |
|
xingyu
|
82c51e0c3e
|
fix: eslint
|
2023-06-21 19:27:16 +08:00 |
|
xingyu
|
d639401646
|
fix: style lint
|
2023-06-21 19:26:14 +08:00 |
|
xingyu
|
f2992ce8e8
|
fix: eslint
|
2023-06-21 19:18:05 +08:00 |
|
xingyu
|
922f83d99c
|
refactor: vue3.3 defineOptions
|
2023-06-21 19:14:34 +08:00 |
|
xiaobai
|
ca01b16096
|
提交订单列表和详情20230619
|
2023-06-19 15:57:20 +08:00 |
|
xiaobai
|
42a7aec0b5
|
提交订单页面和详情页面 20230619
|
2023-06-19 12:42:43 +08:00 |
|
YunaiV
|
91c53e2e3f
|
code review：订单详情
|
2023-06-17 21:12:20 +08:00 |
|
YunaiV
|
e3f250fff0
|
code review：订单列表
|
2023-06-17 21:02:29 +08:00 |
|
芋道源码
|
867c47de61
|
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
|
2023-06-17 11:04:12 +00:00 |
|
芋道源码
|
1e49a8eaf0
|
!170 Expiration time should not set on the refresh token
Merge pull request !170 from 呵呵大/N/A
|
2023-06-17 11:02:27 +00:00 |
|
芋道源码
|
226cc03d65
|
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
|
2023-06-17 10:57:00 +00:00 |
|
YunaiV
|
467256cece
|
修复 SmsChannelForm.vue 排版报错问题
|
2023-06-17 18:54:57 +08:00 |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
2023-06-17 18:48:49 +08:00 |
|
芋道源码
|
8ed92bcd46
|
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
|
2023-06-17 10:48:26 +00:00 |
|
YunaiV
|
7908160e68
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
2023-06-17 18:45:05 +08:00 |
|
YunaiV
|
5eaf054646
|
code review：会员积分配置
|
2023-06-17 18:33:07 +08:00 |
|
YunaiV
|
023539b0db
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
package.json
src/utils/dict.ts
|
2023-06-17 17:40:29 +08:00 |
|
YunaiV
|
8666307d47
|
code review：处理字典数据的冲突
|
2023-06-17 17:38:20 +08:00 |
|
xiaqing
|
1dca8476b3
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
2023-06-10 20:57:16 +08:00 |
|
呵呵大
|
5554d7c995
|
Expiration time should not set on the refresh token
登录接口返回的过期时间是`access token` 的过期时间，但是被错误地设置在了`refresh token` 上，这导致过了几分钟登录状态便失效要求重新登录
|
2023-06-10 03:19:03 +00:00 |
|
wangzhaoqiang
|
119b499a92
|
修复授权类型选项bug
|
2023-06-08 16:25:32 +08:00 |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
2023-06-07 18:31:28 +08:00 |
|
lwf
|
bc34a73c9e
|
短信渠道提交失败
|
2023-06-07 13:45:33 +08:00 |
|
puhui999
|
20f3f72670
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
|
2023-06-07 08:59:03 +08:00 |
|
puhui999
|
b89db1af55
|
fix: review
|
2023-06-06 16:22:58 +08:00 |
|
xiaobai
|
e2d795f49d
|
add trade order 20230606
|
2023-06-06 01:36:22 +08:00 |
|
xiaobai
|
ec3b028d55
|
sync dev-20230606
|
2023-06-06 01:25:22 +08:00 |
|
xiaobai
|
985d764f62
|
20230606 add trade-order and details
|
2023-06-06 01:08:38 +08:00 |
|
puhui999
|
7fe8dee9ed
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-05 08:35:39 +08:00 |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
2023-06-03 23:15:11 +08:00 |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
2023-06-03 15:02:05 +00:00 |
|
puhui999
|
a1b45f80bc
|
fix: 优化 spu 相关路由配置
|
2023-06-03 21:21:43 +08:00 |
|
YunaiV
|
158585670c
|
code review：商品管理
|
2023-06-03 20:50:07 +08:00 |
|
芋道源码
|
541b23c8c1
|
!159 完善商品查看详情，修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
|
2023-06-03 12:09:43 +00:00 |
|
YunaiV
|
60c1604d49
|
code review：门店自提、快递运费
|
2023-06-03 19:52:14 +08:00 |
|
xiaobai
|
505f5cfa0c
|
临时提交
|
2023-06-02 16:10:33 +08:00 |
|
dhb52
|
c5a7d05821
|
style: 添加VO
|
2023-06-01 18:08:23 +08:00 |
|
puhui999
|
91a5f8044c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-01 11:55:22 +08:00 |
|
puhui999
|
7fb6258bed
|
fix: 修复善品测试发现的问题
|
2023-06-01 11:54:39 +08:00 |
|
puhui999
|
6a10a81f58
|
fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
|
2023-05-31 15:58:35 +08:00 |
|
puhui999
|
2ddb605076
|
fix: 完善 SPU 选择快递模版的功能
|
2023-05-31 15:37:26 +08:00 |
|
puhui999
|
39c92cb944
|
fix: 完善 SPU 查看详情
|
2023-05-31 14:42:45 +08:00 |
|
jason
|
000aa95012
|
新增门店自提管理
|
2023-05-30 21:21:04 +08:00 |
|
puhui999
|
e555977757
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
|
2023-05-30 18:14:40 +08:00 |
|
芋道源码
|
fa6bcacaef
|
!157 合并商城部分功能
Merge pull request !157 from 芋道源码/dev
|
2023-05-29 15:03:34 +00:00 |
|