From d62bba89c1660cbd835582e1ce00fab1f167d2ba Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Tue, 18 Nov 2025 12:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 31 +- src/api/pms/express.js | 54 + src/api/school/salary/commissionPlans.js | 7 + src/api/system/common.js | 2 +- src/api/system/tenant.js | 7 +- src/components/Breadcrumb/index.vue | 7 + src/components/SeeAdsComponent.vue | 24 +- .../sc/commission/commissionSelect.vue | 97 ++ src/components/sc/course/cla/claSelect.vue | 2 +- src/components/system/user/userSelect.vue | 113 ++ src/config/business.js | 4 +- src/directive/index.js | 2 + src/directive/table/tableLoadMore.js | 14 + src/layout/components/Navbar.vue | 7 +- src/layout/components/Sidebar/Logo.vue | 2 +- src/layout/components/TagsView/index.vue | 167 +-- src/layout/index.vue | 2 +- src/main.js | 10 + src/router/index.js | 77 +- src/store/modules/user.js | 12 +- src/utils/is-star-plugin.js | 218 ---- src/utils/request.js | 3 +- src/views/courseOrder/index.vue | 309 +++++ src/views/courseOrder/orderPrint.vue | 280 +++++ src/views/courseOrder/signUp.vue | 1087 +++++++++++++++++ src/views/mall/express/index.vue | 246 ++++ src/views/mall/product/AddProduct.vue | 26 +- src/views/mall/product/courseSelect.vue | 69 +- src/views/mall/product/index.vue | 3 + src/views/mall/sku/index.vue | 20 +- src/views/oms/aftersale/detail.vue | 275 +++++ src/views/oms/aftersale/index.vue | 492 ++++++++ src/views/oms/aftersaleItem/index.vue | 291 +++++ src/views/oms/order/detail.vue | 206 ++++ src/views/oms/order/index.vue | 807 ++++++++++++ src/views/oms/orderDeliveryHistory/index.vue | 258 ++++ src/views/oms/orderItem/index.vue | 424 +++++++ src/views/oms/orderOperateHistory/index.vue | 287 +++++ src/views/oms/wechatPaymentHistory/index.vue | 395 ++++++ src/views/register.vue | 2 +- src/views/system/user/profile/resetPwd.vue | 3 +- src/views/system/user/profile/userInfo.vue | 3 +- 42 files changed, 5893 insertions(+), 452 deletions(-) create mode 100644 src/api/pms/express.js create mode 100644 src/components/sc/commission/commissionSelect.vue create mode 100644 src/components/system/user/userSelect.vue create mode 100644 src/directive/table/tableLoadMore.js delete mode 100644 src/utils/is-star-plugin.js create mode 100644 src/views/courseOrder/index.vue create mode 100644 src/views/courseOrder/orderPrint.vue create mode 100644 src/views/courseOrder/signUp.vue create mode 100644 src/views/mall/express/index.vue create mode 100644 src/views/oms/aftersale/detail.vue create mode 100644 src/views/oms/aftersale/index.vue create mode 100644 src/views/oms/aftersaleItem/index.vue create mode 100644 src/views/oms/order/detail.vue create mode 100644 src/views/oms/order/index.vue create mode 100644 src/views/oms/orderDeliveryHistory/index.vue create mode 100644 src/views/oms/orderItem/index.vue create mode 100644 src/views/oms/orderOperateHistory/index.vue create mode 100644 src/views/oms/wechatPaymentHistory/index.vue diff --git a/README.md b/README.md index 08115e9..ddccb0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -## B站讲解视频 -https://www.bilibili.com/video/BV16N4y1d7MM +默认账号:admin 密码:123 ## node 推荐版本 16.13.1 @@ -24,6 +23,7 @@ npm run dev npm run build:stage # 构建生产环境 +配置路由:router -- index.js -- new Router添加: base: '/yoga/manager', npm run build:prod ``` ## 项目地址 @@ -31,13 +31,8 @@ npm run build:prod |:---------:|:-------------------------------------------|:---------------------------------------------| | service | https://gitee.com/zccbbg/RuoYi-Mall | https://github.com/zccbbg/ruoyi-mall | | h5 uniapp | https://gitee.com/zccbbg/ruoyi-mall-uniapp | https://github.com/zccbbg/ruoyi-mall-uniapp | +| mall vue | https://gitee.com/zccbbg/ruoyi-mall-vue.git| -## 在线体验 -### 管理后台演示地址 -http://mall.ichengle.top -### 小程序和h5 - - ## CSDN若依技术专栏 - 常见问题:https://blog.csdn.net/qq_27575627/category_12336113.html @@ -45,13 +40,7 @@ http://mall.ichengle.top - 前端技术:https://blog.csdn.net/qq_27575627/category_12331867.html - 运维:https://blog.csdn.net/qq_27575627/category_12332546.html -## 若依mall简介 -若依是一套全部开源的快速开发平台,毫无保留给个人及企业免费使用。我们在此基础上开发了ruoyi-mall。希望能给做商城的朋友减轻工作量。 -* 前端采用Vue、Element UI(ant design 正在开发中)。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt。 -* 权限认证使用Jwt,支持多终端认证系统。 -* 支持加载动态权限菜单,多方式轻松权限控制。 -* 高效率开发,使用代码生成器可以一键生成前后端代码。 + ## 若依mall功能 1. 首页: @@ -61,15 +50,3 @@ http://mall.ichengle.top 5. SMS营销管理: 6. CMS内容管理: -## 关于我们 -* 开发团队成立5年,我们前端开发、后端架构,有一颗热爱开源的心,致力于打造企业级的通用产品设计UI体系让项目 或者更直观,更高效、更简单,未来将持续关注UI交互,持续推出高质量的交互产品。 -* 这五年我主要做isv对接淘宝、拼多多、抖音、美团等平台的订单处理应用,日处理订单300w条,因为要熟悉业务也开过淘宝和拼多多店铺运营了一个网易严选的品牌。我们的公众号会陆续更新一些我一边撸代码一边做客服的经历。也会更新一些我的读书笔记以及编程、创业、生活中踩坑的文章。另外还会开放一些米哈游、博世、企查查、同程、阿里、京东、拼多多等大厂、中厂或外企的内推岗位! - -## 加群/技术支持 - -| 公众号 | -|:------------------------------------------:| -| | -扫公众号二维码,关注后回复:“支持”或者“加群” -admin -123 \ No newline at end of file diff --git a/src/api/pms/express.js b/src/api/pms/express.js new file mode 100644 index 0000000..3ca75ae --- /dev/null +++ b/src/api/pms/express.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 查询快递管理列表 +export function listPmsExpress(query, pageReq) { + return request({ + url: '/pms/express/list', + method: 'post', + data: query, + params: pageReq + }) +} +export function allExpress(query, pageReq) { + return request({ + url: '/pms/express/all', + method: 'post', + data: query, + params: pageReq + }) +} + +// 查询快递管理详细 +export function getPmsExpress(id) { + return request({ + url: '/pms/express/' + id, + method: 'get' + }) +} + +// 新增快递管理 +export function addPmsExpress(data) { + return request({ + url: '/pms/express', + method: 'post', + data: data + }) +} + +// 修改快递管理 +export function updatePmsExpress(data) { + return request({ + url: '/pms/express', + method: 'put', + data: data + }) +} + +// 删除快递管理 +export function delPmsExpress(id) { + return request({ + url: '/pms/express/' + id, + method: 'delete' + }) +} + diff --git a/src/api/school/salary/commissionPlans.js b/src/api/school/salary/commissionPlans.js index 9b69b93..fc0cf3f 100644 --- a/src/api/school/salary/commissionPlans.js +++ b/src/api/school/salary/commissionPlans.js @@ -8,6 +8,13 @@ export function list(data) { }) } +export function listAll() { + return request({ + url: '/commissionPlans/listAll', + method: 'get' + }) +} + export function saveOrEdit(data) { return request({ url: '/commissionPlans/saveOrEdit', diff --git a/src/api/system/common.js b/src/api/system/common.js index d42ccf9..9509504 100644 --- a/src/api/system/common.js +++ b/src/api/system/common.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询省市区列表 export function areaSelect(query) { return request({ - url: '/common/area', + url: '/com/common/area', method: 'get', params: query }) diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js index b4a7036..ac344b8 100644 --- a/src/api/system/tenant.js +++ b/src/api/system/tenant.js @@ -60,4 +60,9 @@ export function exportTenant(query) { }) } - +export function nowTenantInfo() { + return request({ + url: '/api/system/tenant/info/nowTenantInfo', + method: 'get' + }) +} diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 1696f54..162f5fa 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -10,6 +10,7 @@ + diff --git a/src/components/sc/course/cla/claSelect.vue b/src/components/sc/course/cla/claSelect.vue index 0eea79b..496fca6 100644 --- a/src/components/sc/course/cla/claSelect.vue +++ b/src/components/sc/course/cla/claSelect.vue @@ -51,7 +51,7 @@ export default { default: undefined }, deptId: { - type: String, + // type: Long, default: undefined }, value: { diff --git a/src/components/system/user/userSelect.vue b/src/components/system/user/userSelect.vue new file mode 100644 index 0000000..1d3f265 --- /dev/null +++ b/src/components/system/user/userSelect.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/config/business.js b/src/config/business.js index ecf1167..45ee8f1 100644 --- a/src/config/business.js +++ b/src/config/business.js @@ -3,5 +3,7 @@ export const dict_types = ["sys_user_sex", "sys_oper_type", "sys_common_status", "wms_item_type", "wms_carrier_level", "wms_supplier_level", "wms_receipt_type", "wms_receipt_status", "wms_shipment_type", "wms_shipment_status", "wms_movement_type", "wms_movement_status",'coupon_use_scope','coupon_exchange_type','activity_coupon_status', "pms_publish_status", 'sku_sort_list', - 'sys_show_status','oms_pay_type','oms_order_status','oms_aftersale_status','oms_aftersale_type',"pms_is_course" + 'sys_show_status','oms_pay_type','oms_order_status','oms_aftersale_status','oms_aftersale_type',"pms_is_course", + 'course_order_type', 'course_order_status','course_order_detail_tag' + ,'charge_type','date_unit' ]; diff --git a/src/directive/index.js b/src/directive/index.js index 8e7fa45..343ea75 100644 --- a/src/directive/index.js +++ b/src/directive/index.js @@ -5,6 +5,7 @@ import dialogDragWidth from './dialog/dragWidth' import dialogDragHeight from './dialog/dragHeight' import clipboard from './module/clipboard' import selectLoadMore from "@/directive/select/selectLoadMore"; +import tableLoadMore from './table/tableLoadMore' const install = function(Vue) { Vue.directive('hasRole', hasRole) @@ -14,6 +15,7 @@ const install = function(Vue) { Vue.directive('dialogDragWidth', dialogDragWidth) Vue.directive('dialogDragHeight', dialogDragHeight) Vue.directive('selectLoadMore', selectLoadMore) + Vue.directive('tableLoadMore', tableLoadMore) } if (window.Vue) { diff --git a/src/directive/table/tableLoadMore.js b/src/directive/table/tableLoadMore.js new file mode 100644 index 0000000..67ff562 --- /dev/null +++ b/src/directive/table/tableLoadMore.js @@ -0,0 +1,14 @@ +export default { + inserted(el, binding, vnode) { + // 获取element-ui定义好的scroll盒子 + const SELECTWRAP_DOM = el.querySelector('.el-table__body-wrapper') + + SELECTWRAP_DOM.addEventListener('scroll', function() { + const sign = 100 + const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight + if (scrollDistance <= sign) { + binding.value() + } + }) + } +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1550771..fa6461a 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,8 +2,8 @@