shizhong
|
3e936f3959
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-ui-admin/yarn.lock
|
2022-09-16 11:05:25 +08:00 |
|
芋道源码
|
7643ed5a4b
|
!264 定时任务-调度日志-详细里面”执行时长“显示异常问题
Merge pull request !264 from Vmo/master
|
2022-09-10 13:48:02 +00:00 |
|
idevmo
|
378067fce7
|
定时任务-调度日志-详细里面”执行时长“显示异常的问题
|
2022-09-09 10:16:44 +08:00 |
|
YunaiV
|
9632c33d27
|
mall：优化商品的分类、品牌的代码
|
2022-09-05 20:03:13 +08:00 |
|
YunaiV
|
1bd1c79ff3
|
mall：code review 商品模块的代码
|
2022-09-05 00:14:17 +08:00 |
|
YunaiV
|
37e948cc1b
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-09-04 23:15:36 +08:00 |
|
wuxiran
|
02aede0417
|
1、修改coupon的页面、以及增加coupon的enum
|
2022-09-04 22:52:28 +08:00 |
|
YunaiV
|
833fd33844
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/optional/mall/mall.sql
|
2022-09-04 21:06:28 +08:00 |
|
芋道源码
|
dd6dc2ac3d
|
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
|
2022-09-04 09:45:54 +00:00 |
|
YunaiV
|
1a48301cee
|
vue2 验证码，增加开关、修复对社交登录的支持
|
2022-09-04 12:18:12 +08:00 |
|
芋道源码
|
d918b14e90
|
!260 增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容
Merge pull request !260 from FinalFinancialFreedom/N/A
|
2022-09-03 02:25:58 +00:00 |
|
luowenfeng
|
ab6fd30551
|
feature(uniapp商品): 商品功能完善
|
2022-09-01 15:28:05 +08:00 |
|
luowenfeng
|
198b1189e8
|
feature(uniapp商品): 商品修改
|
2022-09-01 11:00:40 +08:00 |
|
shizhong
|
44e2a710fc
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2022-09-01 09:49:09 +08:00 |
|
luowenfeng
|
4207b2b61d
|
feature(uniapp商品): 商品加载
|
2022-08-31 18:52:26 +08:00 |
|
FinalFinancialFreedom
|
4c8b0ef430
|
增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容
Signed-off-by: FinalFinancialFreedom <li.acerphoenix@gmail.com>
|
2022-08-29 08:43:12 +00:00 |
|
wangjun
|
e25b73b7d9
|
修复不退出模拟直接保存模型，后续分配规则报错
|
2022-08-26 09:33:53 +08:00 |
|
luowenfeng
|
edfe379848
|
feature(uniapp商品): 多规格新增
|
2022-08-23 21:06:59 +08:00 |
|
luowenfeng
|
8ad1439fda
|
feature(uniapp商品): 新增商品
|
2022-08-23 20:27:39 +08:00 |
|
YunaiV
|
185ea9e861
|
发布 1.6.4 版本：新增 uniapp 管理后台、数据报表设计器
|
2022-08-23 08:41:20 +08:00 |
|
luowenfeng
|
8de29d302c
|
feature(uniapp商品): 新增商品数据
|
2022-08-22 21:20:49 +08:00 |
|
luowenfeng
|
617573a59b
|
feature(uniapp分类): 商品创建功能以及查询功能正常使用
|
2022-08-22 20:43:12 +08:00 |
|
xingyu
|
020535ab3a
|
Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
|
2022-08-22 00:57:43 +00:00 |
|
芋道源码
|
b5d458f1c4
|
!143 decodeFields 增加表单初始化能力, 完美支持子级元素
Merge pull request !143 from ziv/master
|
2022-08-19 12:20:20 +00:00 |
|
CorrectRoadH
|
c691c440bd
|
解决没有isObjectObject这个函数的问题
|
2022-08-19 15:00:54 +08:00 |
|
CorrectRoadH
|
b604cbedb9
|
拿不到数据的问题
|
2022-08-19 14:58:18 +08:00 |
|
luowenfeng
|
de27f4c2db
|
Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
|
2022-08-18 22:39:48 +08:00 |
|
luowenfeng
|
07e5e1b59f
|
feature(管理后台): 商品弹窗
|
2022-08-18 22:38:51 +08:00 |
|
ycak47
|
74f12e0b9f
|
优化el-dialog
1.设置默认点击背景不关闭dialog（这个很容易误操作，体验较差）
2.el-dialog内容较多时，滚动条限定在内部而不撑开父页面的滚动条
3.代码生成的el-dialog默认添加 v-dialogDrag属性（可拖拽移动）
|
2022-08-16 17:07:07 +08:00 |
|
wuxiran
|
d505b64b8f
|
mall:还原
|
2022-08-16 00:38:22 +08:00 |
|
wuxiran
|
c8ec5c8952
|
mall:上传enum类，做后端模板添加判定、前端页面添加
|
2022-08-16 00:26:44 +08:00 |
|
shizhong
|
17206e1df5
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2022-08-08 10:37:06 +08:00 |
|
xingyu4j
|
066f0cf652
|
压缩图片尺寸
|
2022-08-07 21:50:17 +08:00 |
|
luowenfeng
|
10caa6e824
|
fix(管理后台菜单): 控制台异常
|
2022-08-06 11:15:28 +08:00 |
|
luowenfeng
|
55bc9b0616
|
feature(uniapp商品): 全局函数
|
2022-08-03 15:55:32 +08:00 |
|
xingyu
|
da0ab98fae
|
revert
|
2022-08-03 13:38:02 +08:00 |
|
xingyu
|
e477179cd5
|
refactor: store action name
|
2022-08-03 13:38:02 +08:00 |
|
xingyu
|
9ca4b49b17
|
vue2 增加 AJ-Captcha 二次验证
|
2022-08-03 13:38:02 +08:00 |
|
xingyu
|
b78378ce44
|
AJ-Captcha vue2 增加验证码二次校验
|
2022-08-03 13:38:02 +08:00 |
|
xingyu
|
02224ad6b5
|
vue2 端口
|
2022-08-03 13:38:02 +08:00 |
|
xingyu
|
4a92081937
|
vue2 新增行为验证码
|
2022-08-03 13:38:01 +08:00 |
|
YunaiV
|
bf5df656ed
|
初始化管理后台的 uniapp 版本
|
2022-08-03 11:52:35 +08:00 |
|
xingyu
|
93a97cd526
|
perf: 优化表单校验和查询参数
|
2022-08-02 10:19:02 +08:00 |
|
YunaiV
|
fa9823161e
|
mall：完善商品品牌的前后端实现
|
2022-07-30 22:15:03 +08:00 |
|
YunaiV
|
efd4942129
|
mall：完善商品分类的 APP 后端接口
|
2022-07-30 21:24:05 +08:00 |
|
YunaiV
|
969c387764
|
mall：完善商品分类的管理后台界面
|
2022-07-30 20:28:01 +08:00 |
|
YunaiV
|
1976571ae8
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
# Conflicts:
# yudao-ui-admin/src/views/mall/product/spu/index.vue
|
2022-07-29 23:44:54 +08:00 |
|
YunaiV
|
2866b58741
|
1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度
2. 完整移除 activiti 遗留的东东
|
2022-07-29 22:51:52 +08:00 |
|
YunaiV
|
b05366511b
|
增加数据报表 vue
|
2022-07-29 21:11:33 +08:00 |
|
芋道源码
|
35413b52c9
|
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
|
2022-07-29 04:51:54 +00:00 |
|