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

847 Commits

Author SHA1 Message Date
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2 
(cherry picked from commit 620a2009c3)
 2023-09-19 20:51:33 +08:00
YunaiV
cfef155ee2 商城： 
1. 微调砍价活动的代码

(cherry picked from commit 7bf3e41c61)
 2023-09-19 20:50:54 +08:00
YunaiV
81d8e36ccc 商城： 
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题

(cherry picked from commit 127e6b202e)
 2023-09-19 20:50:49 +08:00
YunaiV
ffc797ae31 商城： 
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题

(cherry picked from commit ff8bde207d)
 2023-09-19 20:50:41 +08:00
xingyu
3b21e610af chore: remove qrcode.vue use qrcode 
(cherry picked from commit 2ec50bab15)
 2023-09-19 20:50:27 +08:00
xingyu
e1b27dec11 fix: 提交后刷新列表 
(cherry picked from commit b9477463fd)
 2023-09-19 20:50:21 +08:00
YunaiV
0fd07c0cbc 商城： 
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7)
 2023-09-19 20:50:06 +08:00
YunaiV
00829471be 商城：优惠劵的前端完善 
(cherry picked from commit 815897ca8b)
 2023-09-19 20:49:56 +08:00
shizhong
49e28e7b02 修复时间检索，value format 错误，导致无法搜索的问题 2023-09-19 20:49:04 +08:00
YunaiV
4fb9e8ba4d code review：补全支付文档 
(cherry picked from commit 19cad3b873)
 2023-09-19 20:45:32 +08:00
YunaiV
00c319ba41 code review：优化支付订单的实现 
(cherry picked from commit bf66727009)
 2023-09-19 20:45:25 +08:00
YunaiV
a7610dbab3 code review：优化支付通知的实现 
(cherry picked from commit 1ab7ea0640)
 2023-09-19 20:45:22 +08:00
YunaiV
3af92d076e code review：优化示例订单的实现 
(cherry picked from commit 26cf4ca64a)
 2023-09-19 20:45:02 +08:00
YunaiV
db1e2beaf0 code review：优化收银台的实现，解决 TODO 
(cherry picked from commit 7625e6757c)
 2023-09-19 20:44:38 +08:00
lehug
caff8e4966 修复登录后通过登录页面无法再次登录的问题 
(cherry picked from commit 280f734f80)
 2023-09-19 20:41:44 +08:00
xiaqing
bc8702c1dd 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示

(cherry picked from commit f8a4df8b77)
 2023-09-19 20:41:21 +08:00
xiaqing
9ab9344521 会员积分针对代码格式、功能优化 
1.修改积分抵扣单位，按照分显示

(cherry picked from commit f2e029dca6)
 2023-09-19 20:41:16 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
 2023-09-19 20:41:09 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化 
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
 2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移（初稿） 
(cherry picked from commit a6eab3cc9a)
 2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理 
(cherry picked from commit 4947716983)
 2023-09-19 20:36:04 +08:00
dhb52
fd42c410b0 feat: 添加支付图标文件 
(cherry picked from commit 64b40e7fdf)
 2023-09-19 20:35:57 +08:00
YunaiV
f9be77efd4 bugfix：分配角色菜单时，调用接口 404 问题 
(cherry picked from commit ef31ec7aaf)
 2023-09-19 20:35:42 +08:00
YunaiV
544adb9811 支付应用：模拟支付的添加代码优化 
(cherry picked from commit a2fdff47df)
 2023-09-19 20:32:24 +08:00
YunaiV
b613a69e5c 支付应用：微信支付的添加代码优化 
(cherry picked from commit b3b1d97447)
 2023-09-19 20:32:20 +08:00
YunaiV
77a5734a07 支付应用：支付宝的添加代码优化 
(cherry picked from commit 86e0a375fa)
 2023-09-19 20:32:16 +08:00
xingyu
c4fd56dbcd fix: dialog 
(cherry picked from commit 003751a41c)
 2023-09-19 20:31:53 +08:00
dhb52
73cd024a5c typo: apiclient_key.perm => apiclient_key.pem 
(cherry picked from commit 36268cf834)
 2023-09-19 20:25:33 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha) 
(cherry picked from commit 323417b0d4)
 2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整 
(cherry picked from commit c327f79177)
 2023-09-19 20:24:40 +08:00
