puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
3 years ago |
|
puhui999
|
39df9be988
|
fix: 修正合并代码后前端不能正常启动的问题
|
3 years ago |
|
puhui999
|
0b06f36aa2
|
Merge remote-tracking branch 'yudao/master' into dev-to-dev
|
3 years ago |
linr
|
0c334ff4d6
|
request支持传递axios原生参数，例如超时：request(method:'GET',url:'',timeout:1000)
|
3 years ago |
|
puhui999
|
73b918b4e9
|
fix: 修正 combinationActivity.data.ts
|
3 years ago |
xingyu
|
29d493e2da
|
fix: style
|
3 years ago |
|
xingyu
|
2dcb73764f
|
fix: eslint
|
3 years ago |
|
xingyu
|
9976850c46
|
chore: unocss
|
3 years ago |
|
xingyu
|
4249465b7c
|
wip: use unocss
|
3 years ago |
|
xingyu
|
8e78975521
|
fix: eslint
|
3 years ago |
YunaiV
|
ee802d6335
|
登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度
|
3 years ago |
|
芋道源码
|
b41d8f06ce
|
!184 同步最新商城实现
Merge pull request !184 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
a003b59e39
|
review 秒杀、拼团活动的 CRUD
|
3 years ago |
|
芋道源码
|
d7f0554f97
|
!179 完成拼团活动和秒杀活动相关表单操作和列表展示
Merge pull request !179 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
f908c12963
|
!183 同步商城实现
Merge pull request !183 from 芋道源码/dev
|
3 years ago |
|
puhui999
|
dc39ad0cd1
|
fix: 完善拼团活动 CRUD
|
3 years ago |
water
|
b061c8f32b
|
update src/views/Login/components/MobileForm.vue.
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下
Signed-off-by: water <2778335106@qq.com>
|
3 years ago |
蔚文纲
|
51198e12a2
|
fix: 修复src/views.infra/job/index中删除按钮因为传参错误导致删除功能报错
|
3 years ago |
|
puhui999
|
3fd9f1b43e
|
fix: mall SeckillConfig
|
3 years ago |
|
xingyu
|
44efb13c0e
|
fix: login error
|
3 years ago |
|
xingyu
|
ba1254f397
|
fix: eslint
|
3 years ago |
|
puhui999
|
b67fabcf1f
|
fix: mall SeckillActivity
|
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 |
|
芋道源码
|
13e0ede788
|
!155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题
Merge pull request !155 from OlyLis/master
|
3 years ago |
|
YunaiV
|
4571f893ed
|
review 积分配置
|
3 years ago |
|
芋道源码
|
032d5a0a06
|
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
|
3 years ago |
|
YunaiV
|
b1ce2672e4
|
review 秒杀活动
|
3 years ago |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
3 years ago |
xiaqing
|
4251dc5d61
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
3 years ago |
nullcache
|
073679875b
|
修复useTable在total为0时的bug
|
3 years ago |
|
puhui999
|
341303b014
|
fix: 完善 mall seckillActivity add
|
3 years ago |
|
puhui999
|
51e79f29cc
|
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
|
3 years ago |
|
puhui999
|
76ccc54a35
|
fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式
|
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
|
c9ae0fbdbe
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
b1e7f14963
|
fix：完善秒杀活动管理①
|
3 years ago |
|
YunaiV
|
0395b8f138
|
review 订单
|
3 years ago |
|
芋道源码
|
70a6d28edd
|
!174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
|
3 years ago |
|
YunaiV
|
e1b1c134d9
|
合并 master 代码的冲突
|
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
|
3d47d6744e
|
feat：添加秒杀活动管理
|
3 years ago |
|
xingyu
|
c1a4edf7b1
|
refactor: 统一 setup 格式
|
3 years ago |
|
xingyu
|
82c51e0c3e
|
fix: eslint
|
3 years ago |
|
xingyu
|
d639401646
|
fix: style lint
|
3 years ago |
|
xingyu
|
f2992ce8e8
|
fix: eslint
|
3 years ago |
|
xingyu
|
922f83d99c
|
refactor: vue3.3 defineOptions
|
3 years ago |
|
puhui999
|
f3622d423a
|
fix: 使 Table 组件支持列宽和固定列配置
|
3 years ago |
|
puhui999
|
5064845d4e
|
fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性
|
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
|
91c53e2e3f
|
code review：订单详情
|
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 |
|
芋道源码
|
226cc03d65
|
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
|
3 years ago |
|
YunaiV
|
467256cece
|
修复 SmsChannelForm.vue 排版报错问题
|
3 years ago |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
3 years ago |
|
芋道源码
|
8ed92bcd46
|
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
|
3 years ago |
|
YunaiV
|
7908160e68
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
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 |
wangzhaoqiang
|
119b499a92
|
修复授权类型选项bug
|
3 years ago |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
3 years ago |
lwf
|
bc34a73c9e
|
短信渠道提交失败
|
3 years ago |
|
puhui999
|
20f3f72670
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
|
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 |
|
xiaobai
|
985d764f62
|
20230606 add trade-order and details
|
3 years ago |
|
puhui999
|
7fe8dee9ed
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
3 years ago |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
3 years ago |
|
puhui999
|
a1b45f80bc
|
fix: 优化 spu 相关路由配置
|
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 |
|
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
|
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 |
|
芋道源码
|
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 |
lour6498
|
257ad9f79f
|
fix: 公告内容不能为空
|
3 years ago |
|
dhb52
|
c3b0403ade
|
Merge remote-tracking branch 'yudao/dev' into dev
|
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 |
duxz
|
6b3de50c69
|
fix: 处理 window.bpmnInstances 有时候为 undefined 问题
|
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
|
45ee4116b7
|
fix: echart
|
3 years ago |
|
jason
|
b0984c9013
|
新增快递公司菜单
|
3 years ago |
|
puhui999
|
4ddba9d454
|
fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
|
3 years ago |
|
puhui999
|
3c4a39df01
|
fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug
|
3 years ago |
|
puhui999
|
9c06832d7e
|
fix: 修复 SkuList TODO 优化相关算法
|
3 years ago |
|
puhui999
|
6ac8c78d57
|
fix: 添加商品属性去掉备注
|
3 years ago |
|
puhui999
|
52bfc4dac0
|
fix: 进一步完善商品列表，修复TODO
|
3 years ago |
|
puhui999
|
50b181318b
|
fix: 整合spu，移动相关类型到spu删除对应文件和文件夹
|
3 years ago |
|
puhui999
|
43e541f944
|
fix: 移动copyValueToTarget方法到utils/index中
|
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 |
|
YunaiV
|
3feb4828cd
|
!148 【重构】Vue3 管理后台：[基础管理 -> Redis监控] 使用Echart组件实现
|
3 years ago |
|
芋道源码
|
ab7032f1ca
|
!148 【重构】Vue3 管理后台：[基础管理 -> Redis监控] 使用Echart组件实现
Merge pull request !148 from Chika/dev
|
3 years ago |
|
芋道源码
|
c47cc18b24
|
!147 refactor: mp/autoReply 拆分ReplyForm组件
Merge pull request !147 from dhb52/dev
|
3 years ago |
cxr01
|
a788921d51
|
修复后台”在线用户强退“功能
|
3 years ago |
Chika
|
fbac522149
|
Redis监控用Echart组件整改
|
3 years ago |
|
Chika
|
8456c671e8
|
Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
Chika
|
bf629a9554
|
Redis监控图标使用Echart组件整合
|
3 years ago |
|
YunaiV
|
e92361ed40
|
code review 商品管理的实现
|
3 years ago |
|
dhb52
|
be49c381f6
|
refactor: mp/autoReply 拆分ReplyForm组件
|
3 years ago |
|
芋道源码
|
4a965b8c14
|
!141 商品管理: 打通所有接口（第一版）
Merge pull request !141 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
f1cf125f0d
|
!146 refactor: mp/wx-msg拆分Msg组件
Merge pull request !146 from dhb52/dev
|
3 years ago |
|
芋道源码
|
63cb62e697
|
!139 fix(styles/index): Update .el-scrollbar__bar style
Merge pull request !139 from AhJindeg/fix_tab-scrollbar-style
|
3 years ago |
|
dhb52
|
2b84489969
|
refactor: mp/wx-msg拆分Msg组件
|
3 years ago |
|
YunaiV
|
1c77ba8e04
|
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
|
64f6f67ddd
|
商品管理: 完成商品属性批量添加
|
3 years ago |
|
puhui999
|
ab1120b0ff
|
商品管理: 完成商品属性排列组合算法生成对应表数据
|
3 years ago |
|
puhui999
|
35c3545e7c
|
商品管理: 保存属性值到数据库
|
3 years ago |
|
puhui999
|
538d1e0b6c
|
商品管理: fix:根据商品属性动态生成表格值
|
3 years ago |