674 Commits (f8ed0e15f0a860d32107f2238e7ea7b2823fff42)

Author SHA1 Message Date
YunaiV d1cbe0c3fd mp:增加图文草稿箱的删除、发布功能 3 years ago
YunaiV 90ffe5adb7 mp:增加图文草稿箱的修改;优化前端代码 3 years ago
YunaiV 28884ee638 mp:优化 wx-editor 图片的上传 3 years ago
YunaiV 73fac5235f mp:实现 wx-editor 图片的上传 3 years ago
YunaiV f48276d2bc mp:引入 wx-editor 组件 3 years ago
YunaiV c0bd3471d5 mp:初步实现【草稿】的前端新增(优化,减少冗余代码) 3 years ago
YunaiV 4080d2de9b mp:初步实现【草稿】的前端新增 3 years ago
YunaiV bc870434c2 mp:初始化【图文草稿箱】前端界面 3 years ago
YunaiV 1e63198f4a mp:完善【发布功能】的相关代码 3 years ago
YunaiV 9f7b646f6c mp:增加发送【图文】消息 3 years ago
YunaiV 02ccf52d6c mp:增加发送【图文】消息 3 years ago
YunaiV 5901ab6664 mp:增加 server 草稿箱的分页、添加;已发布的分页、提交 3 years ago
YunaiV 267b1790ec mp:支持发送【视频】消息时,支持新建视频 3 years ago
YunaiV 858b4e81a5 mp:优化前端消息发送的缓存逻辑 3 years ago
YunaiV 7ba6a2e385 mp:增加【视频】消息的发送 3 years ago
YunaiV 331af28fe7 mp:增加【语音】【视频】的素材选择 3 years ago
YunaiV 188d880239 mp:增加【图片】素材的选择 3 years ago
YunaiV 431569fd09 mp:后端增加上传永久素材的接口 3 years ago
YunaiV 32f152cc27 mp:支持 wx-reply 发送音乐消息 3 years ago
YunaiV 90e0ebc20f mp:支持 wx-reply 发送音频消息 3 years ago
YunaiV 29cf770457 mp:支持 wx-reply 发送图片消息 3 years ago
YunaiV ec872c702c mp:增加上传临时素材的接口 3 years ago
zhang.xionghui c9d242c7e1
fix:
解决只有一个菜单时无法显示目录

Signed-off-by: zhang.xionghui <13834222683@163.com>
3 years ago
YunaiV 541ee81300 mp:前端接入发送消息 3 years ago
YunaiV 6325dd288c mp:前端增加 message 消息的展示 3 years ago
YunaiV 9cf88d1929 mp:后端增加发送客服消息接口 3 years ago
zhang.xionghui 5bc61e4858
update yudao-ui-admin/src/styles/index.scss.
修复tags页签超过屏幕后无法滚动导致无法选择后面的页签

Signed-off-by: zhang.xionghui <13834222683@163.com>
3 years ago
YunaiV f8eed5dd3f mp:初始化回复组件 3 years ago
YunaiV b0386429fe mp:支持 wx-news、wx-location 类型的消息 3 years ago
YunaiV 9e4a978f85 mp:解决 wx-msg 的 css 问题 3 years ago
YunaiV cc23ca2dcc mp:解决 wx-msg 的 css 问题 3 years ago
YunaiV 2b477a4dfb mp:实现 wx-msg 的消息列表的适配 3 years ago
YunaiV df5e6161aa mp:重构 wx-msg 前的提交 3 years ago
YunaiV 94178998e5 mp:前端 message 增加 voice 语音的播放 3 years ago
YunaiV 8a5db8c1eb mp:前端 message 增加文本、图片、事件等的展示 3 years ago
YunaiV 18bf098a1a mp:前端 message 增加视频播放的逻辑 3 years ago
YunaiV 9ec2f8b60f mp:梳理 message 的前端和后端代码 3 years ago
YunaiV 2ac2af64d4 mp:实现 user 的 ui 界面 3 years ago
YunaiV a341c44c4d mp:实现 tag 模块的前端界面 3 years ago
YunaiV acee075260 mp:调整 tag 模块的整体结构 3 years ago
YunaiV d6de233a47 mp:完成公众号的数据统计前端界面 3 years ago
YunaiV d0934510af mp:完成公众号统计的用户累计数据、消息概况数据 3 years ago
YunaiV 09e200c364 mp:完成公众号统计的用户增减数据 3 years ago
YunaiV b9246d1543 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
3 years ago
YunaiV 39b2afd506 mp:完成的公众号的管理界面 3 years ago
芋道源码 c499165fe5
!353 同步 增加webSocket
Merge pull request !353 from xingyu/dev
3 years ago
zy 38f9284593 fix:redis监控echarts图表不显示 3 years ago
xingyu c5f29f18d3 Merge remote-tracking branch 'origin/master' into dev 3 years ago
YunaiV 24f0e4dd1f 1.6.6 发版:完善 Vue3 管理后台、新增 IP & 地区库 3 years ago
芋道源码 4c0275fbf4
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
3 years ago
gaibu 29d2aad176 fix: 上传视频无法预览 3 years ago
咱哥丶 2d1ff0aff7 commit 增加webSocket 3 years ago
YunaiV 627cb39517 mp:完善公众号的账号管理 3 years ago
YunaiV 48520a456b Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock
3 years ago
YunaiV 6f8384af70 增加《敏感词》《地区 & IP》文档 3 years ago
YunaiV a83b8e8fbc 修复报错的单元测试 3 years ago
plimlips 2c02159384
update yudao-ui-admin/src/components/FileUpload/index.vue.
后台一直使用 0 作为成功,所以前端也不应该使用200