puhui999
cace3d1743 fix: 修正合并代码后前端不能正常启动的问题 
(cherry picked from commit 39df9be988)
 2023-09-19 20:24:31 +08:00
linr
e3e2111324 request支持传递axios原生参数，例如超时：request(method:'GET',url:'',timeout:1000) 
(cherry picked from commit 0c334ff4d6)
 2023-09-19 20:24:21 +08:00
puhui999
67baf1e0a5 fix: 修正 combinationActivity.data.ts 
(cherry picked from commit 73b918b4e9)
 2023-09-19 20:24:15 +08:00
xingyu
9ae54036fa fix: style 
(cherry picked from commit 29d493e2da)
 2023-09-19 20:14:31 +08:00
xingyu
c50051d930 fix: eslint 
(cherry picked from commit 2dcb73764f)
 2023-09-19 20:14:25 +08:00
xingyu
05c3245ea5 chore: unocss 
(cherry picked from commit 9976850c46)
 2023-09-19 20:09:09 +08:00
xingyu
4f81427aa0 wip: use unocss 
(cherry picked from commit 4249465b7c)
 2023-09-19 20:08:38 +08:00
xingyu
c7d6d35642 fix: eslint 
(cherry picked from commit 8e78975521)
 2023-09-19 20:02:03 +08:00
YunaiV
4cef3e3e5f 登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度 
(cherry picked from commit ee802d6335)
 2023-09-19 19:59:19 +08:00
shizhong
6704805af4 fix: 个人中心头像为空时不能修改 2023-09-11 16:35:04 +08:00
xingyu
bdaeb75ccc fix: 个人中心头像为空时不能修改 
(cherry picked from commit e6a9dd0e4c)
 2023-09-11 16:10:27 +08:00
芋道源码
a15d777afb
!214 增加部门和菜单的详情，解决个人中心无法上传图片的问题 
Merge pull request !214 from clockdotnet/master-vxe
 2023-08-23 16:58:45 +00:00
周建
4d798c82df 密码提示问题 2023-08-23 13:51:04 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情，解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
周建
7eced09de0 个人中心重置及校验问题，部分表单增加校验 2023-08-16 17:31:28 +08:00
shizhong
5620a9da6a 发布 1.8.0 版本 2023-07-27 23:33:28 +08:00
shizhong
7b3b89fc9a 发布 1.8.0 版本 2023-07-27 22:11:53 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD 
(cherry picked from commit a003b59e39)
 2023-07-27 19:51:42 +08:00
shizhong
8641221274 !183 同步商城实现 Merge pull request !183 from 芋道源码/dev 2023-07-27 19:50:13 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD 
(cherry picked from commit dc39ad0cd1)
 2023-07-27 19:45:36 +08:00
water
e7e0c7a6b7 update src/views/Login/components/MobileForm.vue. 
我发现，这个手机号登陆时，登陆成功了但是没有自动跳转，我手动路由到/，又自动跳转到登陆页面，应该是token没存进去，我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
(cherry picked from commit b061c8f32b)
 2023-07-27 19:44:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig 
(cherry picked from commit 3fd9f1b43e)
 2023-07-27 19:43:51 +08:00
xingyu
5e0d09769d fix: login error 
(cherry picked from commit 44efb13c0e)
 2023-07-27 19:43:43 +08:00
xingyu
a7fe002abd fix: eslint 
(cherry picked from commit ba1254f397)
 2023-07-27 19:43:38 +08:00
puhui999
a507f26664 fix: mall SeckillActivity 
(cherry picked from commit b67fabcf1f)
 2023-07-27 19:41:28 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity 
(cherry picked from commit 4057130275)
 2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity 
(cherry picked from commit ce3ca7c6ce)
 2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity 
(cherry picked from commit 36c0bce184)
 2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity 
(cherry picked from commit b98149f1a7)
 2023-07-27 19:40:48 +08:00
shizhong
e8088415d9 !155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 Merge pull request !155 from OlyLis/master 2023-07-27 19:40:20 +08:00
YunaiV
23fa3fe14c review 积分配置 
(cherry picked from commit 4571f893ed)
 2023-07-27 19:37:26 +08:00
YunaiV
401112f668 review 秒杀活动 
(cherry picked from commit b1ce2672e4)
 2023-07-27 19:37:02 +08:00
