hace 4 años · f6f85daa98
--- a/qmx_page_admin/css/app.c878ce04.css
+++ b/qmx_page_admin/css/app.c878ce04.css
--- a/qmx_page_admin/css/chunk-vendors.784fa8c1.css
+++ b/qmx_page_admin/css/chunk-vendors.784fa8c1.css
--- a/qmx_page_admin/favicon.ico
+++ b/qmx_page_admin/favicon.ico
--- a/qmx_page_admin/fonts/ionicons.143146fa.woff2
+++ b/qmx_page_admin/fonts/ionicons.143146fa.woff2
--- a/qmx_page_admin/fonts/ionicons.99ac3308.woff
+++ b/qmx_page_admin/fonts/ionicons.99ac3308.woff
--- a/qmx_page_admin/fonts/ionicons.d535a25a.ttf
+++ b/qmx_page_admin/fonts/ionicons.d535a25a.ttf
--- a/qmx_page_admin/img/404.f73c7d45.png
+++ b/qmx_page_admin/img/404.f73c7d45.png
--- a/qmx_page_admin/img/bg_1.9150a718.png
+++ b/qmx_page_admin/img/bg_1.9150a718.png
--- a/qmx_page_admin/img/ionicons.a2c4a261.svg
+++ b/qmx_page_admin/img/ionicons.a2c4a261.svg
--- a/qmx_page_admin/img/login_logo.49667054.png
+++ b/qmx_page_admin/img/login_logo.49667054.png
--- a/qmx_page_admin/index.html
+++ b/qmx_page_admin/index.html
@@ -0,0 +1 @@
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.c878ce04.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.eeed2944.js rel=preload as=script><link href=/js/chunk-vendors.fb030ece.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.c878ce04.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.fb030ece.js></script><script src=/js/app.eeed2944.js></script></body></html>
			
--- a/qmx_page_admin/js/app.eeed2944.js
+++ b/qmx_page_admin/js/app.eeed2944.js
--- a/qmx_page_admin/js/chunk-vendors.fb030ece.js
+++ b/qmx_page_admin/js/chunk-vendors.fb030ece.js
--- a/src/qiankun.js
+++ b/src/qiankun.js
@@ -1,14 +1,10 @@
 
				 import { registerMicroApps, start } from 'qiankun';
			
 
				-const name = sessionStorage.getItem('userName');
			
 
				 registerMicroApps([
			
 
				   {
			
 
				     name: 'marketing',
			
 
				     entry: '/page_marketing/',
			
 
				     container: '#marketing',
			
 
				-    activeRule: '/page_marketing',
			
 
				-    props:{
			
 
				-      userName: name
			
 
				-    }
			
 
				+    activeRule: '/marketing'
			
 
				   }
			
 
				 ]);
			
 
				 
			
--- a/src/router-market.js
+++ b/src/router-market.js
@@ -1,28 +0,0 @@
 
				-const marketRouter = [
			
 
				-  {
			
 
				-    path: '/page_marketing/activity-list', // 活动-列表
			
 
				-    name: 'activity-list'
			
 
				-  },
			
 
				-  {
			
 
				-    path: '/page_marketing/activity-add', // 活动-新增
			
 
				-    name: 'activity-add'
			
 
				-  },
			
 
				-  {
			
 
				-    path: '/page_marketing/activity-edit', // 活动-编辑
			
 
				-    name: 'activity-edit'
			
 
				-  },
			
 
				-  {
			
 
				-    path:'/page_marketing/addTicket',
			
 
				-    name:'addTicket'
			
 
				-  },
			
 
				-  {
			
 
				-    path:'/page_marketing/ticketDetail',
			
 
				-    name:'ticketDetail'
			
 
				-  },
			
 
				-  {
			
 
				-    path:'/page_marketing/ticketEdit',
			
 
				-    name:'ticketEdit'
			
 
				-  }
			
 
				-]
			
 
				-
			
 
				-export default marketRouter
			
--- a/src/router.js
+++ b/src/router.js
@@ -2,7 +2,6 @@ import Vue from 'vue'
 
				 import Router from 'vue-router'
			
 
				 import {config, trim} from './helper'
			
 
				 import _ from "lodash";
			
 
				-import marketRouter from './router-market.js'
			
 
				 
			
 
				 // 默认title
			
 
				 document.title = config('SITE_NAME');
			
@@ -16,18 +15,10 @@ const routes = [
 
				         name: 'index',
			
 
				         component: () => import('./views/index.vue')
			
 
				     },
			
 
				-    {
			
 
				-        path: '*',
			
 
				-        component: () => import('./views/error.vue')
			
 
				-    },
			
 
				-    {
			
 
				-        path: '/page_marketing',
			
 
				-        name: 'page_marketing'
			
 
				-    },
			
 
				-    {
			
 
				-        path:'/page_marketing/ticketList',
			
 
				-        name:'ticketList'
			
 
				-    },
			
 
				+    // {
			
 
				+    //     path: '*',
			
 
				+    //     component: () => import('./views/error.vue')
			
 
				+    // },
			
 
				     {
			
 
				         path: '/sales/partnerList/partnerDetail',
			
 
				         name: 'partnerDetail',
			
@@ -75,7 +66,7 @@ Vue.use(Router);
 
				 
			
 
				 const router = new Router({
			
 
				     mode: 'history',
			
 
				-    routes: [...routes, ...marketRouter]
			
 
				+    routes: routes
			
 
				 });
			
 
				 
			
 
				 const originalPush = Router.prototype.push
			
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
 
				 const webpack = require('webpack')
			
 
				 module.exports = {
			
 
				   publicPath: '/',
			
 
				-  outputDir: "dist",
			
 
				+  outputDir: "qmx_page_admin",
			
 
				   productionSourceMap: false,
			
 
				   configureWebpack: {
			
 
				     plugins: [