address-client 3.2.7 → 3.2.8-zk

package/build/dev-server.js

@@ -1,125 +1,151 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8080', str2= 'http://192.168.50.4:8400/'
-var proxyTable = {
-
-  '/rs/logic/getLogin': {
-    target: str2
-  },
-  '/rs/vue': {
-    target: str2
-  },
-  '/rs/user': {
-    target: str2
-  },
-  '/rs/db': {
-    target: str2
-  },
-  '/rs/search': {
-    target: str2
-  },
-  '/rs/data': {
-    target: str2
-  },
-  '/rs/logic/getInitData': {
-    target: str2
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str2
-  },
-  '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+// var bendi = 'http://127.0.0.1:8080', fuwu= 'http://192.168.20.28:8400'
+// var bendi = 'http://192.168.20.28:8400', fuwu= 'http://192.168.20.28:8400'
+var bendi = 'http://192.168.20.27:8400', fuwu= 'http://192.168.20.27:8400'
+// var bendi = 'http://61.163.127.69:8557/', fuwu= 'http://61.163.127.69:8557/'
+var proxyTable = {
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  '/rs/sql/address_getAddress': {
+    target: bendi
+  },
+  '/rs/sql/address_singleTableOrderBy': {
+    target: bendi
+  },
+  '/rs/logic/address_updateuseraddress': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/rs/search': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/exportfile': {
+    target: fuwu
+  },
+  '/rs/logic/getBatchOperaPro': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/rs/logic/address_useraddressimport': {
+    target: bendi
+  },
+  '/rs/sql': {
+    target: bendi
+  },
+  '/rs/logic': {
+    target: bendi
+  },
+  '/rs': {
+    // target: 'http://192.168.50.199:8300'
+    target: fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({ action: 'reload' })
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = { target: options }
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.7",
+  "version": "3.2.8-zk",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -80,7 +80,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.1.88-5",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.27",
+    "vue-client": "1.24.31",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -95,5 +95,10 @@
     "webpack-merge": "^0.8.3",
     "jsencrypt": "3.0.0-rc.1",
     "axios": "0.15.3"
+  },
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
   }
 }

package/src/address.js

@@ -46,10 +46,10 @@ export default function (filiale) {
   //批量置换接单
   Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
   // 分公司特殊页面注册替换
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
+  // if (filiale) {
+  //   let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+  //   for (let key in filialeComp) {
+  //     Vue.component(key, filialeComp[key])
+  //   }
+  // }
 }