puhui999
22f869db89 feat: mall CombinationActivity 
(cherry picked from commit 2e96b1c984)
 2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码 
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d61)
 2023-07-27 19:36:28 +08:00
nullcache
341dcaf665 修复useTable在total为0时的bug 
(cherry picked from commit 69c4995b52)
 2023-07-27 19:35:39 +08:00
puhui999
bc35b0c80f fix: 完善 mall seckillActivity add 
(cherry picked from commit 341303b014)
 2023-07-27 19:35:21 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 
(cherry picked from commit 51e79f29cc)
 2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式 
(cherry picked from commit 76ccc54a35)
 2023-07-27 19:35:01 +08:00
YunaiV
a22eea8e90 review 营销活动 
(cherry picked from commit 5d613e69b3)
 2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix：完善秒杀活动管理① 
(cherry picked from commit b1e7f14963)
 2023-07-27 19:33:06 +08:00
YunaiV
2fdcdf983a review 订单 
(cherry picked from commit 0395b8f138)
 2023-07-27 19:32:55 +08:00
YunaiV
d32d3fb2ed 合并 master 代码的冲突 
(cherry picked from commit e1b1c134d9)
 2023-07-27 19:32:36 +08:00
shizhong
419a572e80 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:32:27 +08:00
puhui999
7da1b04ae2 feat：添加秒杀活动管理 
(cherry picked from commit 3d47d6744e)
 2023-07-27 19:27:44 +08:00
xingyu
3d36bc4f56 fix: eslint 
(cherry picked from commit 82c51e0c3e)
 2023-07-27 19:26:41 +08:00
xingyu
1745a61d04 fix: style lint 
(cherry picked from commit d639401646)
 2023-07-27 19:26:28 +08:00
xingyu
cf75e6801c fix: eslint 
(cherry picked from commit f2992ce8e8)
 2023-07-27 19:25:38 +08:00
puhui999
1c01266d62 fix: 使 Table 组件支持列宽和固定列配置 
(cherry picked from commit f3622d423a)
 2023-07-27 19:20:21 +08:00
puhui999
1e0b6e9efc fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 
(cherry picked from commit 5064845d4e)
 2023-07-27 19:19:56 +08:00
shizhong
a35fd3ec62 提交订单列表和详情20230619 2023-07-27 19:17:22 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619 
(cherry picked from commit 42a7aec0b5)
 2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理 
(cherry picked from commit f7b195b226)
 2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理 
(cherry picked from commit a75720ec06)
 2023-07-27 19:14:47 +08:00
YunaiV
b6dff5f976 code review：订单详情 
(cherry picked from commit 91c53e2e3f)
 2023-07-27 19:14:39 +08:00
YunaiV
8bf1f04044 code review：订单列表 
(cherry picked from commit e3f250fff0)
 2023-07-27 19:11:50 +08:00
shizhong
1e8b1c8a1d !165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev 2023-07-27 19:11:40 +08:00
YunaiV
1fad4f626c code review：spu todo 去掉 
(cherry picked from commit ae69492b53)
 2023-07-27 19:09:57 +08:00
YunaiV
d4902558e6 code review：会员积分配置 
(cherry picked from commit 5eaf054646)
 2023-07-27 19:09:38 +08:00
shizhong
7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV
24a4ed134a code review：处理字典数据的冲突 
(cherry picked from commit 8666307d47)
 2023-07-27 19:07:23 +08:00
xiaqing
98c977a732 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
 2023-07-27 19:06:34 +08:00
puhui999
6976c26c37 fix: 完善 SPU 相关路由 review 
(cherry picked from commit d31ade7a5f)
 2023-07-27 19:04:38 +08:00
puhui999
9d8e0d507b fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错 
(cherry picked from commit 20f3f72670)
 2023-07-27 19:02:29 +08:00
puhui999
2d88367e61 fix: review 
(cherry picked from commit b89db1af55)
 2023-07-27 19:02:19 +08:00
shizhong
274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong
45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details 
(cherry picked from commit 985d764f62)
 2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review：优惠劵管理 
(cherry picked from commit 51e76ffd53)
 2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
puhui999
ce62362982 fix: 优化 spu 相关路由配置 
(cherry picked from commit a1b45f80bc)
 2023-07-27 18:50:14 +08:00
YunaiV
79a4aa5189 code review：商品管理 
(cherry picked from commit 158585670c)
 2023-07-27 18:50:01 +08:00
