address-client 3.2.88 → 3.2.89

package/build/dev-server.js

@@ -10,85 +10,85 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'https://qnjtkf.cn:8401/#', str2 = 'https://qnjtkf.cn:8401/#'
-var str3 = 'https://qnjtkf.cn:8401/#'
+var str = 'http://192.168.50.4:8400', str2= 'http://192.168.50.4:8400/'
+var str3= 'http://192.168.50.4:8400/'
 var proxyTable = {
-  // '/rs/entity': {
-  //   target: str3
-  //   // secure:true,
-  //   // changeOrigin:true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/webapps': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getLogin': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/logic/getInitData': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/logic/getSaleInitData': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // // '/rs/logic':{
-  // //   target: str3,
-  // //   secure:true,
-  // //   changeOrigin:true
-  // //   // target: 'http://127.0.0.1:8080'
-  // // },
-  // '/rs/vue': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/user': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/db': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/search': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/data': {
+  '/rs/entity': {
+    target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic/getLogin': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  // '/rs/logic':{
   //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/sql': {
-  //   target: str
-  //   // secure: true,
-  //   // changeOrigin:true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic': {
-  //   target: str
-  //   // secure: true,
-  //   // changeOrigin:true
+  //   secure:true,
+  //   changeOrigin:true
   //   // target: 'http://127.0.0.1:8080'
   // },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/user': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/db': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/sql': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
     target: str3,
-    secure: true,
-    changeOrigin: true
+    secure:true,
+    changeOrigin:true
   }
 }
 
@@ -104,7 +104,7 @@ 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'})
+    hotMiddleware.publish({ action: 'reload' })
     cb()
   })
 })
@@ -113,7 +113,7 @@ compiler.plugin('compilation', function (compilation) {
 Object.keys(proxyTable).forEach(function (context) {
   var options = proxyTable[context]
   if (typeof options === 'string') {
-    options = {target: options}
+    options = { target: options }
   }
   app.use(proxyMiddleware(context, options))
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.88",
+  "version": "3.2.89",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/App.vue

@@ -1,60 +1,16 @@
-<template>
-  <app-base class="bg" @click="isTimeOut">
-    <div class='flex'>
-      <article>
-        <route :comp="{name: 'login'}"></route>
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-import Vue from 'vue'
-export default {
-  data () {
-    return {
-      lastTime: null, // 最后一次点击的时间
-      currentTime: null, // 当前点击的时间
-      // 获取一次不在获取控制
-      getConfig: false,
-      config: {
-        timeOut: 0, // 单位: 分钟
-        exitPrompt: '因您长时间未操作, 请重新登陆!'
-      },
-    }
-  },
-  ready () {
-    Vue.mmType = 'nginx'
-    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
-  },
-  created () {
-    this.lastTime = new Date().getTime()
-  },
-  methods: {
-    async isTimeOut () {
-      // 获取config配置
-      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
-        await this.$getConfig(this, 'App')
-        this.getConfig = true
-      }
-      // 无配置,不开启
-      if (this.config.timeOut <= 0) return
-      // 记录这次点击的时间
-      this.currentTime = new Date().getTime()
-      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
-      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
-        // 如果是登录状态
-        if (this.$login.f.id) {
-          await this.$showMessage(this.config.exitPrompt)
-          window.location.reload()
-        } else {
-          this.lastTime = new Date().getTime()
-        }
-      } else {
-        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
-        this.lastTime = new Date().getTime()
-      }
-    }
-  }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'login'}"></route>
+        <!--<address-model :isshow="true" :isbasch="false"></address-model>-->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+  export default {
+
+  }
+</script>

package/src/address.js

@@ -1,65 +1,65 @@
-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('building-list', (resolve) => { require(['./components/BuildingList'], 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) })
-  // 地址管理琉璃
-  Vue.component('address-list-liuli', (resolve) => { require(['./components/AddressListLiuLi'], resolve) })
-  // 街道办管理
-  Vue.component('street-manage-manage', (resolve) => { require(['./components/StreetManage'], resolve) })
-  // 街道办列表
-  Vue.component('street-manage-list', (resolve) => { require(['./components/StreetManageList'], resolve) })
-  // 新增/修改 街道办信息
-  Vue.component('add-street-manage-msg', (resolve) => { require(['./components/AddStreetManageMsg'], 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('building-list', (resolve) => { require(['./components/BuildingList'], 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) })
+  // 地址管理琉璃
+  Vue.component('address-list-liuli', (resolve) => { require(['./components/AddressListLiuLi'], resolve) })
+  // 街道办管理
+  Vue.component('street-manage-manage', (resolve) => { require(['./components/StreetManage'], resolve) })
+  // 街道办列表
+  Vue.component('street-manage-list', (resolve) => { require(['./components/StreetManageList'], resolve) })
+  // 新增/修改 街道办信息
+  Vue.component('add-street-manage-msg', (resolve) => { require(['./components/AddStreetManageMsg'], resolve) })
+  // 分公司特殊页面注册替换
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}