Signed-off-by: plimlips <156839224@qq.com>
3 years ago
芋道源码 258c1ddb70
!343 同步dev分支
Merge pull request !343 from xingyu/dev
3 years ago
xingyu d86c36a151 vue2 圆角标签栏 3 years ago
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
3 years ago
YunaiV 7a4a6a3046 product:优化管理后台相关的接口
area:增加地区列表界面
3 years ago
xingyu 1bb1da5838 fix: 代码生成日期类型 LocalDateTime 3 years ago
luowenfeng 826a564abd 站内信开发 3 years ago
芋道源码 f9b4874ee9
!320 秒杀活动相关
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
3 years ago
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 3 years ago
YunaiV 98ca807d4b product:优化商品属性项的代码 3 years ago
YunaiV 7f131a3853 trade:增加用户 App 的订单分页和详情接口 3 years ago
YunaiV b7d78a24a4 trade:完成管理后台的订单详情的简单对接 3 years ago
YunaiV c5408965eb trade:增加管理后台的订单详情接口 3 years ago
YunaiV fc48ab4928 trade:前端订单管理,联调接口 3 years ago
YunaiV fc49f000ce trade:前端订单管理,联调接口 3 years ago
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 3 years ago
xingyu 57bfef8d24 修复 vue2 文字点选验证码 bug 3 years ago
xingyu bfea385cc1 fix: 恢复默认端口80 3 years ago
xingyu af0974cfb3 fix: import 3 years ago
xingyu c720b1dff9 fix: 三方登录未携带租户 3 years ago
halfninety 6808d3c163 完成秒杀时段todo,秒杀时段商品添加timeIds 3 years ago
YunaiV 03c7e60092 发布 v1.6.5 版本! 3 years ago
xingyu 314323f1ea chore: update vue 2.7.14 3 years ago
xingyu 50f96651c2 feat: 更换为let const 3 years ago
xingyu b100d41da1 Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 3 years ago
halfninety 54baad165d 秒杀时段新增修改时间段冲突校验。
秒杀活动新增,修改,删除时对秒杀时段的秒杀活动数量进行修改
3 years ago
halfninety 7bc1ae5f35 秒杀活动增删改查 3 years ago
halfninety cd62c4d220 秒杀时段相关 3 years ago
halfninety ea2a57f0a0 修改秒杀时段id 3 years ago
halfninety 83ee1c6129 秒杀活动,添加商品,分页查询 3 years ago
YunaiV 53dbf8d82e !290 修复三级及以上菜单路由缓存失效问题 3 years ago
xingyu 4e860eb254 perf: 完善类型 3 years ago
YunaiV d884303df6 trade:【交易售后】查询分页列表 3 years ago
YunaiV 00e66216c5 trade:【交易售后】查询分页列表的前端 3 years ago
YunaiV af71a19241 trade:【商品】sku 表增加 spu_name 字段,冗余 3 years ago
LAPTOP-CNV4CMCJ\cheng b3cea2d4bf 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 78ae018320 新增退款列表页 调整商品列表页的tab切换 3 years ago
xingyu4j 7083d991fe refactor: verify 3 years ago
xingyu4j 042c4e8390 Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
YunaiV 38d6b51fcc v3.8.4:优化页面内嵌iframe切换tab不刷新数据 3 years ago
xingyu4j 89bd2f6d9e Merge remote-tracking branch 'origin/master' into feature/vue3 3 years ago
xingyu4j bdc988e5b7 fix: search 3 years ago
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
YunaiV 85f83b9760 v3.8.4:修复table中更多按钮切换主题色未生效修复问题 3 years ago
YunaiV 2c43a72fcf v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0)去除某些svg图标的fill="#bfbfbf"属性,避免菜单激活无法修改其填充颜色。 3 years ago
YunaiV 10d8607893 v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0) 3 years ago
YunaiV 803bd5e3c4 v3.8.4:修复多文件上传报错出现的异常问题 3 years ago
YunaiV 1a60d0ceb3 v3.8.4:优化页面内嵌iframe切换tab不刷新数据 3 years ago
YunaiV 1999ac4ea9 v3.8.4:修复图片预览组件src属性为null值控制台报错问题(I5KBAS) 3 years ago
YunaiV 78f7e8a952 3.8.4:优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出) 3 years ago
YunaiV 3310b766bc 【修复】工作流程-流程管理-流程模型,在发布完流程后,点击激活状态的按钮,显示“是否确认挂起流程名字为‘xxx’‘的数据项“,点击取消,前端显示的激活状态改变,但是数据库没有更新,报错 3 years ago
YunaiV 9e39356512 【修复】数据字典列表的 status 下拉无数据的情况 3 years ago
YunaiV e4036842de 【修复】自定义 ICON 不生效的问题 3 years ago
YunaiV 7093ed3997 【修复】钉钉登录时,重定向后 type 丢失导致报错的问题 3 years ago
YunaiV 1dfb37b11f 修复用户直接点击登录界面的三方登录,报“租户的请求未传递,请进行排查”的错误 3 years ago
YunaiV 3fbb0b4c54 修复滑块验证码,存在失败的情况 3 years ago
YunaiV 93b8a2b6c1 1. 修复滑块验证码,存在失败的情况
2. 重新构建 demo 预览项目
3 years ago
芋道源码 c022755ec5
!278 调整前端配置管理中参数分类显示
Merge pull request !278 from huzhibo/N/A
3 years ago
YunaiV d3b6a0ca69 1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
3 years ago
xingyu4j 423256c0db fix 滑块验证码error 3 years ago
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