YunaiV
16c518e18a code review：门店自提、快递运费 
(cherry picked from commit 60c1604d49)
 2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交 
(cherry picked from commit 505f5cfa0c)
 2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO 
(cherry picked from commit c5a7d05821)
 2023-07-27 18:42:44 +08:00
puhui999
b28bfc4081 fix: 修复善品测试发现的问题 
(cherry picked from commit 7fb6258bed)
 2023-07-27 18:36:45 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能 
(cherry picked from commit 2ddb605076)
 2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情 
(cherry picked from commit 39c92cb944)
 2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理 
(cherry picked from commit 000aa95012)
 2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 
(cherry picked from commit e555977757)
 2023-07-27 13:09:36 +08:00
shizhong
9af3734b78 逻辑问题 2023-07-11 12:46:39 +08:00
shizhong
c6a9c0c5fb 所有菜单的 name 都加上模块的前缀，避免冲突 2023-07-10 19:11:15 +08:00
周建
3b2d308ccc 补充 2023-06-25 14:06:14 +08:00
周建
7ca76a5304 修复一些命名和拼写错误问题，修复一些BUG 2023-06-25 13:34:27 +08:00
周建
9456a6f31c 命名问题 2023-06-21 13:36:59 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
周建
c545c3008f 工作流bug 2023-06-20 15:51:45 +08:00
周建
73cd6e303d 登录接口返回的过期时间是access token 的过期时间，但是被错误地设置在了refresh token 上，这导致过了几分钟登录状态便失效要求重新登录 2023-06-19 13:08:56 +08:00
周建
4cf5954eaa 应用管理页面新增编辑报错 
支付订单新增时时间选择问题
 2023-06-17 09:41:10 +08:00
shizhong
28507236a7 BUG和多余的文件 2023-06-16 19:31:12 +08:00
shizhong
2489cf00d7 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-16 19:29:36 +08:00
周建
330a44fc98 下面列表 2023-06-16 18:25:58 +08:00
周建
0e15d393a6 代码格式化问题 2023-06-16 16:31:53 +08:00
周建
6ff7a3c9a9 支付订单问题 2023-06-14 14:24:29 +08:00
周建
38ea9cbcda 部分样式bug 2023-06-14 13:58:48 +08:00
shizhong
e60c33e4b4 BUG 2023-06-13 21:53:35 +08:00
shizhong
99774fc622 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-13 21:42:32 +08:00
shizhong
6f266fb967 给所有组件添加name属性预防未知bug!!! 2023-06-13 21:05:25 +08:00
shizhong
1e52823524 BUG 2023-06-13 15:35:13 +08:00
wangding
ea81cbd520 add router search 
(cherry picked from commit 43f3c67434)
 2023-06-13 14:16:02 +08:00
wangding
1e096a47c0 新增路由搜索功能 
(cherry picked from commit 6768cdea05)
 2023-06-13 14:15:49 +08:00
jason
88439669c0 运费模板区域改成多选 
(cherry picked from commit 70c5082776)
 2023-06-13 14:15:44 +08:00
YunaiV
6e7ee28079 review + mall：快递公司管理 
(cherry picked from commit b12aefe46e)
 2023-06-13 14:15:31 +08:00
YunaiV
dfc3da744f review + mall：商品管理 
(cherry picked from commit 349a39e72f)
 2023-06-13 14:15:28 +08:00
shizhong
61396246a5 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 2023-06-13 14:14:42 +08:00
YunaiV
4cd4327bc8 review + mall：商品管理 
(cherry picked from commit 0fba3fd503)
 2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出 
(cherry picked from commit d877bfd26e)
 2023-06-13 14:12:49 +08:00
jason
4850c05614 运费模板表格样式调整 
(cherry picked from commit c296c9e53d)
 2023-06-13 14:12:45 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载 
(cherry picked from commit af2fb4bf5f)
 2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题) 
(cherry picked from commit 4e69f15128)
 2023-06-13 14:10:52 +08:00
puhui999
c254222b5f fix: 优化相关逻辑，修复遗留bug 
(cherry picked from commit 38545e89c6)
 2023-06-13 14:07:33 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 0c42b76a52)
 2023-06-13 14:07:22 +08:00
xingyu
f26c72ced9 fix: echart color 
(cherry picked from commit 9f0065f89f)
 2023-06-13 14:07:09 +08:00
xingyu
484cd403fc fix: echart 
(cherry picked from commit 45ee4116b7)
 2023-06-13 14:06:53 +08:00
jason
4ec3d3fe72 新增快递公司菜单 
(cherry picked from commit b0984c9013)
 2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 4ddba9d454)
 2023-06-13 14:06:16 +08:00
puhui999
d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 
(cherry picked from commit 3c4a39df01)
 2023-06-13 14:06:02 +08:00
puhui999
085dbd6220 fix: 修复 SkuList TODO 优化相关算法 
(cherry picked from commit 9c06832d7e)
 2023-06-13 14:05:57 +08:00
puhui999
73b2809654 fix: 添加商品属性去掉备注 
(cherry picked from commit 6ac8c78d57)
 2023-06-13 14:05:53 +08:00
puhui999
74d926172c fix: 进一步完善商品列表，修复TODO 
(cherry picked from commit 52bfc4dac0)
 2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu，移动相关类型到spu删除对应文件和文件夹 
(cherry picked from commit 50b181318b)
 2023-06-13 14:05:43 +08:00
puhui999
cafd74193f fix: 移动copyValueToTarget方法到utils/index中 
(cherry picked from commit 43e541f944)
 2023-06-13 14:05:38 +08:00
shizhong
82f02cd9f3 !148 【重构】Vue3 管理后台：[基础管理 -> Redis监控] 使用Echart组件实现 2023-06-13 14:05:17 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
Chika
2989372c5c Redis监控用Echart组件整改 
(cherry picked from commit fbac522149)
 2023-06-13 14:00:09 +08:00
Chika
80f1c08951 Redis监控图标使用Echart组件整合 
(cherry picked from commit bf629a9554)
 2023-06-13 13:59:08 +08:00
YunaiV
7a5993c584 code review 商品管理的实现 
(cherry picked from commit e92361ed40)
 2023-06-13 13:56:48 +08:00
dhb52
fc4b46de2e refactor: mp/autoReply 拆分ReplyForm组件 
(cherry picked from commit be49c381f6)
 2023-06-13 13:56:27 +08:00
dhb52
3553b300d4 refactor: mp/wx-msg拆分Msg组件 
(cherry picked from commit 2b84489969)
 2023-06-13 13:56:12 +08:00
YunaiV
cc62e8ec79 code review 微信的实现 
(cherry picked from commit 1c77ba8e04)
 2023-06-13 13:56:08 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口（第一版） 
(cherry picked from commit 0c6e3a39c9)
 2023-06-13 13:56:04 +08:00
puhui999
263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 
(cherry picked from commit 9ee35fc165)
 2023-06-13 13:55:51 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 1116fb278b)
 2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 6478d295df)
 2023-06-13 13:55:44 +08:00
puhui999
cb45ea0753 商品管理: 完成商品属性批量添加 
(cherry picked from commit 64f6f67ddd)
 2023-06-13 13:55:20 +08:00
puhui999
d37540de1d 商品管理: 完成商品属性排列组合算法生成对应表数据 
(cherry picked from commit ab1120b0ff)
 2023-06-13 13:55:17 +08:00
puhui999
84ed1f7df3 商品管理: 保存属性值到数据库 
(cherry picked from commit 35c3545e7c)
 2023-06-13 13:55:13 +08:00
puhui999
4bb39f2578 商品管理: fix:根据商品属性动态生成表格值 
(cherry picked from commit 538d1e0b6c)
 2023-06-13 13:54:58 +08:00
puhui999
7368bd8c2a 商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug 
(cherry picked from commit 7a64eb5198)
 2023-06-13 13:54:51 +08:00
puhui999
1a2d7a2f0e 商品管理: 初步完成相关组件 
(cherry picked from commit 61218ae711)
 2023-06-13 13:54:08 +08:00
puhui999
7a1a4e82d0 商品管理: 完善选择商品分类 
(cherry picked from commit ab1685a741)
 2023-06-13 13:53:11 +08:00
puhui999
083a0c4760 商品管理: 完善表单校验，优化信息提示，完成新建、编辑、提交逻辑 
(cherry picked from commit c38abc365c)
 2023-06-13 13:52:42 +08:00
