address-client 3.2.5 → 3.2.7-zk

package/build/dev-server.js

@@ -10,17 +10,21 @@ 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:8079/'
-// 公司测试服务
-// var fuwu = 'http://192.168.50.4:8400'
-var fuwu = 'http://172.168.1.11:8400'
-var str = 'http://127.0.0.1:8078',
-  str2= 'http://172.168.1.11:9001/'
+// 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 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
   },
@@ -39,9 +43,24 @@ var proxyTable = {
   '/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.5",
+  "version": "3.2.7-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])
+  //   }
+  // }
 }