Commit Graph

728 Commits

Author SHA1 Message Date
芋道源码
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
puhui999
43e541f944 fix: 移动copyValueToTarget方法到utils/index中 2023-05-16 10:12:10 +08:00
YunaiV
16561b1238 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	build/vite/optimize.ts
2023-05-15 22:58:36 +08:00
YunaiV
3feb4828cd !148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现 2023-05-15 22:57:31 +08:00
芋道源码
ab7032f1ca
!148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现
Merge pull request !148 from Chika/dev
2023-05-15 14:51:53 +00:00
芋道源码
c47cc18b24
!147 refactor: mp/autoReply 拆分ReplyForm组件
Merge pull request !147 from dhb52/dev
2023-05-15 14:49:49 +00:00
cxr01
a788921d51 修复后台”在线用户强退“功能 2023-05-14 13:46:09 +08:00
Chika
fbac522149 Redis监控用Echart组件整改 2023-05-12 16:10:14 +08:00
Chika
8456c671e8 Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev 2023-05-12 15:50:45 +08:00
Chika
bf629a9554 Redis监控图标使用Echart组件整合 2023-05-12 15:30:01 +08:00
YunaiV
e92361ed40 code review 商品管理的实现 2023-05-06 22:54:41 +08:00
dhb52
be49c381f6 refactor: mp/autoReply 拆分ReplyForm组件 2023-05-05 23:04:47 +08:00
芋道源码
4a965b8c14
!141 商品管理: 打通所有接口(第一版)
Merge pull request !141 from puhui999/dev-to-dev
2023-05-05 11:03:28 +00:00
dhb52
2b84489969 refactor: mp/wx-msg拆分Msg组件 2023-05-04 22:45:12 +08:00
YunaiV
1c77ba8e04 code review 微信的实现 2023-05-04 21:00:49 +08:00
puhui999
0c6e3a39c9 商品管理: 打通所有接口(第一版) 2023-05-04 01:38:53 +08:00
puhui999
9ee35fc165 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 2023-05-03 02:28:35 +08:00
puhui999
1116fb278b 商品管理: 调整相关组件优化逻辑 2023-05-02 02:20:58 +08:00
puhui999
6478d295df 商品管理: 调整相关组件优化逻辑 2023-05-01 19:01:24 +08:00
puhui999
64f6f67ddd 商品管理: 完成商品属性批量添加 2023-04-30 17:28:16 +08:00
puhui999
ab1120b0ff 商品管理: 完成商品属性排列组合算法生成对应表数据 2023-04-30 17:06:30 +08:00
puhui999
35c3545e7c 商品管理: 保存属性值到数据库 2023-04-30 17:04:31 +08:00
puhui999
538d1e0b6c 商品管理: fix:根据商品属性动态生成表格值 2023-04-30 02:26:35 +08:00
puhui999
7a64eb5198 商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug 2023-04-29 23:10:18 +08:00
puhui999
61218ae711 商品管理: 初步完成相关组件 2023-04-29 21:39:25 +08:00
咱哥丶
d3b5535df9 修复【站内信】测试模板消息发送,接口调用错误问题 2023-04-29 16:44:58 +08:00
puhui999
ab1685a741 商品管理: 完善选择商品分类 2023-04-26 17:53:17 +08:00
puhui999
5c52c17227 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-04-26 17:21:46 +08:00
puhui999
c38abc365c 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑 2023-04-26 17:17:39 +08:00
芋道源码
0ceddc9c91
!137 MP模块重构,功能增强
Merge pull request !137 from dhb52/dev
2023-04-25 13:38:22 +00:00
YunaiV
9680a204ca 调整商品分类的实现 2023-04-25 21:02:35 +08:00
puhui999
a0014bed65 商品管理初始界面结构设计 2023-04-24 11:42:44 +08:00
xingyu
fc366f18c8 fix: type warn 2023-04-23 19:35:14 +08:00
xingyu
148602556a fix: type error 2023-04-23 19:00:25 +08:00
dhb52
88f4502715 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-22 23:46:32 +08:00
dhb52
cb4527748e refactor: mp/wx-msg 采用ref来实现滚动 2023-04-22 23:45:14 +08:00
dhb52
198752868c refactor: mp模块统一accountId未初始化值为-1,删除QueryParams定义 2023-04-22 23:43:35 +08:00
YunaiV
c14b5c5bff 登录界面,增加“萌新必读” 2023-04-22 21:21:45 +08:00
dhb52
036c9b3366 fix: mp模块的一些小修复 2023-04-22 20:52:11 +08:00
芋道源码
4cf734d244
!135 MP模块重构,功能增强
Merge pull request !135 from dhb52/dev
2023-04-22 12:51:56 +00:00
dhb52
f848f3ba91 refactor: mp/wx-msg 拆分组件 2023-04-22 20:51:25 +08:00
dhb52
917b9d180a fix: mp/menu菜单拖动后激活菜单 2023-04-22 20:45:03 +08:00
YunaiV
f27b93db59 菜单管理:添加刷新菜单缓存按钮 2023-04-22 20:44:32 +08:00
dhb52
ebacbbb9cf perf: mp/menu使用vuedraggable替换拖动的原生实现 2023-04-22 09:04:21 +08:00
dhb52
08eb72e568 style: mp/WxReply objCache => tabCache 2023-04-22 01:23:52 +08:00
dhb52
d99f9e98fb feat: mp/menu 拖动排序 2023-04-21 23:35:31 +08:00
dhb52
4925a66cc5 style: mp模块stylelint 2023-04-21 23:19:04 +08:00
dhb52
b45b85984c refactor: mp模块,一个大大的重构+fix 2023-04-21 20:22:11 +08:00
puhui999
ab52f8b18f 菜单管理:添加刷新菜单缓存按钮,提高易用性 2023-04-20 14:17:21 +08:00
YunaiV
75c4d6608c 修复角色管理数据权限回显问题 2023-04-19 20:16:36 +08:00
YunaiV
730e287d86 优化“流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件”的命名 2023-04-19 20:04:06 +08:00
芋道源码
d87c02b232
!130 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看
Merge pull request !130 from puhui999/dev-to-dev
2023-04-19 11:44:47 +00:00
YunaiV
bcf8cccf8b 讲 2023 重构剩余的任务,转成 TODO 到代码 2023-04-19 19:38:41 +08:00
YunaiV
5c58bc4e0c REVIEW 公众号的草稿管理 2023-04-19 19:28:04 +08:00
YunaiV
7997614a3c REVIEW 公众号的消息回复弹窗 2023-04-19 19:16:14 +08:00
YunaiV
48e50190e0 REVIEW 公众号的自动回复菜单 2023-04-19 19:07:45 +08:00
芋道源码
90b0af2e5d
!129 refactor:mp模块拆分组件
Merge pull request !129 from dhb52/dev
2023-04-19 10:48:20 +00:00
puhui999
f74067023d 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看 2023-04-19 17:47:26 +08:00
puhui999
604b8867ce 修复流程表单:表单保存后返回列表页面且重新加载列表数据 2023-04-19 11:35:37 +08:00
puhui999
3d579b3a99 修复流程表单:新建的时候id传的是event需要排除 2023-04-19 11:21:42 +08:00
dhb52
f8a86cbc24 refactor: mp/WxReply重构,拆分组件 2023-04-19 11:07:51 +08:00
puhui999
7a0202e26d 修复用户分组新增保存时提示描述不能为空的bug 2023-04-19 11:01:21 +08:00
dhb52
cddf1ee878 refactor: 使用useUpload 2023-04-18 11:19:54 +08:00
dhb52
0beda6ecc3 refactor: 重构MP/autoReply, 拆分组件 2023-04-18 11:19:13 +08:00
dhb52
39d8ecbfc7 refactor: MP/wx-reply组件,抽离useUpload钩子 2023-04-18 11:18:37 +08:00
dhb52
c27be373d0 refactor: mp/menu 拆分组件 2023-04-17 23:58:58 +08:00
dhb52
82dc0054f2 fix: Mp/WxAccountSelect name字段更新 2023-04-17 16:21:41 +08:00
AhJindeg
5164036b4e 🐞 fix(system): Update system module bug
- 修改用户管理查询入参
- 修改站内信模板删除api调用
2023-04-17 14:55:13 +08:00
puhui999
8a1a770e8b 修复代码生成导入表后列表不刷新的问题 2023-04-17 10:41:16 +08:00
dhb52
84dcac77b1 refactor: 事件函数命名:onXxx 2023-04-16 22:32:59 +08:00
dhb52
b5fb700e4e refactor: mp/draft拆分组件 2023-04-16 22:30:00 +08:00
dhb52
30b8eeaccb Merge remote-tracking branch 'yudao/dev' into dev 2023-04-16 22:09:48 +08:00
YunaiV
f3869aa961 将 FcDesigner 改成局部注册,减少包大小 2023-04-15 22:46:45 +08:00
YunaiV
30685bee75 将 highlight 代码高亮的全局引入,改成局部引入 2023-04-15 21:36:16 +08:00
YunaiV
d5b569eefa 将 BPMNJS 全局引入,改成局部引入 2023-04-15 18:52:35 +08:00
YunaiV
06974ca3c0 修复打包会报错的问题 2023-04-15 17:28:33 +08:00
YunaiV
e3660e0b20 REVIEW 站内信模版的发送 2023-04-15 17:07:41 +08:00
dhb52
ae74af59fc fix: 增加上传处理 2023-04-15 16:54:36 +08:00
芋道源码
97f9560c4d
!124 重构VUE3【站内信-模板管理】
Merge pull request !124 from ZanGe丶/dev
2023-04-15 08:46:56 +00:00
YunaiV
abf9b50c2f REVIEW 素材管理的重构 2023-04-15 16:37:11 +08:00
芋道源码
71fd9af2e1
!126 refactor: MP模块组件拆分
Merge pull request !126 from dhb52/dev
2023-04-15 08:20:48 +00:00
YunaiV
f59e4a4622 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/bpm/oa/leave/create.vue
	src/views/bpm/oa/leave/detail.vue