YunaiV
6e604f9e07 调整商品分类的实现 
(cherry picked from commit 9680a204ca)
 2023-06-13 13:50:37 +08:00
AhJindeg
464fe953ad 🐞 fix(styles/index): Update .el-scrollbar__bar style 
- 解决表格内容超过表格总宽度后，横向滚动条前端顶不到表格边缘的问题

(cherry picked from commit ace8f9e302)
 2023-06-13 13:49:19 +08:00
puhui999
3c220cdb63 商品管理初始界面结构设计 
(cherry picked from commit a0014bed65)
 2023-06-13 13:48:52 +08:00
AhJindeg
ab531a8ec5 🌈 style(Form/src): Modifying word spelling errors 
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写

(cherry picked from commit 9dc361e708)
 2023-06-13 13:44:57 +08:00
dhb52
09c5f2e22f refactor: mp/wx-msg 采用ref来实现滚动 
(cherry picked from commit cb4527748e)
 2023-06-13 13:44:33 +08:00
dhb52
a737b267a8 refactor: mp模块统一accountId未初始化值为-1，删除QueryParams定义 
(cherry picked from commit 198752868c)
 2023-06-13 13:44:29 +08:00
YunaiV
64d4583805 登录界面，增加“萌新必读” 
(cherry picked from commit c14b5c5bff)
 2023-06-13 13:44:17 +08:00
dhb52
817ccc7511 fix: mp模块的一些小修复 
(cherry picked from commit 036c9b3366)
 2023-06-13 13:43:48 +08:00
dhb52
c85b99090d refactor: mp/wx-msg 拆分组件 
(cherry picked from commit f848f3ba91)
 2023-06-13 13:43:39 +08:00
dhb52
ac7202ec61 fix: mp/menu菜单拖动后激活菜单 
(cherry picked from commit 917b9d180a)
 2023-06-13 13:43:26 +08:00
shizhong
67f6db22c2 菜单管理：添加刷新菜单缓存按钮 2023-06-13 13:43:12 +08:00
dhb52
4601bd3428 perf: mp/menu使用vuedraggable替换拖动的原生实现 
(cherry picked from commit ebacbbb9cf)
 2023-06-13 13:42:04 +08:00
dhb52
88167a437e style: mp/WxReply objCache => tabCache 
(cherry picked from commit 08eb72e568)
 2023-06-13 13:41:58 +08:00
dhb52
0deb965db3 feat: mp/menu 拖动排序 
(cherry picked from commit d99f9e98fb)
 2023-06-13 13:41:53 +08:00
dhb52
94ab90d8ab style: mp模块stylelint 
(cherry picked from commit 4925a66cc5)
 2023-06-13 13:41:49 +08:00
dhb52
132e044c48 refactor: mp模块，一个大大的重构+fix 
(cherry picked from commit b45b85984c)
 2023-06-13 13:41:43 +08:00
shizhong
e3dce4ae2e 菜单管理：添加刷新菜单缓存按钮，提高易用性 2023-06-13 13:41:16 +08:00
YunaiV
ddefa8c2d3 讲 2023 重构剩余的任务，转成 TODO 到代码 
(cherry picked from commit bcf8cccf8b)
 2023-06-13 13:25:10 +08:00
YunaiV
16b4c71a77 REVIEW 公众号的草稿管理 
(cherry picked from commit 5c58bc4e0c)
 2023-06-13 13:24:55 +08:00
YunaiV
22278b7d2a REVIEW 公众号的消息回复弹窗 
(cherry picked from commit 7997614a3c)
 2023-06-13 13:24:49 +08:00
YunaiV
29f68781e5 REVIEW 公众号的自动回复菜单 
(cherry picked from commit 48e50190e0)
 2023-06-13 13:24:15 +08:00
shizhong
cbaa6bc355 流程表单：使用异步组件的方式动态加载业务表单指定的查看表单的组件，直接显示到审批页面，不再需要点击查看 2023-06-13 13:24:02 +08:00
dhb52
ddf8e7be2e refactor: mp/WxReply重构，拆分组件 
(cherry picked from commit f8a86cbc24)
 2023-06-13 13:21:07 +08:00
puhui999
2de3bad542 修复用户分组新增保存时提示描述不能为空的bug 
(cherry picked from commit 7a0202e26d)
 2023-06-13 13:20:21 +08:00
dhb52
a4172c3643 refactor: 使用useUpload 
(cherry picked from commit cddf1ee878)
 2023-06-13 13:16:52 +08:00
dhb52
4f04c9baeb refactor: 重构MP/autoReply, 拆分组件 
(cherry picked from commit 0beda6ecc3)
 2023-06-13 13:16:46 +08:00
dhb52
6a92ec1c76 refactor: MP/wx-reply组件，抽离useUpload钩子 
(cherry picked from commit 39d8ecbfc7)
 2023-06-13 13:16:38 +08:00
dhb52
0bf4dc7a81 refactor: mp/menu 拆分组件 
(cherry picked from commit c27be373d0)
 2023-06-13 13:16:29 +08:00
dhb52
732f65e22c fix: Mp/WxAccountSelect name字段更新 
(cherry picked from commit 82dc0054f2)
 2023-06-13 13:16:19 +08:00
dhb52
ec834f2893 refactor: 事件函数命名：onXxx 
(cherry picked from commit 84dcac77b1)
 2023-06-13 13:15:34 +08:00
dhb52
90990f48a9 refactor: mp/draft拆分组件 
(cherry picked from commit b5fb700e4e)
 2023-06-13 13:15:27 +08:00
shizhong
9c6408b7a9 将 FcDesigner 改成局部注册，减少包大小 2023-06-13 13:14:20 +08:00
YunaiV
2f16744652 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册 
(cherry picked from commit d32537e3ef)
 2023-06-13 13:04:05 +08:00
YunaiV
d73118f386 将 highlight 代码高亮的全局引入，改成局部引入 
(cherry picked from commit 30685bee75)
 2023-06-13 13:03:23 +08:00
YunaiV
f9c2850d6b 将 BPMNJS 全局引入，改成局部引入 2023-06-13 13:02:14 +08:00
dhb52
8542bd8025 fix: 增加上传处理 
(cherry picked from commit ae74af59fc)
 2023-06-13 12:54:20 +08:00
YunaiV
1ad73b0625 REVIEW 素材管理的重构 
(cherry picked from commit abf9b50c2f)
 2023-06-13 12:54:10 +08:00
shizhong
6bbeeba455 优化 OA 请假，create 和 detail 使用独立路由，可接入工作流 2023-06-13 12:53:51 +08:00
dhb52
4d6369a514 refactor: MP消息管理-拆分组件 
(cherry picked from commit 389c73d834)
 2023-06-13 12:52:37 +08:00
puhui999
76be4d747e 修复差异 
(cherry picked from commit 5910d53d8f)
 2023-06-13 12:52:26 +08:00
shizhong
5466e93d3a 移除 css 的引入 2023-06-13 12:51:11 +08:00
YunaiV
c7172e9295 调整下排版 
(cherry picked from commit f1f49fdf29)
 2023-06-13 12:48:46 +08:00
YunaiV
01691827fc 1. 重命名 DataGrid 为 MessageTable，增加可读性 
2. 调整素材管理，读取 API 接口

(cherry picked from commit 48c7b58b03)
 2023-06-13 12:48:41 +08:00
YunaiV
f0ad6b706e ep-admin: fix: 修复已知问题 
0a6f3066 kailong321200875 <321200875@qq.com> on 2023/4/12 at 10:20 AM

(cherry picked from commit 1170a9480f)
 2023-06-13 12:48:15 +08:00
YunaiV
7c8794fc53 ep-admin: fix: 修复表格与搜索框字段不能不一致的问题 
(cherry picked from commit 9fba2886ab)
 2023-06-13 12:47:43 +08:00
puhui999
810482a6e0 修正绑定第三方跳转扫码登录错误 
(cherry picked from commit d62e607292)
 2023-06-13 12:45:22 +08:00
dhb52
dbb1a6fc98 refactor: 尝试拆分【消息管理】页面 
(cherry picked from commit c4746fc804)
 2023-06-13 12:41:49 +08:00
shizhong
1c7ab8da73 fix: type='text' => type='primary' link 2023-06-13 12:41:41 +08:00
dhb52
91649a74e7 fix: WxMpSelect => WxAccountSelect 
(cherry picked from commit 4f3e7ecaac)
 2023-06-13 12:40:23 +08:00
dhb52
c01cd5b66c fix: 删除自动生成的auto-*.d.ts 
(cherry picked from commit bb49c6bbda)
 2023-06-13 12:40:13 +08:00
