dujingxian %!s(int64=4) %!d(string=hai) anos
pai
achega
ad332ac0ae
Modificáronse 4 ficheiros con 17 adicións e 6 borrados
  1. 13 2
      src/pages/login.vue
  2. 2 2
      src/pages/subPages/view.vue
  3. 2 1
      src/router/index.js
  4. 0 1
      vue.config.js

+ 13 - 2
src/pages/login.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- <el-container :style="'height:100%;background:url('+LoginBg+');background-size:cover;'"> -->
-  <el-container :style="'height:100%;background:url(../assets/login.jpg);background-size:cover;'">
+  <el-container>
     <el-row type="flex" style="width:100%;height:100%;" justify="center" align="middle">
       <el-card style="width:400px;height:300px;" shadow="always">
         <div slot="header" class="clearfix">
@@ -37,7 +37,7 @@
 </template>
 <script>
 // import LoginBg from "@/assets/login.jpg";
-const LoginBg = require('@/assets/login.jpg');
+const LoginBg = require('../assets/login.jpg');
 import { login } from "@/api";
 import { setUser } from '@/utils/auth'
 export default {
@@ -86,6 +86,17 @@ export default {
 };
 </script>
 <style scoped>
+.el-container {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-image: url("../assets/login.jpg");
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+}
 .login_container {
   width: 90%;
 }

+ 2 - 2
src/pages/subPages/view.vue

@@ -28,9 +28,9 @@
             <el-button type="primary" size="small" @click="updateKey">确定</el-button>
         </el-form-item>
         <el-form-item label="ip白名单:" >
-            <div v-for="item in ipList" :key="item">
+            <div v-for="(item, idx) in ipList" :key="item">
                 <el-input style="width: 300px;margin-bottom: 10px;margin-right: 10px;" :value="item"></el-input>
-                <i v-if="item === '172.22.0.1'" class="el-icon-circle-plus-outline" style="color:#409EFF;" @click="add"></i>
+                <i v-if="idx == 0" class="el-icon-circle-plus-outline" style="color:#409EFF;" @click="add"></i>
                 <i v-else class="el-icon-remove-outline" style="color:#F56C6C;" @click="del(item)"></i>
             </div>
         </el-form-item>

+ 2 - 1
src/router/index.js

@@ -70,7 +70,8 @@ Vue.use(VueRouter)
 
 const router = new VueRouter({
   routes,
-  mode: 'history'
+  mode: 'hash',
+  base: '/merchant'
 })
 
 router.beforeEach((to,from,next)=>{

+ 0 - 1
vue.config.js

@@ -8,7 +8,6 @@ const targetUrl = 'https://www.xyzshops.cn/'
 
 module.exports = {
     publicPath:'./',
-    // publicPath:'../../',
     productionSourceMap: false,
     pages: {
         index: {