hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 20:28:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,113 Commits 20 Branches 0 Tags
14d02bdfb3931be8f98ebdcb4bfd6737e27d876b
Commit Graph

4113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xingyu4j
9adc84c396 Merge remote-tracking branch 'origin/master' into dev 2022-11-03 14:34:55 +08:00
xingyu4j
49237ad966 feat: add vxe crud schemas 2022-11-03 14:33:30 +08:00
芋道源码
ee3ac7b663 !282 修复 vue3 部分问题，引入 vxe-table 
Merge pull request !282 from xingyu/dev
 2022-11-03 04:32:34 +00:00
xingyu4j
e1b4ab2d1b fix: jsencrypt error 2022-11-03 10:47:21 +08:00
shizhong
87c40a4ab1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2022-11-03 09:44:48 +08:00
YunaiV
2c39405bce promotion：完善的优惠卷的实体 2022-11-03 00:05:13 +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
xingyu4j
3537672a52 fix: captcha enable 2022-11-02 13:50:41 +08:00
xingyu4j
ad42eca847 feat: vxe demo 2022-11-02 11:12:47 +08:00
xingyu4j
a33120c5d5 Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	yudao-ui-admin-vue3/package.json
 2022-11-02 11:11:09 +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
芋道源码
ce33b5c219 !283 fix:vue3 bug 
Merge pull request !283 from weikun/master
 2022-11-02 02:01:54 +00:00
YunaiV
2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% 2022-11-02 00:35:53 +08:00
YunaiV
dc51a93533 promotion：实现部分优惠劵模板的前端列表 2022-11-01 22:31:07 +08:00
xingyu4j
3cd6bb3148 fix: seach 2022-11-01 17:35:36 +08:00
xingyu4j
8917dcf6bf perf: vxe demo 2022-11-01 17:12:26 +08:00
xingyu4j
a95694ae6b perf: vxe demo 2022-11-01 15:56:40 +08:00
huyuehua
38161f05ac fix:（同步失败，不存在改变）代码生成，修改字段注解都不能修改 
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
 2022-11-01 14:50:27 +08:00
xingyu4j
220e0316e0 feat: vxe demo 2022-11-01 14:36:18 +08:00
weikun
5596984e32 fix: 修改密码api 2022-11-01 14:07:42 +08:00
xingyu4j
2e2cd448bd chore: update devs 2022-11-01 10:04:15 +08:00
xingyu4j
6a542b6104 perf: 优化描述组件 2022-11-01 09:46:13 +08:00
xingyu4j
983a636928 Merge remote-tracking branch 'origin/master' into dev 2022-11-01 09:25:02 +08:00
芋道源码
9745682598 !286 修复代码生成选择父菜单无效，修复生成的前端代码缺少字段以及格式错误 
Merge pull request !286 from 绝影jy/fixed
 2022-11-01 01:19:24 +00:00
YunaiV
3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
YunaiV
979ba0f916 promotion：实现优惠劵模板的逻辑 2022-10-31 23:47:06 +08:00
YunaiV
035c2cf28c promotion：完善 优惠劵模板 表~ 2022-10-31 21:19:18 +08:00
jueying
faea04546e 修复代码生成父菜单选择无效，前端代码缺少字段，格式错误 2022-10-31 17:13:05 +08:00
YunaiV
cca27636b7 code review 订单列表.vue 界面 2022-10-31 10:09:10 +08:00
YunaiV
e6acdf7098 将 market 模块，调整成 promotion 模块 2022-10-30 17:37:07 +08:00
YunaiV
829bbf58b5 price：完成优惠劵的价格计算~ 2022-10-30 17:32:59 +08:00
YunaiV
160d619d59 price：完成满减送的价格计算~ 2022-10-30 13:20:07 +08:00
YunaiV
4e9fe4bc54 price：完成限时折扣的价格计算~ 2022-10-29 22:23:48 +08:00
YunaiV
084d4baba2 price：完成会员价格的计算~ 2022-10-29 21:46:19 +08:00
YunaiV
a88eda340b 调整 price 接口，参考 taobao 的技术文档 2022-10-28 23:49:15 +08:00
YunaiV
3b506006dd Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-10-28 22:44:18 +08:00
YunaiV
5c4b61f5ff 暂存调整 Price 接口 2022-10-28 22:44:12 +08:00
SuperHao
26c728b050 bugfix: 当修改保存模型，再发布时，提示"流程定义部署失败，原因：信息未发生变化" 2022-10-28 09:04:41 +00:00
weikun
04fb4c0365 fix: 路由顶级非目录菜单直接显示 2022-10-28 10:55:51 +08:00
魏坤
74dfc60ef0 fix :token刷新、rememberMe 、暗黑模式保存 、验证码开关 bug 
add: 字体抗锯齿
 2022-10-28 09:28:20 +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
d91655f3c4 feature(商城): 修改单元测试 2022-10-27 11:00:14 +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
xingyu
3b3404747e chore: update deps 2022-10-26 09:44:07 +08:00