dhb52
9ce836dc3d refactor: 删除WxAccountSelect 
(cherry picked from commit dc32b9242d)
 2023-06-13 12:39:41 +08:00
dhb52
6eb9588e4a fix: 使用ElDialog:destroy-on-close属性解决对话框重新加载 
(cherry picked from commit 92da7e341b)
 2023-06-13 12:39:35 +08:00
dhb52
2a242c770f refactor: 使用Editor组件替换WxEditor 
(cherry picked from commit 813e7d2776)
 2023-06-13 12:39:29 +08:00
YunaiV
df41b6860e REVIEW 公众号的实现 
(cherry picked from commit 1a1bfe0ebb)
 2023-06-13 12:37:37 +08:00
YunaiV
0da3c00dea 修复 IconSelect 报错 
(cherry picked from commit f436490165)
 2023-06-13 12:36:43 +08:00
shizhong
520292c902 Merge pull request #2 from koutianyu/dev 2023-06-13 12:36:01 +08:00
shizhong
76472bcd8e 代码生成，支持设置前端的模版 2023-06-13 12:34:01 +08:00
dhb52
af546a04e3 refactor: MP消息管理 ts重构 
(cherry picked from commit 3536077a34)
 2023-06-13 12:27:16 +08:00
shizhong
a543ae0a4e fix: import type { FormInstance ...} from 'element-plus' 2023-06-13 12:26:54 +08:00
dhb52
3b44b42da8 fix: 去除WxLocation组件多余Location图标 
(cherry picked from commit fbbf4131f6)
 2023-06-13 12:26:30 +08:00
shizhong
bdcaf12091 refactor: mp模块ts重构 2023-06-13 12:26:16 +08:00
YunaiV
02b5447e12 REVIEW 公众号选择的下拉框 
(cherry picked from commit fd447dc7a3)
 2023-06-13 12:24:19 +08:00
shizhong
9b00e33ddb REVIEW 支付应用、支付订单 2023-06-13 12:22:27 +08:00
dhb52
bfec37fdf1 refactor: 【MP素材管理】使用【WxMpSelect】 
(cherry picked from commit 1397767492)
 2023-06-13 12:18:36 +08:00
dhb52
010fe5f43c refactor: 抽离WxMpSelect组件 
(cherry picked from commit c7b296a8e5)
 2023-06-13 12:18:26 +08:00
dhb52
9500ceab05 refactor: 【MP粉丝管理】应用【公众号选择器】组件 
(cherry picked from commit 053ee54a16)
 2023-06-13 12:13:52 +08:00
dhb52
8df788b537 refactor:【自动回复、图文】应用【公众号选择器】组件 
(cherry picked from commit af18201ceb)
 2023-06-13 12:13:46 +08:00
dhb52
eae9242a91 fix: 【MP自定义菜单】accountChanged参数错误 
(cherry picked from commit 7711ceb3f3)
 2023-06-13 12:12:16 +08:00
dhb52
1948bc9971 refactor: 【MP自定义菜单】应用【公众号选择器】组件 
(cherry picked from commit 098b7305c9)
 2023-06-13 12:12:11 +08:00
dhb52
f789af4582 refactor: WxMaterialSelect组件setup 
(cherry picked from commit a8b4c16a7e)
 2023-06-13 12:12:07 +08:00
dhb52
6b33f8c74f refactor: 【草稿，素材】应用【公众号选择器】组件 
(cherry picked from commit e035eb2618)
 2023-06-13 12:12:02 +08:00
dhb52
e480b68c08 refactor: 抽离组件【公众号下拉选择】 
(cherry picked from commit c33e4de5a8)
 2023-06-13 12:11:56 +08:00
shizhong
2afd089f51 REVIEW OA 请假 2023-06-13 12:11:43 +08:00
shizhong
c33a40623c REVIEW OA 请假 2023-06-13 12:11:09 +08:00
shizhong
ae48c07bbb REVIEW 公众号的自动回复 2023-06-13 12:09:57 +08:00
dhb52
910549f9ee fix: 删除未引入的formatDate 
(cherry picked from commit a692674b24)
 2023-06-13 12:09:34 +08:00
dhb52
6cd59a3440 fix: Merge后的修复 
(cherry picked from commit 99166ee664)
 2023-06-13 12:09:26 +08:00