507 Commits (7ba6a2e385538eb4008dcdf2df40da0a06a6ef92)

Author SHA1 Message Date
xingyu4j 18e11a56b5 回退sass版本 3 years ago
xingyu4j 0f40947721 升级部分依赖 3 years ago
xingyu4j 011dc23699 替换var 为const/let
删除未使用import
替换 == 为 ===
3 years ago
xingyu4j c9e11e7636 fix slot-scope 3 years ago
xingyu4j d730c50dee 修复代码警告 3 years ago
xingyu4j fd30368628 update vue 2.7.0 3 years ago
xingyu4j 3fa8e69af0 update element-ui 2.15.10 3 years ago
LAPTOP-CNV4CMCJ\cheng fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng ea5e6b2c0e 新增了订单详情 3 years ago
YunaiV 941782fb10 promotion:完善限时折扣的修改逻辑 3 years ago
YunaiV 6d48bd1ed8 promotion:完善限时折扣的添加逻辑 3 years ago
YunaiV d4b7f4aaa0 promotion:增加限时折扣的基础代码 3 years ago
YunaiV 00f90e75d9 promotion:增加满减送活动的关闭功能 3 years ago
YunaiV 74b6ff1eef promotion:增加满减送活动的前端 50% 3 years ago
YunaiV 873b530652 promotion:增加优惠劵的回收操作 3 years ago
YunaiV 47c2dfa623 promotion:增加优惠劵的前端分页界面 100% 3 years ago
YunaiV 86b6b85934 promotion:增加优惠劵的前端分页界面 80% 3 years ago
YunaiV 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 3 years ago
YunaiV e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 3 years ago
YunaiV bd661296c0 promotion:完善优惠劵模板的功能 3 years ago
LAPTOP-CNV4CMCJ\cheng 63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng 89fefc5f81 处理了商品订单的TODO 3 years ago
YunaiV 2aaeb7af88 promotion:实现部分优惠劵模板的前端表单 80% 3 years ago
YunaiV dc51a93533 promotion:实现部分优惠劵模板的前端列表 3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
YunaiV 035c2cf28c promotion:完善 优惠劵模板 表~ 3 years ago
YunaiV cca27636b7 code review 订单列表.vue 界面 3 years ago
LAPTOP-CNV4CMCJ\cheng e035e66ffd Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
LAPTOP-CNV4CMCJ\cheng dcb3f1c8f0 新增订单管理页面 3 years ago
luowenfeng 7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV e1d5cfe8fe 微调 trade 交易表的设计 3 years ago
luowenfeng 20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 3 years ago
YunaiV 356642ecea review 商品的 save 界面 3 years ago
luowenfeng d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
3 years ago
YunaiV 7bf37fcb64 优化管理后台的商品分页的查询 3 years ago
YunaiV c00ded3ed3 优化商品的 index 界面 3 years ago
luowenfeng dc4e3fcd6e feature(商城): 商城review改 3 years ago
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
3 years ago
YunaiV 3cee922e69 优化 permission 相关的注释 3 years ago
YunaiV a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 3 years ago
luowenfeng 31f5b27d01 feature(uniapp分类): review 3 years ago
huzhibo 66cef17fa1
调整前端配置管理中参数分类显示
Signed-off-by: huzhibo <527188553@qq.com>
3 years ago
YunaiV 6b79788b5a 完善 oauth2.0 的注释 4 years ago
YunaiV 585d2a523b 修复登录的 redirect 地址,存在参数时,登录成功回跳的时候地址不正确的问题 4 years ago
YunaiV ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 4 years ago
zhijiantianya@gmail.com c25791047f mall: 商品的代码 review 4 years ago
YunaiV 2b784d180e 调整 sso 界面,移除多租户的选择 4 years ago
YunaiV d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
luowenfeng c7a2ed4a0b feature(管理后台): 商品管理 4 years ago
luowenfeng 77a676ee07 feature(管理后台): 商品列表 4 years ago
luowenfeng fdb2d7339f feature(管理后台): 商品列表 4 years ago
luowenfeng f122c0c509 feature(管理后台): 商品添加视频 4 years ago
luowenfeng e2cd336a22 feature(管理后台): 规格值添加 4 years ago
luowenfeng e1e55dc841 feature(商品添加): 规格调整连带商品调整 4 years ago
芋道源码 7643ed5a4b
!264 定时任务-调度日志-详细里面”执行时长“显示异常问题
Merge pull request !264 from Vmo/master
4 years ago
idevmo 378067fce7 定时任务-调度日志-详细里面”执行时长“显示异常的问题 4 years ago
YunaiV 9632c33d27 mall:优化商品的分类、品牌的代码 4 years ago
YunaiV 1bd1c79ff3 mall:code review 商品模块的代码 4 years ago
YunaiV 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 4 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 4 years ago
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
4 years ago
芋道源码 dd6dc2ac3d
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
4 years ago
YunaiV 1a48301cee vue2 验证码,增加开关、修复对社交登录的支持 4 years ago
芋道源码 d918b14e90
!260 增加servicetask的完成和todo高亮,增加servicetask节点的hover显示内容
Merge pull request !260 from FinalFinancialFreedom/N/A
4 years ago
luowenfeng ab6fd30551 feature(uniapp商品): 商品功能完善 4 years ago
luowenfeng 198b1189e8 feature(uniapp商品): 商品修改 4 years ago
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 4 years ago
FinalFinancialFreedom 4c8b0ef430
增加servicetask的完成和todo高亮,增加servicetask节点的hover显示内容
Signed-off-by: FinalFinancialFreedom <li.acerphoenix@gmail.com>
4 years ago
wangjun e25b73b7d9 修复不退出模拟直接保存模型,后续分配规则报错 4 years ago
luowenfeng edfe379848 feature(uniapp商品): 多规格新增 4 years ago
luowenfeng 8ad1439fda feature(uniapp商品): 新增商品 4 years ago
YunaiV 185ea9e861 发布 1.6.4 版本:新增 uniapp 管理后台、数据报表设计器 4 years ago
luowenfeng 8de29d302c feature(uniapp商品): 新增商品数据 4 years ago
luowenfeng 617573a59b feature(uniapp分类): 商品创建功能以及查询功能正常使用 4 years ago
xingyu 020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
4 years ago
芋道源码 b5d458f1c4
!143 decodeFields 增加表单初始化能力, 完美支持子级元素
Merge pull request !143 from ziv/master
4 years ago
CorrectRoadH c691c440bd 解决没有isObjectObject这个函数的问题 4 years ago
CorrectRoadH b604cbedb9 拿不到数据的问题 4 years ago
luowenfeng de27f4c2db Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 4 years ago
luowenfeng 07e5e1b59f feature(管理后台): 商品弹窗 4 years ago
ycak47 74f12e0b9f 优化el-dialog
1.设置默认点击背景不关闭dialog(这个很容易误操作,体验较差)
2.el-dialog内容较多时,滚动条限定在内部而不撑开父页面的滚动条
3.代码生成的el-dialog默认添加 v-dialogDrag属性(可拖拽移动)
4 years ago
wuxiran d505b64b8f mall:还原 4 years ago
wuxiran c8ec5c8952 mall:上传enum类,做后端模板添加判定、前端页面添加 4 years ago
xingyu4j 066f0cf652 压缩图片尺寸 4 years ago
luowenfeng 10caa6e824 fix(管理后台菜单): 控制台异常 4 years ago
luowenfeng 55bc9b0616 feature(uniapp商品): 全局函数 4 years ago
xingyu da0ab98fae revert 4 years ago
xingyu e477179cd5 refactor: store action name 4 years ago
xingyu 9ca4b49b17 vue2 增加 AJ-Captcha 二次验证 4 years ago
xingyu b78378ce44 AJ-Captcha vue2 增加验证码二次校验 4 years ago
xingyu 02224ad6b5 vue2 端口 4 years ago
xingyu 4a92081937 vue2 新增行为验证码 4 years ago
YunaiV bf5df656ed 初始化管理后台的 uniapp 版本 4 years ago
xingyu 93a97cd526 perf: 优化表单校验和查询参数 4 years ago
YunaiV fa9823161e mall:完善商品品牌的前后端实现 4 years ago
YunaiV efd4942129 mall:完善商品分类的 APP 后端接口 4 years ago
YunaiV 969c387764 mall:完善商品分类的管理后台界面 4 years ago
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
4 years ago
YunaiV 2866b58741 1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
2. 完整移除 activiti 遗留的东东
4 years ago
YunaiV b05366511b 增加数据报表 vue 4 years ago
芋道源码 35413b52c9
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
4 years ago
YunaiV 75c7b88bc3 发版:1.6.3 biubiubiu~ 4 years ago
YunaiV e52a966b81 完善积木报表的集成 4 years ago
YunaiV cba217cc29 基于 /proxy-api 实现代理,简化 env.local 配置 4 years ago
xingyu 4825e3a2e3 fix: vue-warn 类型错误 4 years ago
xingyu 3e416c19bb fix: #I5IZA7 列表的时间区间查询修改后提示缺少"params" 4 years ago
YunaiV b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 4 years ago
xingyu 54efb34289 feat: add vue3 codegen(preview) 4 years ago
xingyu a57f79cf90 fix: vue2代码生成模板 4 years ago
YunaiV 4fe3da058c 更新 README 文档 4 years ago
YunaiV 7ab0dfbe6e 完善 BPM 代码,补充工作流的视频教程 4 years ago
芋道源码 26f684e945
!223 refactor: 时间区间查询传入数组
Merge pull request !223 from xingyu/master
4 years ago
xingyu 53a0d9bb0e refactor: 时间区间查询传入数组 4 years ago
xingyu edf11dc03a 移除addDateRange addBeginAndEndTime 引用 4 years ago
YunaiV c1e2e9032c 优化前端的依赖安装,使用 yarn 替代 4 years ago
xingyu 3d1afe5271 vue2: 移除 js-cookie ,使用 localStorage 4 years ago
YunaiV b0cdfd7afc 完善工作流的注释 4 years ago
jiangqiang 227a125719 积木报表post请求增加身份认证 4 years ago
jiangqiang 5c58a377db 新增积木报表菜单 4 years ago
jiangqiang 1f5c3e7484 下载链接,新增target="_blank" 4 years ago
jiangqiang 2621f2195d 优化代码 4 years ago
jiangqiang 30f2c1a496 优化文件列表页面在小屏幕上的显示 4 years ago
jiangqiang c64295f432 合并fetch代码 4 years ago
jiangqiang 6a1c09ca42 Merge remote-tracking branch 'source/master'
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
4 years ago
YunaiV 2372c25e8d 完善 Redis 缓存的查询 4 years ago
芋道源码 a0f7f0ff12
!211 Redis 监控添加缓存列表
Merge pull request !211 from 圆梦巨人/feature/cache-list
4 years ago
luowenfeng c0b1f62afd fix(Redis监控): fix review 4 years ago
jiangqiang eb3228d4c7 文件列表会显示图片缩略图,点击缩略图可以预览大图。非图片文件在列表页面会显示下载按钮。点击即可下载。 4 years ago
YunaiV 9270924597 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
4 years ago
jiangqiang da0ba10503 修改mimetype字段为type,修改获取文件后缀名方式,目前图片文件预览还有些问题 4 years ago
YunaiV 65ad977267 增加会签、或签的文档说明 4 years ago
YunaiV 26ff753701 暂时去除回退功能,边界处理不够正确 4 years ago
YunaiV 0a2599152d 暂时回退流程推断的能力 4 years ago
luowenfeng a7067ea6fd feature(Redis监控): 添加缓存列表 4 years ago
luowenfeng 40954e4e46 feature(Redis监控): 添加缓存列表 4 years ago
jiangqiang b741ed480b fix:修复上次提交导致的前端页面取值问题 4 years ago
franky f3c83488a3 spu 修改页面展示 4 years ago
YunaiV 15ee097a8b v3.8.3 默认不启用压缩文件缓存防止node_modules过大 4 years ago
YunaiV 89da744e0a v3.8.3 reset babel 4 years ago
YunaiV 083358b89a v3.8.3 优化代码 4 years ago
YunaiV 522fc5176a v3.8.3 用户管理左侧树型组件增加选中高亮保持 4 years ago
YunaiV 76969d7dd2 v3.8.3 ui code format 4 years ago
YunaiV 0af197059f v3.8.3 添加页签openPage支持传递参数 4 years ago
YunaiV 540595646d v3.8.2 topNav自定义隐藏侧边栏路由 4 years ago
YunaiV d6ef0ccd60 v3.8.2 优化固定Header后顶部导航栏样式问题(I4XDN5) 4 years ago
YunaiV 2ad73cd69a v3.8.2 修复数据库用户表 头像列为 null 时不显示默认头像问题 4 years ago
YunaiV d1053d55ad v3.8.2 优化菜单名称过长悬停显示标题 4 years ago
YunaiV 8751471aa1 优化管理后台的社交登录 4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
franky 8aab073c13 spu 页面编辑 4 years ago