root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,015 Commits 8 Branches 11 Tags 16 MiB
a1ce9eda2a
Commit Graph

728 Commits

Author SHA1 Message Date
芋道源码
a3f2a01eb0
!198 fix: 修复支付的一些小问题 
Merge pull request !198 from dhb52/master
 2023-08-15 13:22:50 +00:00
zws
c368c9b232 fix 
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW
 2023-08-15 13:32:21 +08:00
dhb52
c7b8fdb884 fix: 支付/示例 queryParams 为 reactive 2023-08-13 21:48:41 +08:00
dhb52
5d364e268f fix: 支付/回调 修复ElDescriptions对齐问题 2023-08-13 21:38:58 +08:00
YunaiV
e954ae6010 支付：修复支付应用的 mock 展示不正确 2023-08-13 16:30:36 +08:00
芋道源码
16369c001c
!197 同步商城实现 
Merge pull request !197 from 芋道源码/dev
 2023-08-13 03:03:21 +00:00
YunaiV
c3a8479eca 支付退款列表的 review 2023-08-13 11:02:12 +08:00
芋道源码
3f90ca3a57
!196 fix: 支付管理/退款订单 对标 vue2 
Merge pull request !196 from dhb52/master
 2023-08-13 02:55:03 +00:00
dhb52
10c121d62d fix: 修复ElDescriptions对齐问题 2023-08-13 01:53:08 +08:00
dhb52
620a2009c3 fix: 支付管理/退款订单 对标 vue2 2023-08-13 01:26:59 +08:00
YunaiV
7bf3e41c61 商城： 
1. 微调砍价活动的代码
 2023-08-13 00:49:17 +08:00
YunaiV
127e6b202e 商城： 
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
 2023-08-13 00:07:04 +08:00
YunaiV
ff8bde207d 商城： 
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
 2023-08-12 16:25:05 +08:00
xingyu
2ec50bab15 chore: remove qrcode.vue use qrcode 2023-08-12 12:23:36 +08:00
xingyu
b9477463fd fix: 提交后刷新列表 2023-08-12 12:23:17 +08:00
YunaiV
9984de0dc7 商城： 
1. 调整优惠劵的目录
2. 简化秒杀时间配置
 2023-08-12 11:39:29 +08:00
YunaiV
815897ca8b 商城：优惠劵的前端完善 2023-08-12 11:09:12 +08:00
YunaiV
98477ef433 修复时间检索，value format 错误，导致无法搜索的问题 2023-08-12 10:13:32 +08:00
YunaiV
90f22934da Merge remote-tracking branch 'origin/dev' into dev 2023-08-12 09:43:01 +08:00
YunaiV
19cad3b873 code review：补全支付文档 2023-08-11 09:22:44 +08:00
YunaiV
bf66727009 code review：优化支付订单的实现 2023-08-11 08:59:08 +08:00
YunaiV
1ab7ea0640 code review：优化支付通知的实现 2023-08-11 07:58:08 +08:00
YunaiV
26cf4ca64a code review：优化示例订单的实现 2023-08-11 00:02:52 +08:00
YunaiV
7625e6757c code review：优化收银台的实现，解决 TODO 2023-08-10 23:30:37 +08:00
YunaiV
551ebbd41d Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3 
 Conflicts:
	src/utils/constants.ts
 2023-08-10 22:21:55 +08:00
芋道源码
6e5286f94d
!195 修复登录后通过登录页面无法再次登录的问题 
Merge pull request !195 from lehug/master
 2023-08-10 13:22:56 +00:00
lehug
280f734f80 修复登录后通过登录页面无法再次登录的问题 2023-08-10 17:51:57 +08:00
xiaqing
f8a4df8b77 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示
 2023-08-09 22:33:09 +08:00
xiaqing
f2e029dca6 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示
 2023-08-09 22:32:13 +08:00
xiaqing
de941ec6ba 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 2023-08-09 20:59:54 +08:00
xiaqing
f310f65842 会员签到针对代码格式、功能优化 
1.优化todo建议
 2.删除无用代码
 2023-08-09 16:14:00 +08:00
账号已删除
ad97fcb583
update src/views/infra/fileConfig/FileConfigForm.vue. 
FTP传输模式错误

Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
 2023-08-09 00:26:02 +00:00
