sale-client 3.6.63 → 3.6.64

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.
File without changes
File without changes
@@ -1,85 +1,85 @@
1
- var path = require('path')
2
- const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
3
- var merge = require('webpack-merge')
4
- var baseConfig = require('./webpack.dev.conf')
5
- var devConfig = {
6
- devServer: {
7
- contentBase: path.join(__dirname, 'src'),
8
- hot: true,
9
- publicPath: baseConfig.output.publicPath,
10
- historyApiFallback: true,
11
- host: '127.0.0.1',
12
- port: 8089,
13
- open: true,
14
- stats: {
15
- colors: false, // 配置控制台输出彩色日志
16
- chunks: false, // 不输出构建 chunk 信息
17
- children: false // 不输出子模块构建信息
18
- },
19
- proxy: {
20
- '/rs/file': {
21
- target: serverRul
22
- },
23
- '/invoice': {
24
- target: serverRul
25
- },
26
- // 查找资源服务数据
27
- '/rs/search': {
28
- target: serverRul
29
- },
30
- // 查找资源服务数据
31
- '/rs/logic/getLogin': {
32
- target: serverRul
33
- },
34
- // 查找资源服务数据
35
- '/rs/logic/getInitData': {
36
- target: serverRul
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: serverRul
40
- },
41
- // 用户登录服务地址
42
- '/rs/user': {
43
- target: serverRul
44
- },
45
- '/rs/path': {
46
- target: serverRul
47
- },
48
- '/rs/data': {
49
- target: serverRul
50
- },
51
- '/rs/license': {
52
- target: serverRul
53
- },
54
- '/rs/db': {
55
- target: serverRul
56
- },
57
- '/excel': {
58
- target: serverRul
59
- },
60
- '/rs/config': {
61
- target: serverRul
62
- },
63
- '/rs/report': {
64
- target: serverRul
65
- },
66
- '/rs/vue': {
67
- target: serverRul
68
- },
69
- '/rs/logic': {
70
- target: localUrl
71
- },
72
- '/rs/sql': {
73
- target: localUrl
74
- },
75
- '/webmeter': {
76
- target: serverRul
77
- },
78
- '/rs': {
79
- target: serverRul
80
- // changeOrigin: true
81
- }
82
- }
83
- }
84
- }
85
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
3
+ var merge = require('webpack-merge')
4
+ var baseConfig = require('./webpack.dev.conf')
5
+ var devConfig = {
6
+ devServer: {
7
+ contentBase: path.join(__dirname, 'src'),
8
+ hot: true,
9
+ publicPath: baseConfig.output.publicPath,
10
+ historyApiFallback: true,
11
+ host: '127.0.0.1',
12
+ port: 8089,
13
+ open: true,
14
+ stats: {
15
+ colors: false, // 配置控制台输出彩色日志
16
+ chunks: false, // 不输出构建 chunk 信息
17
+ children: false // 不输出子模块构建信息
18
+ },
19
+ proxy: {
20
+ '/rs/file': {
21
+ target: serverRul
22
+ },
23
+ '/invoice': {
24
+ target: serverRul
25
+ },
26
+ // 查找资源服务数据
27
+ '/rs/search': {
28
+ target: serverRul
29
+ },
30
+ // 查找资源服务数据
31
+ '/rs/logic/getLogin': {
32
+ target: serverRul
33
+ },
34
+ // 查找资源服务数据
35
+ '/rs/logic/getInitData': {
36
+ target: serverRul
37
+ },
38
+ '/rs/logic/getSaleInitData': {
39
+ target: serverRul
40
+ },
41
+ // 用户登录服务地址
42
+ '/rs/user': {
43
+ target: serverRul
44
+ },
45
+ '/rs/path': {
46
+ target: serverRul
47
+ },
48
+ '/rs/data': {
49
+ target: serverRul
50
+ },
51
+ '/rs/license': {
52
+ target: serverRul
53
+ },
54
+ '/rs/db': {
55
+ target: serverRul
56
+ },
57
+ '/excel': {
58
+ target: serverRul
59
+ },
60
+ '/rs/config': {
61
+ target: serverRul
62
+ },
63
+ '/rs/report': {
64
+ target: serverRul
65
+ },
66
+ '/rs/vue': {
67
+ target: serverRul
68
+ },
69
+ '/rs/logic': {
70
+ target: localUrl
71
+ },
72
+ '/rs/sql': {
73
+ target: localUrl
74
+ },
75
+ '/webmeter': {
76
+ target: serverRul
77
+ },
78
+ '/rs': {
79
+ target: serverRul
80
+ // changeOrigin: true
81
+ }
82
+ }
83
+ }
84
+ }
85
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,120 +1,120 @@
1
- {
2
- "name": "sale-client",
3
- "version": "3.6.63",
4
- "description": "收费模块前台组件",
5
- "main": "src/index.js",
6
- "scripts": {
7
- "example": "node build/example-server.js",
8
- "dev": "webpack-dev-server --config ./build/dev-server.js",
9
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
- "unit": "karma start test/unit/karma.conf.js",
11
- "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
- "e2e": "node test/e2e/runner.js",
13
- "release": "bash build/release.sh"
14
- },
15
- "repository": {
16
- "type": "git",
17
- "url": "https://gitee.com/aote/product.git"
18
- },
19
- "dependencies": {
20
- "crypto-js": "^4.1.1",
21
- "examples": "^0.1.0",
22
- "js-file-download": "0.4.12",
23
- "less-loader": "^2.2.3",
24
- "qrcodejs2": "0.0.2",
25
- "vue": "^1.0.17",
26
- "webpack-dev-server": "^2.11.5",
27
- "yarn": "^1.22.10"
28
- },
29
- "devDependencies": {
30
- "address-client": "3.2.56",
31
- "axios": "0.15.3",
32
- "babel-core": "^6.0.0",
33
- "babel-loader": "^6.0.0",
34
- "babel-plugin-transform-runtime": "^6.0.0",
35
- "babel-preset-es2015": "^6.0.0",
36
- "babel-preset-stage-2": "^6.0.0",
37
- "chai": "^3.5.0",
38
- "co": "^4.6.0",
39
- "compression-webpack-plugin": "1.1.2",
40
- "connect-history-api-fallback": "^1.1.0",
41
- "cross-env": "^1.0.7",
42
- "cross-spawn": "^2.1.5",
43
- "css-loader": "^0.23.0",
44
- "echarts": "^4.1.0",
45
- "eslint": "^3.19.0",
46
- "eslint-config-standard": "^10.2.1",
47
- "eslint-friendly-formatter": "^3.0.0",
48
- "eslint-loader": "^1.7.1",
49
- "eslint-plugin-html": "^3.0.0",
50
- "eslint-plugin-import": "^2.7.0",
51
- "eslint-plugin-node": "^5.2.0",
52
- "eslint-plugin-promise": "^3.4.0",
53
- "eslint-plugin-standard": "^3.0.1",
54
- "eventsource-polyfill": "^0.9.6",
55
- "express": "^4.13.3",
56
- "extract-text-webpack-plugin": "^3.0.2",
57
- "terser-webpack-plugin-legacy": "^1.2.5",
58
- "file-loader": "^0.8.4",
59
- "filemanager-webpack-plugin": "^2.0.5",
60
- "function-bind": "^1.0.2",
61
- "html-webpack-plugin": "^2.8.1",
62
- "http-proxy-middleware": "^0.11.0",
63
- "inject-loader": "^2.0.1",
64
- "isparta-loader": "^2.0.0",
65
- "jasmine-core": "^2.4.1",
66
- "jquery": "^3.3.1",
67
- "jsencrypt": "3.0.0-rc.1",
68
- "json-loader": "^0.5.4",
69
- "karma": "^1.4.1",
70
- "karma-chrome-launcher": "^2.2.0",
71
- "karma-coverage": "^1.1.1",
72
- "karma-mocha": "^1.3.0",
73
- "karma-sinon-chai": "^1.3.1",
74
- "karma-sourcemap-loader": "^0.3.7",
75
- "karma-spec-reporter": "0.0.31",
76
- "karma-webpack": "^2.0.2",
77
- "ldap-clients": "3.0.48",
78
- "less": "^2.7.3",
79
- "manage-client": "3.1.8-88",
80
- "mkdirp": "^0.5.1",
81
- "mocha": "^3.2.0",
82
- "moment": "2.24.0",
83
- "ncp": "^2.0.0",
84
- "nightwatch": "^0.8.18",
85
- "qrcodejs2": "0.0.2",
86
- "rimraf": "^2.5.0",
87
- "selenium-server": "2.52.0",
88
- "sinon": "^2.1.0",
89
- "sinon-chai": "^2.8.0",
90
- "style": "0.0.3",
91
- "style-loader": "^0.20.3",
92
- "system-clients": "3.2.61",
93
- "url-loader": "^0.5.7",
94
- "vue-client": "1.24.86",
95
- "vue-clipboard2": "0.3.1",
96
- "vue-hot-reload-api": "^1.2.0",
97
- "vue-html-loader": "^1.0.0",
98
- "vue-loader": "^8.2.1",
99
- "vue-resource": "^1.5.0",
100
- "vue-router": "^0.7.13",
101
- "vue-strap": "^1.0.9",
102
- "vue-style-loader": "^1.0.0",
103
- "vue-validator": "2.1.7",
104
- "webpack": "^3.12.0",
105
- "webpack-dev-middleware": "^1.4.0",
106
- "webpack-hot-middleware": "^2.6.0",
107
- "webpack-merge": "^0.8.3",
108
- "webpack-parallel-uglify-plugin": "^1.0.0",
109
- "weixin-js-sdk": "^1.2.0"
110
- },
111
- "keywords": [
112
- "selling-clients"
113
- ],
114
- "author": "张桥",
115
- "license": "ISC",
116
- "directories": {
117
- "example": "examples",
118
- "test": "test"
119
- }
120
- }
1
+ {
2
+ "name": "sale-client",
3
+ "version": "3.6.64",
4
+ "description": "收费模块前台组件",
5
+ "main": "src/index.js",
6
+ "scripts": {
7
+ "example": "node build/example-server.js",
8
+ "dev": "webpack-dev-server --config ./build/dev-server.js",
9
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
10
+ "unit": "karma start test/unit/karma.conf.js",
11
+ "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
12
+ "e2e": "node test/e2e/runner.js",
13
+ "release": "bash build/release.sh"
14
+ },
15
+ "repository": {
16
+ "type": "git",
17
+ "url": "https://gitee.com/aote/product.git"
18
+ },
19
+ "dependencies": {
20
+ "crypto-js": "^4.1.1",
21
+ "examples": "^0.1.0",
22
+ "js-file-download": "0.4.12",
23
+ "less-loader": "^2.2.3",
24
+ "qrcodejs2": "0.0.2",
25
+ "vue": "^1.0.17",
26
+ "webpack-dev-server": "^2.11.5",
27
+ "yarn": "^1.22.10"
28
+ },
29
+ "devDependencies": {
30
+ "address-client": "3.2.56",
31
+ "axios": "0.15.3",
32
+ "babel-core": "^6.0.0",
33
+ "babel-loader": "^6.0.0",
34
+ "babel-plugin-transform-runtime": "^6.0.0",
35
+ "babel-preset-es2015": "^6.0.0",
36
+ "babel-preset-stage-2": "^6.0.0",
37
+ "chai": "^3.5.0",
38
+ "co": "^4.6.0",
39
+ "compression-webpack-plugin": "1.1.2",
40
+ "connect-history-api-fallback": "^1.1.0",
41
+ "cross-env": "^1.0.7",
42
+ "cross-spawn": "^2.1.5",
43
+ "css-loader": "^0.23.0",
44
+ "echarts": "^4.1.0",
45
+ "eslint": "^3.19.0",
46
+ "eslint-config-standard": "^10.2.1",
47
+ "eslint-friendly-formatter": "^3.0.0",
48
+ "eslint-loader": "^1.7.1",
49
+ "eslint-plugin-html": "^3.0.0",
50
+ "eslint-plugin-import": "^2.7.0",
51
+ "eslint-plugin-node": "^5.2.0",
52
+ "eslint-plugin-promise": "^3.4.0",
53
+ "eslint-plugin-standard": "^3.0.1",
54
+ "eventsource-polyfill": "^0.9.6",
55
+ "express": "^4.13.3",
56
+ "extract-text-webpack-plugin": "^3.0.2",
57
+ "terser-webpack-plugin-legacy": "^1.2.5",
58
+ "file-loader": "^0.8.4",
59
+ "filemanager-webpack-plugin": "^2.0.5",
60
+ "function-bind": "^1.0.2",
61
+ "html-webpack-plugin": "^2.8.1",
62
+ "http-proxy-middleware": "^0.11.0",
63
+ "inject-loader": "^2.0.1",
64
+ "isparta-loader": "^2.0.0",
65
+ "jasmine-core": "^2.4.1",
66
+ "jquery": "^3.3.1",
67
+ "jsencrypt": "3.0.0-rc.1",
68
+ "json-loader": "^0.5.4",
69
+ "karma": "^1.4.1",
70
+ "karma-chrome-launcher": "^2.2.0",
71
+ "karma-coverage": "^1.1.1",
72
+ "karma-mocha": "^1.3.0",
73
+ "karma-sinon-chai": "^1.3.1",
74
+ "karma-sourcemap-loader": "^0.3.7",
75
+ "karma-spec-reporter": "0.0.31",
76
+ "karma-webpack": "^2.0.2",
77
+ "ldap-clients": "3.0.48",
78
+ "less": "^2.7.3",
79
+ "manage-client": "3.1.8-88",
80
+ "mkdirp": "^0.5.1",
81
+ "mocha": "^3.2.0",
82
+ "moment": "2.24.0",
83
+ "ncp": "^2.0.0",
84
+ "nightwatch": "^0.8.18",
85
+ "qrcodejs2": "0.0.2",
86
+ "rimraf": "^2.5.0",
87
+ "selenium-server": "2.52.0",
88
+ "sinon": "^2.1.0",
89
+ "sinon-chai": "^2.8.0",
90
+ "style": "0.0.3",
91
+ "style-loader": "^0.20.3",
92
+ "system-clients": "3.2.61",
93
+ "url-loader": "^0.5.7",
94
+ "vue-client": "1.24.86",
95
+ "vue-clipboard2": "0.3.1",
96
+ "vue-hot-reload-api": "^1.2.0",
97
+ "vue-html-loader": "^1.0.0",
98
+ "vue-loader": "^8.2.1",
99
+ "vue-resource": "^1.5.0",
100
+ "vue-router": "^0.7.13",
101
+ "vue-strap": "^1.0.9",
102
+ "vue-style-loader": "^1.0.0",
103
+ "vue-validator": "2.1.7",
104
+ "webpack": "^3.12.0",
105
+ "webpack-dev-middleware": "^1.4.0",
106
+ "webpack-hot-middleware": "^2.6.0",
107
+ "webpack-merge": "^0.8.3",
108
+ "webpack-parallel-uglify-plugin": "^1.0.0",
109
+ "weixin-js-sdk": "^1.2.0"
110
+ },
111
+ "keywords": [
112
+ "selling-clients"
113
+ ],
114
+ "author": "张桥",
115
+ "license": "ISC",
116
+ "directories": {
117
+ "example": "examples",
118
+ "test": "test"
119
+ }
120
+ }
@@ -49,7 +49,7 @@
49
49
  <label class = "col-sm-5 " >表当前底数</label>
50
50
  <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
51
51
  </div>
52
- <div class="row">
52
+ <div class="row" v-show="data.f_times">
53
53
  <label class = "col-sm-5 " >写卡次数</label>
54
54
  <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
55
55
  </div>
@@ -97,10 +97,10 @@
97
97
  <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
98
98
  <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
99
99
  </div>
100
- <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">
101
- <label class = "col-sm-5 " >写卡次数</label>
102
- <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>
103
- </div>
100
+ <!-- <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
101
+ <!-- <label class = "col-sm-5 " >写卡次数</label>-->
102
+ <!-- <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
103
+ <!-- </div>-->
104
104
  <div class="row">
105
105
  <label class = "col-sm-5 " >用气性质</label>
106
106
  <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>