puhui999
|
916e93ab2e
|
fix: 解决右侧代码过长时不缩放啥也做不了的 bug
|
3 years ago |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
3 years ago |
芋道源码
|
a3f2a01eb0
|
!198 fix: 修复支付的一些小问题
Merge pull request !198 from dhb52/master
|
3 years ago |
zws
|
c368c9b232
|
fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW
|
3 years ago |
dhb52
|
c7b8fdb884
|
fix: 支付/示例 queryParams 为 reactive
|
3 years ago |
|
dhb52
|
5d364e268f
|
fix: 支付/回调 修复ElDescriptions对齐问题
|
3 years ago |
|
YunaiV
|
e954ae6010
|
支付：修复支付应用的 mock 展示不正确
|
3 years ago |
|
芋道源码
|
16369c001c
|
!197 同步商城实现
Merge pull request !197 from 芋道源码/dev
|
3 years ago |
|
YunaiV
|
c3a8479eca
|
支付退款列表的 review
|
3 years ago |
|
芋道源码
|
3f90ca3a57
|
!196 fix: 支付管理/退款订单 对标 vue2
Merge pull request !196 from dhb52/master
|
3 years ago |
|
dhb52
|
10c121d62d
|
fix: 修复ElDescriptions对齐问题
|
3 years ago |
|
dhb52
|
620a2009c3
|
fix: 支付管理/退款订单 对标 vue2
|
3 years ago |
|
YunaiV
|
7bf3e41c61
|
商城：
1. 微调砍价活动的代码
|
3 years ago |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
3 years ago |
|
YunaiV
|
ff8bde207d
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
|
3 years ago |
xingyu
|
2ec50bab15
|
chore: remove qrcode.vue use qrcode
|
3 years ago |
|
xingyu
|
b9477463fd
|
fix: 提交后刷新列表
|
3 years ago |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
3 years ago |
|
YunaiV
|
815897ca8b
|
商城：优惠劵的前端完善
|
3 years ago |
|
YunaiV
|
98477ef433
|
修复时间检索，value format 错误，导致无法搜索的问题
|
3 years ago |
|
YunaiV
|
90f22934da
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
19cad3b873
|
code review：补全支付文档
|
3 years ago |
|
YunaiV
|
bf66727009
|
code review：优化支付订单的实现
|
3 years ago |
|
YunaiV
|
1ab7ea0640
|
code review：优化支付通知的实现
|
3 years ago |
|
YunaiV
|
26cf4ca64a
|
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 |
|
YunaiV
|
b0e27b2201
|
Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
芋道源码
|
6e5286f94d
|
!195 修复登录后通过登录页面无法再次登录的问题
Merge pull request !195 from lehug/master
|
3 years ago |
lehug
|
280f734f80
|
修复登录后通过登录页面无法再次登录的问题
|
3 years ago |
xiaqing
|
f8a4df8b77
|
会员积分针对代码格式、功能优化
1.修改积分抵扣单位，按照分显示
|
3 years ago |
|
xiaqing
|
f2e029dca6
|
会员积分针对代码格式、功能优化
1.修改积分抵扣单位，按照分显示
|
3 years ago |
|
xiaqing
|
de941ec6ba
|
会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
|
xiaqing
|
f310f65842
|
会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
账号已删除
|
ad97fcb583
|
update src/views/infra/fileConfig/FileConfigForm.vue.
FTP传输模式错误
Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
|
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 |
|
dhb52
|
64b40e7fdf
|
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 |
|
YunaiV
|
a2fdff47df
|
支付应用：模拟支付的添加代码优化
|
3 years ago |
|
YunaiV
|
b3b1d97447
|
支付应用：微信支付的添加代码优化
|
3 years ago |
|
YunaiV
|
86e0a375fa
|
支付应用：支付宝的添加代码优化
|
3 years ago |
|
芋道源码
|
dae9bc131c
|
!188 feat: 支付管理/应用信息
Merge pull request !188 from dhb52/master
|
3 years ago |
|
xingyu
|
003751a41c
|
fix: dialog
|
3 years ago |
|
xingyu
|
784a1be8a1
|
chore: stylelint(use pnpm lint:style)
|
3 years ago |
|
dhb52
|
36268cf834
|
typo: apiclient_key.perm => apiclient_key.pem
|
3 years ago |
|
dhb52
|
323417b0d4
|
feat: 支付管理/应用信息(alpha)
|
3 years ago |
|
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 |