dhb52
a6eab3cc9a feat: 支付功能迁移（初稿） 2023-08-06 23:25:07 +08:00
puhui999
79413e0ae2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-06 20:23:19 +08:00
puhui999
4947716983 feat: 完善砍价活动管理 2023-08-06 18:12:07 +08:00
芋道源码
7c87f94985
!187 修正合并代码后前端不能正常启动的问题 
Merge pull request !187 from puhui999/dev-to-dev
 2023-08-05 06:20:20 +00:00
YunaiV
a2fdff47df 支付应用：模拟支付的添加代码优化 2023-08-05 14:15:10 +08:00
YunaiV
b3b1d97447 支付应用：微信支付的添加代码优化 2023-08-05 14:01:11 +08:00
YunaiV
86e0a375fa 支付应用：支付宝的添加代码优化 2023-08-05 13:50:02 +08:00
芋道源码
dae9bc131c
!188 feat: 支付管理/应用信息 
Merge pull request !188 from dhb52/master
 2023-08-05 05:25:39 +00:00
xingyu
003751a41c fix: dialog 2023-08-04 21:44:55 +08:00
xingyu
784a1be8a1 chore: stylelint(use pnpm lint:style) 2023-08-04 21:33:00 +08:00
dhb52
36268cf834 typo: apiclient_key.perm => apiclient_key.pem 2023-08-03 23:32:15 +08:00
dhb52
323417b0d4 feat: 支付管理/应用信息(alpha) 2023-08-03 23:07:22 +08:00
puhui999
c327f79177 fix: combinationActivity 调整 2023-08-02 23:58:32 +08:00
puhui999
0b06f36aa2 Merge remote-tracking branch 'yudao/master' into dev-to-dev 2023-08-02 21:14:06 +08:00
puhui999
73b918b4e9 fix: 修正 combinationActivity.data.ts 2023-08-01 10:23:15 +08:00
xingyu
2dcb73764f fix: eslint 2023-07-29 15:51:45 +08:00
xingyu
4249465b7c wip: use unocss 2023-07-29 14:40:55 +08:00
xingyu
8e78975521 fix: eslint 2023-07-29 12:55:51 +08:00
芋道源码
b41d8f06ce
!184 同步最新商城实现 
Merge pull request !184 from 芋道源码/dev
 2023-07-26 23:32:27 +00:00
YunaiV
a003b59e39 review 秒杀、拼团活动的 CRUD 2023-07-26 19:22:26 +08:00
芋道源码
d7f0554f97
!179 完成拼团活动和秒杀活动相关表单操作和列表展示 
Merge pull request !179 from puhui999/dev-to-dev
 2023-07-26 04:59:47 +00:00
芋道源码
f908c12963
!183 同步商城实现 
Merge pull request !183 from 芋道源码/dev
 2023-07-26 04:56:22 +00:00
puhui999
dc39ad0cd1 fix: 完善拼团活动 CRUD 2023-07-14 17:35:35 +08:00
water
b061c8f32b
update src/views/Login/components/MobileForm.vue. 
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
 2023-07-12 07:35:48 +00:00
蔚文纲
51198e12a2 fix: 修复src/views.infra/job/index中删除按钮因为传参错误导致删除功能报错 2023-07-10 17:51:10 +08:00
puhui999
3fd9f1b43e fix: mall SeckillConfig 2023-07-10 16:39:22 +08:00
xingyu
44efb13c0e fix: login error 2023-07-10 11:16:42 +08:00
xingyu
ba1254f397 fix: eslint 2023-07-08 11:13:36 +08:00
puhui999
b67fabcf1f fix: mall SeckillActivity 2023-07-05 22:26:18 +08:00
puhui999
4057130275 fix: mall SeckillActivity and CombinationActivity 2023-07-05 18:24:32 +08:00
puhui999
ce3ca7c6ce fix: mall SeckillActivity 2023-07-05 17:12:53 +08:00
puhui999
36c0bce184 fix: mall SeckillActivity 2023-07-05 11:32:32 +08:00
puhui999
b98149f1a7 fix: mall SeckillActivity 2023-07-03 12:07:19 +08:00
puhui999
a5330958ba Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-07-03 07:59:34 +08:00
YunaiV
4571f893ed review 积分配置 2023-07-02 23:18:45 +08:00
芋道源码
032d5a0a06
!178 会员中心(积分、签到)优化 
Merge pull request !178 from QingX/dev
 2023-07-02 13:48:08 +00:00