2023-04-15 16:06:17 +08:00
YunaiV
4dabb710c5 优化 OA 请假,create 和 detail 使用独立路由,可接入工作流 2023-04-15 16:03:12 +08:00
dhb52
389c73d834 refactor: MP消息管理-拆分组件 2023-04-15 15:59:33 +08:00
puhui999
ec58321dd8 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
2023-04-15 13:38:31 +08:00
咱哥丶
776eb3a7b0 重构VUE3【站内信-模板管理】 2023-04-15 12:25:11 +08:00
YunaiV
de5b1216cd 修复字典数据和类型的 status 未校验的问题 2023-04-15 10:28:23 +08:00
YunaiV
168f751a24 修复 Vue3 管理后台新增租户时,未校验账号、密码是否为空 2023-04-15 09:19:37 +08:00
YunaiV
f1f49fdf29 调整下排版 2023-04-15 08:50:50 +08:00
YunaiV
48c7b58b03 1. 重命名 DataGrid 为 MessageTable,增加可读性
2. 调整素材管理,读取 API 接口
2023-04-15 08:42:52 +08:00
puhui999
7564c43f16 改editor为editor_一点小问题 2023-04-14 22:06:27 +08:00
puhui999
02d98f2ce7 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue
2023-04-14 21:58:49 +08:00
puhui999
d62e607292 修正绑定第三方跳转扫码登录错误 2023-04-14 21:47:58 +08:00
puhui999
2bef7f707c 修改没必要的lang="tsx" 2023-04-14 21:46:34 +08:00
puhui999
b93491579c 给所有组件添加name属性预防未知bug!!! 2023-04-14 21:32:11 +08:00
dhb52
c4746fc804 refactor: 尝试拆分【消息管理】页面 2023-04-14 18:06:16 +08:00
dhb52
0b055b5db4 fix: type='text' => type='primary' link 2023-04-14 15:26:06 +08:00
dhb52
4f3e7ecaac fix: WxMpSelect => WxAccountSelect 2023-04-14 15:22:23 +08:00
dhb52
dc32b9242d refactor: 删除WxAccountSelect 2023-04-14 15:15:01 +08:00
dhb52
92da7e341b fix: 使用ElDialog:destroy-on-close属性解决对话框重新加载 2023-04-14 15:08:58 +08:00
dhb52
813e7d2776 refactor: 使用Editor组件替换WxEditor 2023-04-14 14:49:19 +08:00