Merge remote-tracking branch 'origin/newVersion' into newVersion

# Conflicts:
#	config/index.js

build/webpack.dev.conf.js

@@ -32,9 +32,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     // openPage:'?hospitalCode=A001&hospitalDeptCode=D01&doctorCode=YS001&patientCode=1600&recordId=44',//携带参数
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
-    // host: HOST || config.dev.host,
+    host: HOST || config.dev.host,
     // host: '192.168.3.6',
-    //host: '192.168.3.106',
+    host: '192.168.0.101',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

config/index.js

@@ -5,7 +5,7 @@
 const path = require('path')
 // const proxy_path = 'http://192.168.2.236:80';
 // const proxy_path = 'http://192.168.2.236:5050';
-const proxy_path = 'http://192.168.2.236:5050';
+const proxy_path = 'http://192.168.2.241:5050';
 // const proxy_path = 'http://223.93.170.82:23650';
 
 module.exports = {

src/common/HomePage.vue

@@ -42,6 +42,7 @@ export default {
   },
   methods:{
     close(){
+      localStorage.setItem('startPage',0)
       this.show = false
     },
     getDisclaimerInformations(){