zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,639 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

116 Commits (a4e18f6c9c3433ef69cee5f7299a41b72ed36da6)

Author SHA1 Message Date
Jruome fc5a55141e 管理端 文案修改 2023-05-30 10:20:14 +08:00
Jruome ef9ee333f7 uniapp 样式修改 2023-05-29 20:19:04 +08:00
TianYu 28b5ecba88 fix: 修复ubg 2023-05-29 18:29:13 +08:00
Jruome bd53fae597 管理端 按钮路由标识 2023-05-29 10:19:13 +08:00
Jruome db940da972 uniapp 发展会员业绩 2023-05-26 18:23:34 +08:00
TianYu f2047883c0 fix: 修复bug 2023-05-26 09:33:30 +08:00
TianYu 4afe43b327 fix: 修改bug 2023-05-24 10:34:35 +08:00
Jruome 04fbb93fa6 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-17 15:27:44 +08:00
TianYu 907b2b7582 feat: 轮播图功能开发 2023-05-17 14:37:27 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
Jruome 00d7d6528d Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-15 10:39:07 +08:00
TianYu 927568c0d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server 2023-05-15 10:36:04 +08:00
Jruome f96369d3e4 物流模板 2023-05-15 10:25:36 +08:00
Jruome 89c09d32b4 物流模板 2023-05-15 10:19:45 +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
perry f32a82379b 请求方法修改 2023-05-08 16:29:31 +08:00
YunaiV adb8b58967 所有菜单的 name 都加上模块的前缀，避免冲突 2023-04-08 11:49:28 +08:00
YunaiV 53767614fe 增加商城的提示 2023-02-04 20:38:51 +08:00
xingyu 0bd0bbd536 fix: slot-scope 已过期 ==》 v-slot 2023-01-31 13:28:16 +08:00
YunaiV a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
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
 2022-12-23 19:12:45 +08:00
YunaiV 7a4a6a3046 product：优化管理后台相关的接口 
area：增加地区列表界面
 2022-12-23 18:47:59 +08:00
芋道源码 f9b4874ee9
!320 秒杀活动相关 
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
 2022-12-13 02:04:54 +00:00
YunaiV 4a2cb33cd7 product：优化商品属性值的代码 2022-12-12 23:40:23 +08:00
YunaiV 98ca807d4b product：优化商品属性项的代码 2022-12-12 22:25:31 +08:00
YunaiV 7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
YunaiV b7d78a24a4 trade：完成管理后台的订单详情的简单对接 2022-12-10 21:02:32 +08:00
YunaiV c5408965eb trade：增加管理后台的订单详情接口 2022-12-10 17:53:44 +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 fac3e7c726 product：商品规格，调整成商品属性，避免和 sku 概念冲突 2022-12-08 21:12:35 +08:00
halfninety 6808d3c163 完成秒杀时段todo，秒杀时段商品添加timeIds 2022-12-03 15:46:26 +08:00
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 2022-11-29 23:25:01 +08:00
YunaiV d884303df6 trade：【交易售后】查询分页列表 2022-11-20 09:35:06 +08:00
YunaiV 00e66216c5 trade：【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
YunaiV af71a19241 trade：【商品】sku 表增加 spu_name 字段，冗余 2022-11-19 12:25:53 +08:00
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 2022-11-19 00:40:19 +08:00
LAPTOP-CNV4CMCJ\cheng 78ae018320 新增退款列表页 调整商品列表页的tab切换 2022-11-19 00:40:13 +08:00
xingyu4j 7083d991fe refactor: verify 2022-11-17 10:37:23 +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
xingyu4j c9e11e7636 fix slot-scope 2022-11-08 12:54:57 +08:00
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 2022-11-08 00:16:15 +08:00
LAPTOP-CNV4CMCJ\cheng ea5e6b2c0e 新增了订单详情 2022-11-08 00:16:08 +08:00
YunaiV 941782fb10 promotion：完善限时折扣的修改逻辑 2022-11-06 12:38:13 +08:00
YunaiV 6d48bd1ed8 promotion：完善限时折扣的添加逻辑 2022-11-06 00:48:07 +08:00
YunaiV d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00
YunaiV 00f90e75d9 promotion：增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00