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

build/webpack.dev.conf.js

@@ -34,7 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     host: HOST || config.dev.host,
     // host: '192.168.3.6',
-    //host: '192.168.0.101',
+    // host: '192.168.0.105',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

config/index.js

@@ -5,9 +5,9 @@
 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.241:5050';
+// const proxy_path = 'http://192.168.2.241:5050';
 // const proxy_path = 'http://223.93.170.82:23650';
-// const proxy_path = 'http://223.93.170.82:24182';
+const proxy_path = 'http://223.93.170.82:24182';
 
 module.exports = {
   dev: {

src/store.js

@@ -123,6 +123,7 @@ const store = new Vuex.Store({
         text:[],
         txtDoc:''
       }
+      state.addBuriedSomeList=[]//买点数据
     },
     setDetail(state,param){//明细
       const detail = param.detail;