YunaiV
b1ce2672e4 review 秒杀活动 2023-07-02 21:46:04 +08:00
puhui999
2e96b1c984 feat: mall CombinationActivity 2023-07-02 19:22:57 +08:00
xiaqing
4251dc5d61 会员中心代码 
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
 2023-06-28 22:50:31 +08:00
puhui999
341303b014 fix: 完善 mall seckillActivity add 2023-06-25 17:16:26 +08:00
puhui999
51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 2023-06-25 16:43:49 +08:00
puhui999
76ccc54a35 fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式 2023-06-25 09:35:20 +08:00
YunaiV
5d613e69b3 review 营销活动 2023-06-24 18:53:57 +08:00
芋道源码
fa71d3e7dd
!175 mall seckill 
Merge pull request !175 from puhui999/dev-to-dev
 2023-06-24 04:57:14 +00:00
puhui999
c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-24 01:48:36 +08:00
puhui999
b1e7f14963 fix：完善秒杀活动管理① 2023-06-24 01:48:07 +08:00
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
puhui999
3d47d6744e feat：添加秒杀活动管理 2023-06-22 17:31:36 +08:00
xingyu
c1a4edf7b1 refactor: 统一 setup 格式 2023-06-21 19:35:11 +08:00
xingyu
d639401646 fix: style lint 2023-06-21 19:26:14 +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
puhui999
f7b195b226 feat: 完事秒杀时段管理 2023-06-19 10:20:43 +08:00
puhui999
ee698fd8b2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-17 21:21:33 +08:00
puhui999
a75720ec06 feat: 秒杀时段管理 2023-06-17 21:20:28 +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
芋道源码
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
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
xiaqing
1dca8476b3 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
 2023-06-10 20:57:16 +08: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
YunaiV
ee12fa01c9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 
 Conflicts:
	package.json
 2023-05-29 22:34:07 +08:00
lour6498
257ad9f79f fix: 公告内容不能为空 2023-05-29 18:44:55 +08:00
dhb52
c3b0403ade Merge remote-tracking branch 'yudao/dev' into dev 2023-05-29 18:23:18 +08:00
jason
70c5082776 运费模板区域改成多选 2023-05-27 11:32:16 +08:00
dhb52
ed9f042975 feat: mall 优惠券 初稿 2023-05-26 18:19:39 +08:00
YunaiV
b12aefe46e review + mall：快递公司管理 2023-05-24 23:40:46 +08:00
YunaiV
349a39e72f review + mall：商品管理 2023-05-24 20:32:38 +08:00
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
 2023-05-24 20:31:56 +08:00
YunaiV
0fba3fd503 review + mall：商品管理 2023-05-24 20:27:45 +08:00
puhui999
d877bfd26e fix: 完善善品导出 2023-05-23 12:04:21 +08:00
jason
c296c9e53d 运费模板表格样式调整 2023-05-22 23:57:41 +08:00
jason
af2fb4bf5f 运费模板性能优化。区域选择使用懒加载 2023-05-22 23:10:22 +08:00
芋道源码
855e4d3d02
!153 提交商品管理第二版 
Merge pull request !153 from puhui999/dev-to-dev
 2023-05-21 16:01:53 +00:00
jason
4e69f15128 mall: 订单中心->运费模板(第一版 性能有问题) 2023-05-21 23:41:36 +08:00
puhui999
39e329b8a3 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-05-20 12:06:00 +08:00
puhui999
38545e89c6 fix: 优化相关逻辑，修复遗留bug 2023-05-20 12:05:18 +08:00
puhui999
0c42b76a52 fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 2023-05-19 17:04:13 +08:00
xingyu
45ee4116b7 fix: echart 2023-05-19 15:24:01 +08:00
jason
b0984c9013 新增快递公司菜单 2023-05-18 23:40:39 +08:00
puhui999
4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 2023-05-17 18:24:34 +08:00
puhui999
3c4a39df01 fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 2023-05-17 01:41:30 +08:00
puhui999
9c06832d7e fix: 修复 SkuList TODO 优化相关算法 2023-05-17 01:39:51 +08:00
puhui999
6ac8c78d57 fix: 添加商品属性去掉备注 2023-05-17 01:37:21 +08:00
puhui999
52bfc4dac0 fix: 进一步完善商品列表，修复TODO 2023-05-17 01:17:17 +08:00