Commit Graph

75 Commits (bac30ebbbfe0428217b64577314447e0d61d2fc4)

Author SHA1 Message Date
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
perry 21a020f430 微信支付 2023-05-19 10:24:44 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
TianYu 609821a5c7 feat: 新增订单模块 2023-05-12 15:24:57 +08:00
Jruome 153a26612d 商品页面初始化 2023-05-12 10:11:30 +08:00
TianYu 54ad77ad37 feat: 拷贝商品功能 2023-05-12 09:36:43 +08:00
YunaiV d500332a18 代码生成,支持配置前端 UI 类型 2023-04-13 07:53:41 +08:00
YunaiV 8e1be01451 pay: 增加支付宝的条形码支付的配置 2023-02-18 23:59:11 +08:00
YunaiV e6f414b918 pay: 接入支付宝 Wap 支付 2023-02-18 22:40:56 +08:00
YunaiV ce8571e313 pay: 接入支付宝 PC 支付的表单 2023-02-18 21:39:09 +08:00
YunaiV b34801f303 pay: 接入支付宝 PC 支付的跳转模式 2023-02-18 20:59:18 +08:00
YunaiV 84e9c0bba0 pay:前端收银台的信息接入 2023-02-13 23:59:03 +08:00
YunaiV 53767614fe 增加商城的提示 2023-02-04 20:38:51 +08:00
YunaiV ae3ee95cdd 站内信模块:整体功能实现 2023-01-28 20:10:19 +08:00
YunaiV 143035d798 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js
2023-01-27 23:25:08 +08:00
YunaiV 525078abd3 邮箱模块:完善 log 相关的逻辑 2023-01-26 20:39:38 +08:00
YunaiV 68ef11ee87 mp:完善微信公众号的消息 2023-01-17 23:20:56 +08:00
YunaiV 1e402d8063 mp:增加【自动回复】的前端实现 2023-01-17 00:01:07 +08:00
YunaiV 29cf770457 mp:支持 wx-reply 发送图片消息 2023-01-12 00:24:04 +08:00
YunaiV d0934510af mp:完成公众号统计的用户累计数据、消息概况数据 2023-01-07 23:49:50 +08:00
YunaiV 09e200c364 mp:完成公众号统计的用户增减数据 2023-01-07 22:35:30 +08:00
luowenfeng 826a564abd 站内信开发 2022-12-17 16:41:14 +08:00
YunaiV b7d78a24a4 trade:完成管理后台的订单详情的简单对接 2022-12-10 21:02:32 +08:00
YunaiV fc48ab4928 trade:前端订单管理,联调接口 2022-12-10 17:06:34 +08:00
YunaiV fc49f000ce trade:前端订单管理,联调接口 2022-12-10 11:52:11 +08:00
YunaiV 00e66216c5 trade:【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
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
2022-11-13 12:07:59 +08:00
xingyu4j 011dc23699 替换var 为const/let
删除未使用import
替换 == 为 ===
2022-11-08 13:31:08 +08:00
YunaiV 00f90e75d9 promotion:增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00
YunaiV 74b6ff1eef promotion:增加满减送活动的前端 50% 2022-11-05 00:14:02 +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 2aaeb7af88 promotion:实现部分优惠劵模板的前端表单 80% 2022-11-02 00:35:53 +08:00
YunaiV dc51a93533 promotion:实现部分优惠劵模板的前端列表 2022-11-01 22:31:07 +08:00
YunaiV c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +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
YunaiV 1a48301cee vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
luowenfeng ab6fd30551 feature(uniapp商品): 商品功能完善 2022-09-01 15:28:05 +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
xingyu 4a92081937 vue2 新增行为验证码 2022-08-03 13:38:01 +08:00
YunaiV 2b4ff2ae28 修复社交登录的图床挂掉的问题 2022-05-22 20:19:03 +08:00
YunaiV d322e78199 前端 Token、账号、密码等信息,统一使用 LocalStorage 替代 Cookie 存储 2022-05-22 20:09:48 +08:00
YunaiV 7926ea9896 修复 refresh token 过期时,不会自动跳转到首页的问题 2022-05-22 17:33:39 +08:00
caiti 960b1eb250 fix: 路由地址转首字母大写驼峰,作为路由名称,适配keepAlive 2022-05-18 11:44:54 +08:00
YunaiV 6c5f5e1ad4 完善 refresh token 失效时,无法自动跳转回首页的问题,同时优化相关的提示 2022-05-13 20:28:56 +08:00
YunaiV 97db4586a8 完成 OAuth2 的客户端模块 2022-05-12 01:09:16 +08:00
YunaiV 6ed624861d 增加 refresh token 接口,并接入到前端项目 2022-05-09 22:49:42 +08:00
YunaiV a3687132b6 增加 refresh token 接口,并接入到前端项目 2022-05-09 22:46:52 +08:00
YunaiV 86e6c04e07 登录后,返回 OAuth2 的 access token + refresh token 2022-05-09 19:40:10 +08:00