Commit Graph

493 Commits

Author SHA1 Message Date
YunaiV
873b530652 promotion:增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
YunaiV
47c2dfa623 promotion:增加优惠劵的前端分页界面 100% 2022-11-04 19:17:17 +08:00
YunaiV
86b6b85934 promotion:增加优惠劵的前端分页界面 80% 2022-11-04 00:27:37 +08:00
YunaiV
8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
YunaiV
e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-02 22:19:40 +08:00
YunaiV
bd661296c0 promotion:完善优惠劵模板的功能 2022-11-02 22:19:33 +08:00
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 2022-11-02 10:46:58 +08:00
LAPTOP-CNV4CMCJ\cheng
89fefc5f81 处理了商品订单的TODO 2022-11-02 10:46:42 +08:00
YunaiV
2aaeb7af88 promotion:实现部分优惠劵模板的前端表单 80% 2022-11-02 00:35:53 +08:00
YunaiV
dc51a93533 promotion:实现部分优惠劵模板的前端列表 2022-11-01 22:31:07 +08:00
YunaiV
3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
YunaiV
035c2cf28c promotion:完善 优惠劵模板 表~ 2022-10-31 21:19:18 +08:00
YunaiV
cca27636b7 code review 订单列表.vue 界面 2022-10-31 10:09:10 +08:00
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 2022-10-27 16:49:53 +08:00
LAPTOP-CNV4CMCJ\cheng
dcb3f1c8f0 新增订单管理页面 2022-10-27 16:49:47 +08:00
luowenfeng
7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 10:30:27 +08:00
YunaiV
e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
luowenfeng
20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-26 14:57:45 +08:00
YunaiV
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
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
2022-10-25 11:15:17 +08:00
YunaiV
7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
luowenfeng
dc4e3fcd6e feature(商城): 商城review改 2022-10-24 10:30:47 +08:00
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
2022-10-23 22:16:54 +08:00
YunaiV
3cee922e69 优化 permission 相关的注释 2022-10-23 20:21:10 +08:00
YunaiV
a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 2022-10-18 23:32:42 +08:00
luowenfeng
31f5b27d01 feature(uniapp分类): review 2022-10-17 19:55:46 +08:00
huzhibo
66cef17fa1
调整前端配置管理中参数分类显示
Signed-off-by: huzhibo <527188553@qq.com>
2022-10-13 10:57:13 +00:00
YunaiV
6b79788b5a 完善 oauth2.0 的注释 2022-10-06 20:00:38 +08:00
YunaiV
585d2a523b 修复登录的 redirect 地址,存在参数时,登录成功回跳的时候地址不正确的问题 2022-10-01 21:37:45 +08:00
YunaiV
ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 2022-10-01 20:49:11 +08:00
zhijiantianya@gmail.com
c25791047f mall: 商品的代码 review 2022-09-30 08:30:04 +00:00
YunaiV
2b784d180e 调整 sso 界面,移除多租户的选择 2022-09-29 21:17:08 +08:00
YunaiV
d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-09-24 12:55:05 +08:00
luowenfeng
c7a2ed4a0b feature(管理后台): 商品管理 2022-09-22 11:40:19 +08:00
luowenfeng
77a676ee07 feature(管理后台): 商品列表 2022-09-21 19:40:07 +08:00
luowenfeng
fdb2d7339f feature(管理后台): 商品列表 2022-09-21 15:57:32 +08:00
luowenfeng
f122c0c509 feature(管理后台): 商品添加视频 2022-09-21 10:42:07 +08:00
luowenfeng
e2cd336a22 feature(管理后台): 规格值添加 2022-09-20 10:27:49 +08:00
luowenfeng
e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +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
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
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
YunaiV
75c7b88bc3 发版:1.6.3 biubiubiu~ 2022-07-29 01:11:01 +08:00
YunaiV
e52a966b81 完善积木报表的集成 2022-07-28 23:23:44 +08:00
YunaiV
cba217cc29 基于 /proxy-api 实现代理,简化 env.local 配置 2022-07-28 21:20:18 +08:00
xingyu
4825e3a2e3 fix: vue-warn 类型错误 2022-07-28 16:13:12 +08:00
xingyu
3e416c19bb fix: #I5IZA7 列表的时间区间查询修改后提示缺少"params" 2022-07-28 10:33:49 +08:00
YunaiV
b2f5900abc Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual 2022-07-27 22:45:40 +08:00
xingyu
54efb34289 feat: add vue3 codegen(preview) 2022-07-25 18:46:04 +08:00
xingyu
a57f79cf90 fix: vue2代码生成模板 2022-07-25 16:53:36 +08:00
YunaiV
4fe3da058c 更新 README 文档 2022-07-25 00:19:32 +08:00
YunaiV
7ab0dfbe6e 完善 BPM 代码,补充工作流的视频教程 2022-07-23 21:43:19 +08:00
芋道源码
26f684e945
!223 refactor: 时间区间查询传入数组
Merge pull request !223 from xingyu/master
2022-07-21 15:29:50 +00:00
xingyu
53a0d9bb0e refactor: 时间区间查询传入数组 2022-07-21 23:22:21 +08:00
xingyu
edf11dc03a 移除addDateRange addBeginAndEndTime 引用 2022-07-21 23:19:14 +08:00
YunaiV
c1e2e9032c 优化前端的依赖安装,使用 yarn 替代 2022-07-21 20:51:17 +08:00
xingyu
3d1afe5271 vue2: 移除 js-cookie ,使用 localStorage 2022-07-21 18:14:53 +08:00
YunaiV
b0cdfd7afc 完善工作流的注释 2022-07-20 00:34:44 +08:00
jiangqiang
227a125719 积木报表post请求增加身份认证 2022-07-11 15:15:25 +08:00
jiangqiang
5c58a377db 新增积木报表菜单 2022-07-10 20:43:21 +08:00
jiangqiang
1f5c3e7484 下载链接,新增target="_blank" 2022-07-09 17:55:22 +08:00
jiangqiang
2621f2195d 优化代码 2022-07-09 17:46:29 +08:00
jiangqiang
30f2c1a496 优化文件列表页面在小屏幕上的显示 2022-07-09 14:25:45 +08:00
jiangqiang
c64295f432 合并fetch代码 2022-07-09 10:41:06 +08:00
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
2022-07-09 10:32:15 +08:00
YunaiV
2372c25e8d 完善 Redis 缓存的查询 2022-07-08 20:39:34 +08:00
芋道源码
a0f7f0ff12
!211 Redis 监控添加缓存列表
Merge pull request !211 from 圆梦巨人/feature/cache-list
2022-07-08 11:15:03 +00:00
luowenfeng
c0b1f62afd fix(Redis监控): fix review 2022-07-08 11:47:02 +08:00
jiangqiang
eb3228d4c7 文件列表会显示图片缩略图,点击缩略图可以预览大图。非图片文件在列表页面会显示下载按钮。点击即可下载。 2022-07-08 11:02:21 +08:00
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
2022-07-08 09:41:50 +08:00
jiangqiang
da0ba10503 修改mimetype字段为type,修改获取文件后缀名方式,目前图片文件预览还有些问题 2022-07-08 09:14:39 +08:00
YunaiV
65ad977267 增加会签、或签的文档说明 2022-07-08 09:12:21 +08:00
YunaiV
26ff753701 暂时去除回退功能,边界处理不够正确 2022-07-08 08:54:15 +08:00
YunaiV
0a2599152d 暂时回退流程推断的能力 2022-07-08 01:38:19 +08:00
luowenfeng
a7067ea6fd feature(Redis监控): 添加缓存列表 2022-07-07 14:50:58 +08:00
luowenfeng
40954e4e46 feature(Redis监控): 添加缓存列表 2022-07-07 12:38:06 +08:00
jiangqiang
b741ed480b fix:修复上次提交导致的前端页面取值问题 2022-07-07 10:51:33 +08:00
franky
f3c83488a3 spu 修改页面展示 2022-07-06 17:06:19 +08:00
YunaiV
15ee097a8b v3.8.3 默认不启用压缩文件缓存防止node_modules过大 2022-07-06 09:30:59 +08:00
YunaiV
89da744e0a v3.8.3 reset babel 2022-07-06 09:25:32 +08:00
YunaiV
083358b89a v3.8.3 优化代码 2022-07-06 09:25:06 +08:00
YunaiV
522fc5176a v3.8.3 用户管理左侧树型组件增加选中高亮保持 2022-07-06 09:22:06 +08:00
YunaiV
76969d7dd2 v3.8.3 ui code format 2022-07-06 09:21:03 +08:00
YunaiV
0af197059f v3.8.3 添加页签openPage支持传递参数 2022-07-06 09:19:34 +08:00
YunaiV
540595646d v3.8.2 topNav自定义隐藏侧边栏路由 2022-07-06 09:15:53 +08:00
YunaiV
d6ef0ccd60 v3.8.2 优化固定Header后顶部导航栏样式问题(I4XDN5) 2022-07-06 09:14:12 +08:00
YunaiV
2ad73cd69a v3.8.2 修复数据库用户表 头像列为 null 时不显示默认头像问题 2022-07-06 09:12:43 +08:00
YunaiV
d1053d55ad v3.8.2 优化菜单名称过长悬停显示标题 2022-07-06 09:11:34 +08:00
YunaiV
8751471aa1 优化管理后台的社交登录 2022-07-05 22:00:23 +08:00
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
2022-07-04 19:56:54 +08:00
franky
8aab073c13 spu 页面编辑 2022-07-04 14:06:53 +08:00
franky
d104f1c572 spu 页面优化 2022-07-01 20:37:41 +08:00
芋道源码
d9268ab4be
!199 修复前端部分控制台的几个报错
Merge pull request !199 from DoNow/master
2022-06-30 05:42:45 +00:00
芋道源码
33d094697d
!205 短信发送时,新增短信渠道的状态校验
Merge pull request !205 from muyi/login
2022-06-30 05:34:54 +00:00
yjb
45083c89ee 优化文件配置,避免VUE警告 Invalid prop: type check failed for prop 2022-06-26 23:20:24 +08:00
fengdan
7d60d63d82 style(格式化): 2022-06-23 15:31:19 +08:00
fengdan
59624531b6 fix(公众号账号管理): 增、删、改、查 2022-06-23 15:29:12 +08:00
fengdan
372b4a70aa fix(粉丝标签管理): 增、删、改、查 2022-06-23 15:26:31 +08:00
DoNow
d00a401ed6 指定element-ui依赖版本为2.15.8,规避2.15.9版本中Prop being mutated: "placement"报错的bug
修复部分svg图标引用草料二维码插件内部字体的问题
去除短信日志页面的新增按钮,解决"handleAdd" is not defined的报错
修复数据库文档页面中data定义src: "undefined"的格式,解决控制台报错
2022-06-17 08:54:42 +08:00
YunaiV
d3fe187696 增加 file 的文件名的字段,同步最新 SQL 2022-06-15 08:24:06 +08:00
芋道源码
df7bba7f30
!186 文件表建加原文件名称字段original_name,相关代码修改
Merge pull request !186 from 谢谢的谢/master
2022-06-14 23:52:47 +00:00
supine-win
98f2722781 1.beautify user avatar image and show nickname 2022-06-11 06:01:53 +08:00
franky
1e0f197c35 spu 新增前端页面完成 2022-06-10 17:23:35 +08:00
franky
f07bf8b0fd spu保存校验添加 2022-06-05 22:43:20 +08:00
franky
6dca8e082b 商品调整 2022-06-05 15:45:36 +08:00