address-client 3.2.4 → 3.2.5-gongyi

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,126 +1,125 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- var str = 'http://127.0.0.1:8090', str2= 'http://192.168.0.227:8400/'
14
- // var str = 'http://127.0.0.1:8090', str2= 'http://39.98.189.166:8300'
15
- var proxyTable = {
16
-
17
- '/rs/logic/getLogin': {
18
- target: str2
19
- },
20
- '/rs/vue': {
21
- target: str2
22
- },
23
- '/rs/user': {
24
- target: str2
25
- },
26
- '/rs/db': {
27
- target: str2
28
- },
29
- '/rs/search': {
30
- target: str2
31
- },
32
- '/rs/data': {
33
- target: str2
34
- },
35
- '/rs/logic/getInitData': {
36
- target: str2
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: str2
40
- },
41
- '/rs': {
42
- // target: 'http://192.168.50.199:8300'
43
- target: str2
44
- }
45
- }
46
-
47
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
48
- publicPath: config.output.publicPath,
49
- stats: {
50
- colors: true,
51
- chunks: false
52
- }
53
- })
54
-
55
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
56
- // force page reload when html-webpack-plugin template changes
57
- compiler.plugin('compilation', function (compilation) {
58
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
59
- hotMiddleware.publish({ action: 'reload' })
60
- cb()
61
- })
62
- })
63
-
64
- // proxy api requests
65
- Object.keys(proxyTable).forEach(function (context) {
66
- var options = proxyTable[context]
67
- if (typeof options === 'string') {
68
- options = { target: options }
69
- }
70
- app.use(proxyMiddleware(context, options))
71
- })
72
-
73
- // handle fallback for HTML5 history API
74
- app.use(require('connect-history-api-fallback')())
75
-
76
- // serve webpack bundle output
77
- app.use(devMiddleware)
78
-
79
- // enable hot-reload and state-preserving
80
- // compilation error display
81
- app.use(hotMiddleware)
82
-
83
- // serve pure static assets
84
- app.use('/static', express.static('./static'))
85
-
86
- // app.all('/rs/*', function (req, res) {
87
- // proxy.web(req, res, {
88
- // target: 'http://127.0.0.1:8081/reports'
89
- // })
90
- // })
91
-
92
- // app.all('/rs/*', function (req, res) {
93
- // proxy.web(req, res, {
94
- // target: 'http://127.0.0.1:8081/ldap'
95
- // })
96
- // })
97
- // app.all('/excel/*', function (req, res) {
98
- // proxy.web(req, res, {
99
- // target: 'http://127.0.0.1:8081/charge'
100
- // })
101
- // })
102
-
103
- // app.all('/rs/*', function (req, res) {
104
- // proxy.web(req, res, {
105
- // target: 'http://127.0.0.1:82/charge'
106
- // })
107
- // })
108
-
109
- // app.all('/*', function (req, res) {
110
- // proxy.web(req, res, {
111
- // target: 'http://127.0.0.1:82'
112
- // })
113
- // })
114
- // app.all('/rs/user', function (req, res) {
115
- // proxy.web(req, res, {
116
- // target: 'http://127.0.0.1:82'
117
- // })
118
- // })
119
-
120
- module.exports = app.listen(8086, function (err) {
121
- if (err) {
122
- console.log(err)
123
- return
124
- }
125
- console.log('Listening at http://localhost:8085')
126
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
14
+ var proxyTable = {
15
+
16
+ '/rs/logic/getLogin': {
17
+ target: str2
18
+ },
19
+ '/rs/vue': {
20
+ target: str2
21
+ },
22
+ '/rs/user': {
23
+ target: str2
24
+ },
25
+ '/rs/db': {
26
+ target: str2
27
+ },
28
+ '/rs/search': {
29
+ target: str2
30
+ },
31
+ '/rs/data': {
32
+ target: str2
33
+ },
34
+ '/rs/logic/getInitData': {
35
+ target: str2
36
+ },
37
+ '/rs/logic/getSaleInitData': {
38
+ target: str2
39
+ },
40
+ '/rs': {
41
+ // target: 'http://192.168.50.199:8300'
42
+ target: str
43
+ }
44
+ }
45
+
46
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
47
+ publicPath: config.output.publicPath,
48
+ stats: {
49
+ colors: true,
50
+ chunks: false
51
+ }
52
+ })
53
+
54
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
55
+ // force page reload when html-webpack-plugin template changes
56
+ compiler.plugin('compilation', function (compilation) {
57
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
58
+ hotMiddleware.publish({ action: 'reload' })
59
+ cb()
60
+ })
61
+ })
62
+
63
+ // proxy api requests
64
+ Object.keys(proxyTable).forEach(function (context) {
65
+ var options = proxyTable[context]
66
+ if (typeof options === 'string') {
67
+ options = { target: options }
68
+ }
69
+ app.use(proxyMiddleware(context, options))
70
+ })
71
+
72
+ // handle fallback for HTML5 history API
73
+ app.use(require('connect-history-api-fallback')())
74
+
75
+ // serve webpack bundle output
76
+ app.use(devMiddleware)
77
+
78
+ // enable hot-reload and state-preserving
79
+ // compilation error display
80
+ app.use(hotMiddleware)
81
+
82
+ // serve pure static assets
83
+ app.use('/static', express.static('./static'))
84
+
85
+ // app.all('/rs/*', function (req, res) {
86
+ // proxy.web(req, res, {
87
+ // target: 'http://127.0.0.1:8081/reports'
88
+ // })
89
+ // })
90
+
91
+ // app.all('/rs/*', function (req, res) {
92
+ // proxy.web(req, res, {
93
+ // target: 'http://127.0.0.1:8081/ldap'
94
+ // })
95
+ // })
96
+ // app.all('/excel/*', function (req, res) {
97
+ // proxy.web(req, res, {
98
+ // target: 'http://127.0.0.1:8081/charge'
99
+ // })
100
+ // })
101
+
102
+ // app.all('/rs/*', function (req, res) {
103
+ // proxy.web(req, res, {
104
+ // target: 'http://127.0.0.1:82/charge'
105
+ // })
106
+ // })
107
+
108
+ // app.all('/*', function (req, res) {
109
+ // proxy.web(req, res, {
110
+ // target: 'http://127.0.0.1:82'
111
+ // })
112
+ // })
113
+ // app.all('/rs/user', function (req, res) {
114
+ // proxy.web(req, res, {
115
+ // target: 'http://127.0.0.1:82'
116
+ // })
117
+ // })
118
+
119
+ module.exports = app.listen(8085, function (err) {
120
+ if (err) {
121
+ console.log(err)
122
+ return
123
+ }
124
+ console.log('Listening at http://localhost:8085')
125
+ })
package/package.json CHANGED
@@ -1,99 +1,99 @@
1
- {
2
- "name": "address-client",
3
- "version": "3.2.4",
4
- "description": "地址管理前台组件",
5
- "author": "wanbochao",
6
- "license": "ISC",
7
- "main": "src/index.js",
8
- "keywords": [
9
- "sale"
10
- ],
11
- "scripts": {
12
- "unit": "karma start test/unit/karma.conf.js",
13
- "example": "node build/example-server.js",
14
- "dev": "node build/dev-server.js",
15
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
- "e2e": "node test/e2e/runner.js",
18
- "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
19
- "release": "bash build/release.sh"
20
- },
21
- "repository": {
22
- "type": "git",
23
- "url": "https://gitee.com/aote/address_management.git"
24
- },
25
- "dependencies": {
26
- "less-loader": "^2.2.3",
27
- "vue": "^1.0.17"
28
- },
29
- "devDependencies": {
30
- "babel-core": "^6.0.0",
31
- "babel-loader": "^6.0.0",
32
- "babel-plugin-transform-runtime": "^6.0.0",
33
- "babel-preset-es2015": "^6.0.0",
34
- "babel-preset-stage-2": "^6.0.0",
35
- "chai": "^3.5.0",
36
- "co": "^4.6.0",
37
- "connect-history-api-fallback": "^1.1.0",
38
- "cross-env": "^1.0.7",
39
- "cross-spawn": "^2.1.5",
40
- "css-loader": "^0.23.0",
41
- "echarts": "^4.1.0",
42
- "eslint": "^2.0.0",
43
- "eslint-config-standard": "^5.1.0",
44
- "eslint-friendly-formatter": "^1.2.2",
45
- "eslint-loader": "^1.3.0",
46
- "eslint-plugin-html": "^1.3.0",
47
- "eslint-plugin-promise": "^1.0.8",
48
- "eslint-plugin-standard": "^1.3.2",
49
- "eslint-plugin-vue": "^0.1.1",
50
- "eventsource-polyfill": "^0.9.6",
51
- "express": "^4.13.3",
52
- "extract-text-webpack-plugin": "^1.0.1",
53
- "file-loader": "^0.8.4",
54
- "function-bind": "^1.0.2",
55
- "html-webpack-plugin": "^2.8.1",
56
- "http-proxy-middleware": "^0.11.0",
57
- "inject-loader": "^2.0.1",
58
- "isparta-loader": "^2.0.0",
59
- "jasmine-core": "^2.4.1",
60
- "jquery": "^3.3.1",
61
- "json-loader": "^0.5.4",
62
- "karma": "^1.4.1",
63
- "karma-chrome-launcher": "^2.2.0",
64
- "karma-coverage": "^1.1.1",
65
- "karma-mocha": "^1.3.0",
66
- "karma-sinon-chai": "^1.3.1",
67
- "karma-sourcemap-loader": "^0.3.7",
68
- "karma-spec-reporter": "0.0.31",
69
- "karma-webpack": "^2.0.2",
70
- "less": "^2.7.3",
71
- "mkdirp": "^0.5.1",
72
- "mocha": "^3.2.0",
73
- "ncp": "^2.0.0",
74
- "rimraf": "^2.5.0",
75
- "sale-client": "3.2.11-17",
76
- "selenium-server": "2.52.0",
77
- "sinon": "^2.1.0",
78
- "sinon-chai": "^2.8.0",
79
- "style": "0.0.3",
80
- "style-loader": "^0.20.3",
81
- "system-clients": "3.1.88-5",
82
- "url-loader": "^0.5.7",
83
- "vue-client": "1.24.27",
84
- "vue-hot-reload-api": "^1.2.0",
85
- "vue-html-loader": "^1.0.0",
86
- "vue-loader": "^8.2.1",
87
- "vue-resource": "^1.5.0",
88
- "vue-router": "^0.7.13",
89
- "vue-strap": "^1.0.9",
90
- "vue-style-loader": "^1.0.0",
91
- "vue-validator": "2.1.7",
92
- "webpack": "^1.12.2",
93
- "webpack-dev-middleware": "^1.4.0",
94
- "webpack-hot-middleware": "^2.6.0",
95
- "webpack-merge": "^0.8.3",
96
- "jsencrypt": "3.0.0-rc.1",
97
- "axios": "0.15.3"
98
- }
99
- }
1
+ {
2
+ "name": "address-client",
3
+ "version": "3.2.5-gongyi",
4
+ "description": "地址管理前台组件",
5
+ "author": "wanbochao",
6
+ "license": "ISC",
7
+ "main": "src/index.js",
8
+ "keywords": [
9
+ "sale"
10
+ ],
11
+ "scripts": {
12
+ "unit": "karma start test/unit/karma.conf.js",
13
+ "example": "node build/example-server.js",
14
+ "dev": "node build/dev-server.js",
15
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
+ "e2e": "node test/e2e/runner.js",
18
+ "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
19
+ "release": "bash build/release.sh"
20
+ },
21
+ "repository": {
22
+ "type": "git",
23
+ "url": "https://gitee.com/aote/address_management.git"
24
+ },
25
+ "dependencies": {
26
+ "less-loader": "^2.2.3",
27
+ "vue": "^1.0.17"
28
+ },
29
+ "devDependencies": {
30
+ "babel-core": "^6.0.0",
31
+ "babel-loader": "^6.0.0",
32
+ "babel-plugin-transform-runtime": "^6.0.0",
33
+ "babel-preset-es2015": "^6.0.0",
34
+ "babel-preset-stage-2": "^6.0.0",
35
+ "chai": "^3.5.0",
36
+ "co": "^4.6.0",
37
+ "connect-history-api-fallback": "^1.1.0",
38
+ "cross-env": "^1.0.7",
39
+ "cross-spawn": "^2.1.5",
40
+ "css-loader": "^0.23.0",
41
+ "echarts": "^4.1.0",
42
+ "eslint": "^2.0.0",
43
+ "eslint-config-standard": "^5.1.0",
44
+ "eslint-friendly-formatter": "^1.2.2",
45
+ "eslint-loader": "^1.3.0",
46
+ "eslint-plugin-html": "^1.3.0",
47
+ "eslint-plugin-promise": "^1.0.8",
48
+ "eslint-plugin-standard": "^1.3.2",
49
+ "eslint-plugin-vue": "^0.1.1",
50
+ "eventsource-polyfill": "^0.9.6",
51
+ "express": "^4.13.3",
52
+ "extract-text-webpack-plugin": "^1.0.1",
53
+ "file-loader": "^0.8.4",
54
+ "function-bind": "^1.0.2",
55
+ "html-webpack-plugin": "^2.8.1",
56
+ "http-proxy-middleware": "^0.11.0",
57
+ "inject-loader": "^2.0.1",
58
+ "isparta-loader": "^2.0.0",
59
+ "jasmine-core": "^2.4.1",
60
+ "jquery": "^3.3.1",
61
+ "json-loader": "^0.5.4",
62
+ "karma": "^1.4.1",
63
+ "karma-chrome-launcher": "^2.2.0",
64
+ "karma-coverage": "^1.1.1",
65
+ "karma-mocha": "^1.3.0",
66
+ "karma-sinon-chai": "^1.3.1",
67
+ "karma-sourcemap-loader": "^0.3.7",
68
+ "karma-spec-reporter": "0.0.31",
69
+ "karma-webpack": "^2.0.2",
70
+ "less": "^2.7.3",
71
+ "mkdirp": "^0.5.1",
72
+ "mocha": "^3.2.0",
73
+ "ncp": "^2.0.0",
74
+ "rimraf": "^2.5.0",
75
+ "sale-client": "3.2.11-17",
76
+ "selenium-server": "2.52.0",
77
+ "sinon": "^2.1.0",
78
+ "sinon-chai": "^2.8.0",
79
+ "style": "0.0.3",
80
+ "style-loader": "^0.20.3",
81
+ "system-clients": "3.1.88-5",
82
+ "url-loader": "^0.5.7",
83
+ "vue-client": "1.24.27",
84
+ "vue-hot-reload-api": "^1.2.0",
85
+ "vue-html-loader": "^1.0.0",
86
+ "vue-loader": "^8.2.1",
87
+ "vue-resource": "^1.5.0",
88
+ "vue-router": "^0.7.13",
89
+ "vue-strap": "^1.0.9",
90
+ "vue-style-loader": "^1.0.0",
91
+ "vue-validator": "2.1.7",
92
+ "webpack": "^1.12.2",
93
+ "webpack-dev-middleware": "^1.4.0",
94
+ "webpack-hot-middleware": "^2.6.0",
95
+ "webpack-merge": "^0.8.3",
96
+ "jsencrypt": "3.0.0-rc.1",
97
+ "axios": "0.15.3"
98
+ }
99
+ }
@@ -1,95 +1,95 @@
1
- <template>
2
- <modal :show.sync="isshow" :width='width' v-ref:modal backdrop="false">
3
- <header slot="modal-header" class="modal-header">
4
- <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
5
- <h4 class="modal-title">地址管理</h4>
6
- </header>
7
- <article slot="modal-body" class="modal-body">
8
- <div class="from-group" style="height: 450px;overflow: auto;">
9
- <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
10
- <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect :show="showType" :value="value" @re-ref="selectclick"></address-select>-->
11
- </div>
12
- </article>
13
- <footer slot="modal-footer">
14
- <button type="button" class="btn btn-success" @click='confirm'>确认</button>
15
- </footer>
16
- </modal>
17
- </template>
18
-
19
- <script>
20
- export default {
21
- name: "AddressModel",
22
- title: '地址管理弹窗',
23
- props: {
24
- // 地址查询方式
25
- isquery: {
26
- type: Boolean,
27
- default: true,
28
- },
29
- //位置信息
30
- f_location: {
31
- type: Object,
32
- default: {
33
- f_locationId: '1535',
34
- f_locationType: 't_organization',
35
- }
36
- },
37
- //是否显示
38
- isshow: {
39
- type: Boolean,
40
- default : false,
41
- },
42
- // 是否选中
43
- isselect: {
44
- type: Boolean,
45
- default: false,
46
- },
47
- // 默认显示地址
48
- value:{
49
- type: Object
50
- },
51
- // 下拉选择 || 树选择
52
- showType: {
53
- type: Boolean,
54
- default: false
55
- },
56
- // 是否显示批量添加
57
- isbasch: {
58
- type: Boolean,
59
- default: true,
60
- }
61
- },
62
- data(){
63
- return{
64
- width: '90%'
65
- }
66
- },
67
- methods:{
68
- confirm(){
69
- this.$emit('addressno')
70
- },
71
- // 关闭 弹窗
72
- closeTree() {
73
- this.isshow = false
74
- this.$emit('addressno')
75
- }
76
- // 选中
77
- // selectclick(newobj, address) {
78
- // this.$emit('re-ref', newobj, address)
79
- // }
80
- },
81
- watch:{
82
- //显示改变且为true
83
- 'isshow'(val){
84
- if(val){
85
- //刷新数据
86
- this.$refs.addresstree.init()
87
- }
88
- }
89
- }
90
- }
91
- </script>
92
-
93
- <style scoped>
94
-
95
- </style>
1
+ <template>
2
+ <modal :show.sync="isshow" :width='width' v-ref:modal backdrop="false">
3
+ <header slot="modal-header" class="modal-header">
4
+ <button type="button" class="close" @click="closeTree"><span>&times;</span></button>
5
+ <h4 class="modal-title">地址管理</h4>
6
+ </header>
7
+ <article slot="modal-body" class="modal-body">
8
+ <div class="from-group" style="height: 450px;overflow: auto;">
9
+ <address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
10
+ <!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect :show="showType" :value="value" @re-ref="selectclick"></address-select>-->
11
+ </div>
12
+ </article>
13
+ <footer slot="modal-footer">
14
+ <button type="button" class="btn btn-success" @click='confirm'>确认</button>
15
+ </footer>
16
+ </modal>
17
+ </template>
18
+
19
+ <script>
20
+ export default {
21
+ name: "AddressModel",
22
+ title: '地址管理弹窗',
23
+ props: {
24
+ // 地址查询方式
25
+ isquery: {
26
+ type: Boolean,
27
+ default: true,
28
+ },
29
+ //位置信息
30
+ f_location: {
31
+ type: Object,
32
+ default: {
33
+ f_locationId: '1535',
34
+ f_locationType: 't_organization',
35
+ }
36
+ },
37
+ //是否显示
38
+ isshow: {
39
+ type: Boolean,
40
+ default : false,
41
+ },
42
+ // 是否选中
43
+ isselect: {
44
+ type: Boolean,
45
+ default: false,
46
+ },
47
+ // 默认显示地址
48
+ value:{
49
+ type: Object
50
+ },
51
+ // 下拉选择 || 树选择
52
+ showType: {
53
+ type: Boolean,
54
+ default: false
55
+ },
56
+ // 是否显示批量添加
57
+ isbasch: {
58
+ type: Boolean,
59
+ default: true,
60
+ }
61
+ },
62
+ data(){
63
+ return{
64
+ width: '90%'
65
+ }
66
+ },
67
+ methods:{
68
+ confirm(){
69
+ this.$emit('addressno')
70
+ },
71
+ // 关闭 弹窗
72
+ closeTree() {
73
+ this.isshow = false
74
+ this.$emit('addressno')
75
+ }
76
+ // 选中
77
+ // selectclick(newobj, address) {
78
+ // this.$emit('re-ref', newobj, address)
79
+ // }
80
+ },
81
+ watch:{
82
+ //显示改变且为true
83
+ 'isshow'(val){
84
+ if(val){
85
+ //刷新数据
86
+ this.$refs.addresstree.init()
87
+ }
88
+ }
89
+ }
90
+ }
91
+ </script>
92
+
93
+ <style scoped>
94
+
95
+ </style>
@@ -130,6 +130,7 @@
130
130
  'f_city':'城市',
131
131
  'f_district':'区/县',
132
132
  'f_street':'街道名称',
133
+ 'f_address':'详细地址',
133
134
  'f_org_name':'分公司',
134
135
  'streenum':'小区数量'
135
136
  }