diff --git a/.env.development b/.env.development index 14e1335..4db83b6 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统 +VITE_APP_TITLE = 无终街管理系统 # 开发环境配置 VITE_APP_ENV = 'development' diff --git a/.env.production b/.env.production index 1109bc6..f55841d 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统 +VITE_APP_TITLE = 无终街管理系统 # 生产环境配置 VITE_APP_ENV = 'production' diff --git a/src/api/oms/aftersale.js b/src/api/oms/aftersale.js index 23bce5e..fd27a00 100644 --- a/src/api/oms/aftersale.js +++ b/src/api/oms/aftersale.js @@ -1,4 +1,4 @@ -import request from '@/utils/request' +import request from '@/utils/request'; // 查询订单售后列表 export function listOmsAftersale(query, pageReq) { @@ -7,7 +7,7 @@ export function listOmsAftersale(query, pageReq) { method: 'post', data: query, params: pageReq - }) + }); } // 查询订单售后详细 @@ -15,7 +15,7 @@ export function getOmsAftersale(id) { return request({ url: '/oms/aftersale/' + id, method: 'get' - }) + }); } // 新增订单售后 @@ -24,7 +24,7 @@ export function addOmsAftersale(data) { url: '/oms/aftersale', method: 'post', data: data - }) + }); } // 修改订单售后 @@ -33,7 +33,7 @@ export function updateOmsAftersale(data) { url: '/oms/aftersale', method: 'put', data: data - }) + }); } // 删除订单售后 @@ -41,7 +41,7 @@ export function delOmsAftersale(id) { return request({ url: '/oms/aftersale/' + id, method: 'delete' - }) + }); } // 导出订单售后 @@ -50,21 +50,21 @@ export function exportOmsAftersale(query) { url: '/oms/aftersale/export', method: 'get', params: query - }) + }); } // 售后订单操作 -export function dealWithAftersale(data){ +export function dealWithAftersale(data) { return request({ url: '/oms/aftersale/dealWith', method: 'post', data: data - }) + }); } -export function viewLog(orderId){ +export function viewLog(orderId) { return request({ url: `/oms/aftersale/log/` + orderId, method: 'get' - }) + }); } diff --git a/src/router/index.ts b/src/router/index.ts index 6699eab..da9fb4c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -96,6 +96,48 @@ export const constantRoutes: RouteRecordRaw[] = [ }, // 新迁移的菜单,开发阶段暂时放在固定菜单内,后续迁移到权限菜单里 + + // 内容中心 + { + path: '/content-center', + component: Layout, + // hidden: true, + // permissions: ['system:role:edit'], + children: [ + // 视频管理 + { + path: 'video-manage', + component: () => import('@/views/contentManage/video/index.vue'), + name: 'Video', + meta: { title: '视频管理', icon: '', noCache: true } + }, + // 评论和点赞 + { + path: 'comments', + component: () => import('@/views/contentManage/video/index.vue'), + name: 'Comments', + meta: { title: '评论与点赞', icon: '', noCache: true } + }, + // 粉丝与关注 + { + path: 'fans', + component: () => import('@/views/contentManage/video/index.vue'), + name: 'Fans', + meta: { title: '粉丝与关注', icon: '', noCache: true } + }, + // 云点播 + { + path: 'cloud', + component: () => import('@/views/contentManage/video/index.vue'), + name: 'Cloud', + meta: { title: '云点播', icon: '', noCache: true } + } + ] + } +]; + +// 动态路由,基于用户权限动态去加载 +export const dynamicRoutes: RouteRecordRaw[] = [ { path: '/system/user-auth', component: Layout, @@ -208,49 +250,9 @@ export const constantRoutes: RouteRecordRaw[] = [ meta: { title: '售后订单详情' } } ] - }, - // 内容中心 - { - path: '/content-center', - component: Layout, - // hidden: true, - // permissions: ['system:role:edit'], - children: [ - // 视频管理 - { - path: 'video-manage', - component: () => import('@/views/contentManage/video/index.vue'), - name: 'Video', - meta: { title: '视频管理', icon: '', noCache: true } - }, - // 评论和点赞 - { - path: 'comments', - component: () => import('@/views/contentManage/video/index.vue'), - name: 'Comments', - meta: { title: '评论与点赞', icon: '', noCache: true } - }, - // 粉丝与关注 - { - path: 'fans', - component: () => import('@/views/contentManage/video/index.vue'), - name: 'Fans', - meta: { title: '粉丝与关注', icon: '', noCache: true } - }, - // 云点播 - { - path: 'cloud', - component: () => import('@/views/contentManage/video/index.vue'), - name: 'Cloud', - meta: { title: '云点播', icon: '', noCache: true } - } - ] } ]; -// 动态路由,基于用户权限动态去加载 -export const dynamicRoutes: RouteRecordRaw[] = []; - /** * 创建路由 */ diff --git a/src/utils/is-star-plugin.js b/src/utils/is-star-plugin.js index f421308..cf13fae 100644 --- a/src/utils/is-star-plugin.js +++ b/src/utils/is-star-plugin.js @@ -1,5 +1,5 @@ // 用于检测用户是否 star 了仓库,如果没有 star,将弹窗提示用户 star 。 -import { Message, MessageBox } from 'element-ui' +/*import { Message, MessageBox } from 'element-ui'*/ // 使用axios代替$.ajax import axios from 'axios' // 应用参数 @@ -19,7 +19,7 @@ const allowDisparity = 1000 * 60 * 60 * 24 * 7 * @param productLink 开源链接 */ export function isStarRepo(owner, repo, userId, redirectUrl,productName,productLink) { - const judge = process.env.VUE_APP_JUDGE_STAR + const judge = 0 if (!judge || judge == 0) { return true; } @@ -75,7 +75,7 @@ function confirmStar(redirectUrl,productName,productLink) { ` // 弹窗提示 - MessageBox.alert(tipStr, '温馨提示', { + ElMessageBox.alert(tipStr, '温馨提示', { // if you want to disable its autofocus // autofocus: false, confirmButtonText: '同意授权检测', @@ -100,7 +100,7 @@ function toStar(redirectUrl,productName,productLink,accessToken,owner,repo,key,c

本页面将在 star 后正常开放展示

` - MessageBox.confirm(tipStr, '温馨提示', { + ElMessageBox.confirm(tipStr, '温馨提示', { // if you want to disable its autofocus // autofocus: false, closeOnClickModal: false, diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue index 1a4fdc1..b3ad5ae 100644 --- a/src/views/oms/aftersale/index.vue +++ b/src/views/oms/aftersale/index.vue @@ -3,30 +3,47 @@
- + - + - + - + - + - + @@ -36,13 +53,10 @@ - + @@ -52,86 +66,90 @@
{{ scope.row.mark }}
- + -