71

parent ce29dc8b
'use strict'; 'use strict';
const merge = require('webpack-merge'); const merge = require('webpack-merge');
const prodEnv = require('./prod.env'); const prodEnv = require('./prod.env');
const ip = 'http://10.1.23.212:8085/' const ip = 'http://10.1.22.249:8085/'
// const ip = 'http://192.168.31.185:8085/' // const ip = 'http://192.168.31.185:8085/'
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
......
...@@ -20,7 +20,7 @@ module.exports = { ...@@ -20,7 +20,7 @@ module.exports = {
} }
}, },
// Various Dev Server settings // Various Dev Server settings
host: '10.1.23.212', // can be overwritten by process.env.HOST host: '10.1.22.249', // can be overwritten by process.env.HOST
// host: '192.168.31.185', // can be overwritten by process.env.HOST // host: '192.168.31.185', // can be overwritten by process.env.HOST
// host: 'localhost', // can be overwritten by process.env.HOST // host: 'localhost', // can be overwritten by process.env.HOST
port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
......
...@@ -55,10 +55,6 @@ router.beforeEach((to, from, next) => { ...@@ -55,10 +55,6 @@ router.beforeEach((to, from, next) => {
if (document.documentElement !== null) { if (document.documentElement !== null) {
document.documentElement.scrollTop = 0 document.documentElement.scrollTop = 0
} }
// // safari
// if (window.pageYOffset !== undefined){
// window.pageYOffset = 0
// }
}) })
new Vue({ new Vue({
el: '#app', el: '#app',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment