From 19fd0553a604a41a925c27e954f3f50af6f2cbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Tue, 21 Feb 2023 09:04:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/diyComponents/c_upload_img.vue | 2 +- .../diyComponents/c_upload_list.vue | 2 +- .../custom-bread-crumb/custom-bread-crumb.vue | 2 +- .../mobileConfigRightDiy/c_hot_imgs.vue | 2 +- .../mobileConfigRightDiy/c_menu_list.vue | 2 +- .../mobileConfigRightDiy/c_upload_img.vue | 2 +- .../src/components/newsCategory/index.vue | 8 +++---- template/admin/src/main.js | 2 +- template/admin/src/router/modules/agent.js | 4 ++-- template/admin/src/router/modules/app.js | 4 ++-- template/admin/src/router/modules/cms.js | 4 ++-- template/admin/src/router/modules/division.js | 4 ++-- template/admin/src/router/modules/echarts.js | 4 ++-- template/admin/src/router/modules/finance.js | 4 ++-- template/admin/src/router/modules/frameOut.js | 4 ++-- template/admin/src/router/modules/index.js | 6 ++--- .../admin/src/router/modules/marketing.js | 4 ++-- template/admin/src/router/modules/order.js | 4 ++-- template/admin/src/router/modules/product.js | 4 ++-- template/admin/src/router/modules/setting.js | 4 ++-- .../admin/src/router/modules/statistic.js | 4 ++-- template/admin/src/router/modules/system.js | 4 ++-- template/admin/src/router/modules/user.js | 4 ++-- template/admin/src/router/routers.js | 22 +++++++++---------- template/admin/src/setting.js | 4 ++-- 25 files changed, 55 insertions(+), 55 deletions(-) diff --git a/template/admin/src/components/diyComponents/c_upload_img.vue b/template/admin/src/components/diyComponents/c_upload_img.vue index 09bd8b7b9..b605febcc 100644 --- a/template/admin/src/components/diyComponents/c_upload_img.vue +++ b/template/admin/src/components/diyComponents/c_upload_img.vue @@ -105,7 +105,7 @@ export default { 'test-dialog', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: settings.roterPre +'/widget.images/index.html?fodder=dialog', + iframeUrl: settings.routePre +'/widget.images/index.html?fodder=dialog', editor: editor, name: uiName, title: '上传图片', diff --git a/template/admin/src/components/diyComponents/c_upload_list.vue b/template/admin/src/components/diyComponents/c_upload_list.vue index 9bdc65a42..2522f3887 100644 --- a/template/admin/src/components/diyComponents/c_upload_list.vue +++ b/template/admin/src/components/diyComponents/c_upload_list.vue @@ -196,7 +196,7 @@ export default { 'test-dialog', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: settings.roterPre + '/widget.images/index.html?fodder=dialog', + iframeUrl: settings.routePre + '/widget.images/index.html?fodder=dialog', editor: editor, name: uiName, title: '上传图片', diff --git a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue index e5a8ebc8b..6ad5af636 100644 --- a/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue +++ b/template/admin/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue @@ -47,7 +47,7 @@ export default { }, data(){ return { - homePath: settings.roterPre + '/home', + homePath: settings.routePre + '/home', }; }, methods: { diff --git a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue index 2a4794235..ce4224de4 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue @@ -153,7 +153,7 @@ export default { 'test-dialog', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: settings.roterPre +'/widget.images/index.html?fodder=dialog', + iframeUrl: settings.routePre +'/widget.images/index.html?fodder=dialog', editor: editor, name: uiName, title: '上传图片', diff --git a/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue b/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue index d90ed3264..bffbc31e9 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue @@ -188,7 +188,7 @@ export default { 'test-dialog', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: settings.roterPre + '/widget.images/index.html?fodder=dialog', + iframeUrl: settings.routePre + '/widget.images/index.html?fodder=dialog', editor: editor, name: uiName, title: '上传图片', diff --git a/template/admin/src/components/mobileConfigRightDiy/c_upload_img.vue b/template/admin/src/components/mobileConfigRightDiy/c_upload_img.vue index e3e528871..666224c6f 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_upload_img.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_upload_img.vue @@ -115,7 +115,7 @@ export default { 'test-dialog', function (editor, uiName) { let dialog = new window.UE.ui.Dialog({ - iframeUrl: settings.roterPre + '/widget.images/index.html?fodder=dialog', + iframeUrl: settings.routePre + '/widget.images/index.html?fodder=dialog', editor: editor, name: uiName, title: '上传图片', diff --git a/template/admin/src/components/newsCategory/index.vue b/template/admin/src/components/newsCategory/index.vue index 002424b3d..e5cbaf1d1 100644 --- a/template/admin/src/components/newsCategory/index.vue +++ b/template/admin/src/components/newsCategory/index.vue @@ -18,8 +18,8 @@ - - + + @@ -134,7 +134,7 @@ export default { }, data() { return { - roterPre: settings.roterPre , + routePre: settings.routePre , isDel: false, imgsArr: [], group: 0, // 当前加载的加载图片的次数 @@ -238,7 +238,7 @@ export default { // 编辑 clkk(item) { this.$router.push({ - path: this.roterPre + '/app/wechat/news_category/save/' + item.id, + path: this.routePre + '/app/wechat/news_category/save/' + item.id, }); }, // 鼠标移进 diff --git a/template/admin/src/main.js b/template/admin/src/main.js index 7d76a1f81..bc3eb7fca 100644 --- a/template/admin/src/main.js +++ b/template/admin/src/main.js @@ -90,7 +90,7 @@ Router.prototype.push = function push(location) { }; import settings from '@/setting' -Vue.prototype.$routeProStr = settings.roterPre +Vue.prototype.$routeProStr = settings.routePre // 实际打包时应该不引入mock /* eslint-disable */ diff --git a/template/admin/src/router/modules/agent.js b/template/admin/src/router/modules/agent.js index 27bbbbb1e..54aa461ca 100644 --- a/template/admin/src/router/modules/agent.js +++ b/template/admin/src/router/modules/agent.js @@ -10,14 +10,14 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'agent_'; const meta = { auth: true, }; export default { - path: `${roterPre}/agent`, + path: `${routePre}/agent`, name: 'agent', header: 'agent', redirect: { diff --git a/template/admin/src/router/modules/app.js b/template/admin/src/router/modules/app.js index d71c483fa..863e704ee 100644 --- a/template/admin/src/router/modules/app.js +++ b/template/admin/src/router/modules/app.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'app_'; export default { - path: roterPre + '/app', + path: routePre + '/app', name: 'app', header: 'app', redirect: { diff --git a/template/admin/src/router/modules/cms.js b/template/admin/src/router/modules/cms.js index b7c6c09fc..bd4d681b6 100644 --- a/template/admin/src/router/modules/cms.js +++ b/template/admin/src/router/modules/cms.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'cms_'; export default { - path: roterPre + '/cms', + path: routePre + '/cms', name: 'cms', header: 'cms', redirect: { diff --git a/template/admin/src/router/modules/division.js b/template/admin/src/router/modules/division.js index 5ba37b15b..0e5433e11 100644 --- a/template/admin/src/router/modules/division.js +++ b/template/admin/src/router/modules/division.js @@ -10,14 +10,14 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'division_'; const meta = { auth: true, }; export default { - path: roterPre + '/division', + path: routePre + '/division', name: 'division', header: 'division', redirect: { diff --git a/template/admin/src/router/modules/echarts.js b/template/admin/src/router/modules/echarts.js index 4a12e34e5..fd132afd2 100644 --- a/template/admin/src/router/modules/echarts.js +++ b/template/admin/src/router/modules/echarts.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'echarts_'; export default { - path: roterPre+'/echarts', + path: routePre+'/echarts', name: 'echarts', header: 'echarts', redirect: { diff --git a/template/admin/src/router/modules/finance.js b/template/admin/src/router/modules/finance.js index 6ae0650df..d99a6e126 100644 --- a/template/admin/src/router/modules/finance.js +++ b/template/admin/src/router/modules/finance.js @@ -10,11 +10,11 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'finance_'; export default { - path: roterPre+'/finance', + path: routePre+'/finance', name: 'finance', header: 'finance', meta: { diff --git a/template/admin/src/router/modules/frameOut.js b/template/admin/src/router/modules/frameOut.js index c64cb4d9e..dcf9b72cf 100644 --- a/template/admin/src/router/modules/frameOut.js +++ b/template/admin/src/router/modules/frameOut.js @@ -9,13 +9,13 @@ // +--------------------------------------------------------------------- import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'kefu_'; export default [ // 登录 { - path: roterPre+'/login', + path: routePre+'/login', name: 'login', meta: { title: '登录', diff --git a/template/admin/src/router/modules/index.js b/template/admin/src/router/modules/index.js index ef07f3ba6..25aaa7ce0 100644 --- a/template/admin/src/router/modules/index.js +++ b/template/admin/src/router/modules/index.js @@ -10,7 +10,7 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; // export default { // path: '/', @@ -42,7 +42,7 @@ const meta = { const pre = 'home_'; export default { - path: roterPre + '/', + path: routePre + '/', name: 'home', header: 'home', redirect: { @@ -52,7 +52,7 @@ export default { component: BasicLayout, children: [ { - path: roterPre+'/home/', + path: routePre+'/home/', name: `${pre}index`, header: 'home', meta: { diff --git a/template/admin/src/router/modules/marketing.js b/template/admin/src/router/modules/marketing.js index 76c92bd88..c961c701d 100644 --- a/template/admin/src/router/modules/marketing.js +++ b/template/admin/src/router/modules/marketing.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'marketing_'; export default { - path: roterPre+'/marketing', + path: routePre+'/marketing', name: 'marketing', header: 'marketing', redirect: { diff --git a/template/admin/src/router/modules/order.js b/template/admin/src/router/modules/order.js index 65116706e..066a24f46 100644 --- a/template/admin/src/router/modules/order.js +++ b/template/admin/src/router/modules/order.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'order_'; export default { - path: roterPre+'/order', + path: routePre+'/order', name: 'order', header: 'order', redirect: { diff --git a/template/admin/src/router/modules/product.js b/template/admin/src/router/modules/product.js index bc4e644f3..a5fd405e1 100644 --- a/template/admin/src/router/modules/product.js +++ b/template/admin/src/router/modules/product.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'product_'; export default { - path: roterPre+'/product', + path: routePre+'/product', name: 'product', header: 'product', meta: { diff --git a/template/admin/src/router/modules/setting.js b/template/admin/src/router/modules/setting.js index 00c228677..a93d26daa 100644 --- a/template/admin/src/router/modules/setting.js +++ b/template/admin/src/router/modules/setting.js @@ -10,7 +10,7 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const meta = { auth: true, @@ -19,7 +19,7 @@ const meta = { const pre = 'setting_'; export default { - path: roterPre+'/setting', + path: routePre+'/setting', name: 'setting', header: 'setting', redirect: { diff --git a/template/admin/src/router/modules/statistic.js b/template/admin/src/router/modules/statistic.js index de7691635..2add3335c 100644 --- a/template/admin/src/router/modules/statistic.js +++ b/template/admin/src/router/modules/statistic.js @@ -10,7 +10,7 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const meta = { auth: true, @@ -19,7 +19,7 @@ const meta = { const pre = 'statistic_'; export default { - path: roterPre+'/statistic', + path: routePre+'/statistic', name: 'statistic', header: 'statistic', redirect: { diff --git a/template/admin/src/router/modules/system.js b/template/admin/src/router/modules/system.js index 3e947a9ea..3c04c2c57 100644 --- a/template/admin/src/router/modules/system.js +++ b/template/admin/src/router/modules/system.js @@ -10,12 +10,12 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const pre = 'system_'; export default { - path: roterPre+'/system', + path: routePre+'/system', name: 'system', header: 'system', redirect: { diff --git a/template/admin/src/router/modules/user.js b/template/admin/src/router/modules/user.js index be32a12a0..8a756086b 100644 --- a/template/admin/src/router/modules/user.js +++ b/template/admin/src/router/modules/user.js @@ -10,7 +10,7 @@ import BasicLayout from '@/components/main'; import setting from '@/setting' -let roterPre = setting.roterPre; +let routePre = setting.routePre; const meta = { auth: true, @@ -19,7 +19,7 @@ const meta = { const pre = 'user_'; export default { - path: roterPre+'/user', + path: routePre+'/user', name: 'user', header: 'user', redirect: { diff --git a/template/admin/src/router/routers.js b/template/admin/src/router/routers.js index 1bcc8ba66..d9db9c854 100644 --- a/template/admin/src/router/routers.js +++ b/template/admin/src/router/routers.js @@ -25,7 +25,7 @@ import statistic from './modules/statistic'; import frameOut from './modules/frameOut'; import division from './modules/division'; import settings from '@/setting' -let roterPre = settings.roterPre; +let routePre = settings.routePre; /** * 在主框架内显示 */ @@ -51,7 +51,7 @@ const frameIn = [ // component: () => import('@/pages/system/log') // }, { - path: roterPre+'/system/user', + path: routePre+'/system/user', name: `systemUser`, meta: { auth: true, @@ -60,7 +60,7 @@ const frameIn = [ component: () => import('@/pages/setting/user/index'), }, { - path: roterPre+'/system/files', + path: routePre+'/system/files', name: `systemFiles`, meta: { auth: ['admin-setting-files'], @@ -95,7 +95,7 @@ const frameIn = [ ], }, { - path: roterPre+'/widget.images/index.html', + path: routePre+'/widget.images/index.html', name: `images`, meta: { auth: ['admin-user-user-index'], @@ -104,7 +104,7 @@ const frameIn = [ component: () => import('@/components/uploadPictures/widgetImg'), }, { - path: roterPre+'/widget.widgets/icon.html', + path: routePre+'/widget.widgets/icon.html', name: `imagesIcon`, meta: { auth: ['admin-user-user-index'], @@ -113,7 +113,7 @@ const frameIn = [ component: () => import('@/components/iconFrom/index'), }, { - path: roterPre+'/store.StoreProduct/index.html', + path: routePre+'/store.StoreProduct/index.html', name: `storeProduct`, meta: { title: '选择商品', @@ -121,7 +121,7 @@ const frameIn = [ component: () => import('@/components/goodsList/index'), }, { - path: roterPre+'/system.User/list.html', + path: routePre+'/system.User/list.html', name: `changeUser`, meta: { title: '选择用户', @@ -129,7 +129,7 @@ const frameIn = [ component: () => import('@/components/customerInfo/index'), }, { - path: roterPre+'/widget.video/index.html', + path: routePre+'/widget.video/index.html', name: `video`, meta: { title: '上传视频', @@ -163,7 +163,7 @@ const frameOuts = frameOut; const errorPage = [ { - path: roterPre+'/403', + path: routePre+'/403', name: '403', meta: { title: '403', @@ -171,7 +171,7 @@ const errorPage = [ component: () => import('@/pages/system/error/403'), }, { - path: roterPre+'/500', + path: routePre+'/500', name: '500', meta: { title: '500', @@ -179,7 +179,7 @@ const errorPage = [ component: () => import('@/pages/system/error/500'), }, { - path: roterPre+'/*', + path: routePre+'/*', name: '404', meta: { title: '404', diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js index 514af0160..84a509ef8 100644 --- a/template/admin/src/setting.js +++ b/template/admin/src/setting.js @@ -1,9 +1,9 @@ // 请求接口地址 如果没有配置自动获取当前网址路径 -const VUE_APP_API_URL = 'http://open.net/adminapi' || process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; +const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; const Setting = { // 路由前缀 - roterPre: '/admin', + routePre: '/admin', // 接口请求地址 apiBaseURL: VUE_APP_API_URL, // 路由模式，可选值为 history 或 hash