zhuxiuping 2 gadi atpakaļ
vecāks
revīzija
252f9540eb

+ 1 - 2
config/index.js

@@ -66,8 +66,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/sqx_fast/shanghu-admin',
-    // assetsPublicPath: './',
+    assetsPublicPath: '/shanghuAdmin',
 
     /**
      * Source Maps

BIN
dist.zip


+ 1 - 1
index.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=miP4RMG1yZoROVRSqTPghvUaRb68iGUB"></script> -->
-  <title>同城外卖3.0商户端PC系统</title>
+  <title>墨轩云商商户PC端</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <!-- 生产环境 -->
     <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

BIN
src/assets/fonts/优设标题圆.otf


BIN
src/assets/img/avatar.png


BIN
src/assets/img/login_bg.jpg


+ 6 - 0
src/assets/styles/fonts.css

@@ -0,0 +1,6 @@
+@font-face {
+    /* 时钟样式 细*/
+    font-family: 'youshe'; 
+     /* 优设标题圆 */
+    src: url("../fonts/优设标题圆.otf");
+}

+ 1 - 0
src/main.js

@@ -9,6 +9,7 @@ import '@/element-ui-theme'
 import '@/assets/scss/index.scss'
 import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios
 import '@/mock/modules/sys-menu.js'
+import '@/assets/styles/fonts.css' //字体样式
 import {
   isAuth
 } from '@/utils'

+ 1 - 2
src/router/index.js

@@ -126,8 +126,7 @@ const mainRoutes = {
 }
 
 const router = new Router({
-  mode: 'history', //  hash
-  base: '/',
+  mode: 'hash', //  hash
   scrollBehavior(to,from,savedPosition){
 
   if (savedPosition){

+ 2 - 2
src/utils/httpRequest.js

@@ -44,7 +44,7 @@ http.interceptors.response.use(response => {
 http.adornUrl = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-// return 'http://192.168.0.128:8176/sqx_fast/' + actionName
+// return 'https://chtech.ncjti.edu.cn/testingServer/waiMaiAdmin/' + actionName}
 	return 'https://www.daweilinli.com/sqx_fast/' + actionName}
 
 http.adornUrl2 = (actionName) => {
@@ -55,7 +55,7 @@ http.adornUrl2 = (actionName) => {
 http.adornUrlMsg = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-// return 'http://192.168.0.119:8171/sqx_fast/' + actionName
+// return 'https://chtech.ncjti.edu.cn/testingServer/waiMaiAdmin/' + actionName}
 	return 'https://www.daweilinli.com/sqx_fast/' + actionName}
 http.adornWss = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!

+ 31 - 2
src/views/common/login.vue

@@ -2,8 +2,11 @@
 	<div class="site-wrapper site-page--login">
 		<div class="site-content__wrapper">
 			<div class="site-content">
+				<div class="titleimg"></div>
+				<div class="title1">墨轩云商商户系统</div>
+				<div class="title2">欢迎使用墨轩云商商户管理平台</div>
 				<div class="login-main">
-					<h3 class="login-title">墨轩云商商户PC端</h3>
+					<h3 class="login-title">登录</h3>
 					<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
 						status-icon>
 						<el-form-item prop="userName">
@@ -219,6 +222,32 @@
 			min-height: 100%;
 			// padding: 30px 500px 30px 30px;
 		}
+		.titleimg{
+			margin-left: 47px;
+			margin-top: 39px;
+			width: 56px;
+			height: 56px;
+			background-image: url('../../assets/img/avatar.png');
+			background-size: 100%;
+		}
+		.title1{
+			margin-left: 125px;
+			margin-top: -50px;
+			font-size: 29px;
+			font-weight: 500;
+			line-height: 42px;
+			color: rgba(0, 0, 0, 1);
+		}
+		.title2{
+			margin-left: 262px;
+			margin-top: 69px;
+			font-size: 59.15px;
+			font-weight: 400;
+			letter-spacing: 0px;
+			line-height: 76.9px;
+			color: rgba(62, 99, 194, 1);
+			font-family: 'youshe';
+		}
 
 		.brand-info {
 			margin: 220px 100px 0 90px;
@@ -243,7 +272,7 @@
 			position: absolute;
 			top: 50%;
 			left: 50%;
-			margin-left: -200px;
+			margin-left: 100px;
 			margin-top: -150px;
 			padding: 20px 30px;
 			width: 400px;

+ 1 - 1
src/views/main-navbar.vue

@@ -2,7 +2,7 @@
 	<nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
 		<div class="site-navbar__header">
 			<h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
-				<a class="site-navbar__brand-lg" href="javascript:;">墨轩云商商户PC端</a>
+				<a class="site-navbar__brand-lg" href="javascript:;">墨轩云商商户管理平台</a>
 				<a class="site-navbar__brand-mini" href="javascript:;">
 					<img src="~@/assets/img/avatar.png" style="width: 25px;border-radius: 50%;">
 				</a>