address-client 3.2.5 → 3.2.6-zk

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Jun 29 10:09:57 CST 2021
-gradle.version=6.1
+#Mon Dec 07 15:35:10 CST 2020
+gradle.version=5.2.1

package/build/dev-server.js

@@ -10,17 +10,20 @@ 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://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 +42,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.6-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",

package/src/address.js

@@ -1,55 +1,55 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-// import 'babel-polyfill'
-
-export default function (filiale) {
-  Vue.config.silent = false
-  /** ********************** pc端 *********************** **/
-  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
-  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
-// 添加地址
-  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
-//  地址树
-  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
-  //小区树
-  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
-  /** ********************** 新地址管理 *********************** **/
-  //地址建档
-  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
-  //小区建档
-  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
-  //街道列表
-  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
-  //省市区列表
-  Vue.component('city-list', (resolve) => { require(['./components/CityList'], resolve) })
-  //街道管理（包含街道，省区县的添加）
-  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
-  //街道区县添加
-  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
-  //小区列表
-  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
-  //小区管理（包含修改表具，小区的添加）
-  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
-  //单位管理（）
-  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
-  //小区添加
-  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
-  //地址管理父组件
-  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
-  //地址列表
-  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
-  //地址管理
-  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
-  //地址变更记录
-  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
-  //批量置换接单
-  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])
-    }
-  }
-}
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import 'babel-polyfill'
+
+export default function (filiale) {
+  Vue.config.silent = false
+  /** ********************** pc端 *********************** **/
+  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
+  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
+// 添加地址
+  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
+//  地址树
+  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
+  //小区树
+  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
+  /** ********************** 新地址管理 *********************** **/
+  //地址建档
+  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
+  //小区建档
+  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
+  //街道列表
+  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
+  //省市区列表
+  Vue.component('city-list', (resolve) => { require(['./components/CityList'], resolve) })
+  //街道管理（包含街道，省区县的添加）
+  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
+  //街道区县添加
+  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
+  //小区列表
+  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
+  //小区管理（包含修改表具，小区的添加）
+  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
+  //单位管理（）
+  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
+  //小区添加
+  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
+  //地址管理父组件
+  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
+  //地址列表
+  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
+  //地址管理
+  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
+  //地址变更记录
+  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
+  //批量置换接单
+  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])
+  //   }
+  // }
+}