sale-client 4.4.7 → 4.4.9
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.
package/build/dev-server.js
CHANGED
|
@@ -1,77 +1,77 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
var checkVersion = require('./versionCheck.js')
|
|
3
|
-
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['http://
|
|
5
|
-
var merge = require('webpack-merge')
|
|
6
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
7
|
-
var devConfig = {
|
|
8
|
-
devServer: {
|
|
9
|
-
contentBase: path.join(__dirname, 'src'),
|
|
10
|
-
hot: true,
|
|
11
|
-
publicPath: baseConfig.output.publicPath,
|
|
12
|
-
historyApiFallback: true,
|
|
13
|
-
host: '127.0.0.1',
|
|
14
|
-
port: 8089,
|
|
15
|
-
open: false,
|
|
16
|
-
stats: {
|
|
17
|
-
colors: false, // 配置控制台输出彩色日志
|
|
18
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
19
|
-
children: false // 不输出子模块构建信息
|
|
20
|
-
},
|
|
21
|
-
proxy: {
|
|
22
|
-
// '/api/af-revenue/batchdeduction/all': {
|
|
23
|
-
// pathRewrite: {
|
|
24
|
-
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
-
// },
|
|
26
|
-
// target: localUrl
|
|
27
|
-
// },
|
|
28
|
-
// '/api/af-revenue/logic': {
|
|
29
|
-
// pathRewrite: {
|
|
30
|
-
// '/api/af-revenue/logic': '/logic'
|
|
31
|
-
// },
|
|
32
|
-
// target: localUrl
|
|
33
|
-
// },
|
|
34
|
-
// '/api/af-revenue/file': {
|
|
35
|
-
// // pathRewrite: {
|
|
36
|
-
// // '/api/af-revenue/file': '/file'
|
|
37
|
-
// // },
|
|
38
|
-
// target: localUrl
|
|
39
|
-
// },
|
|
40
|
-
// '/weixin2/rs':{
|
|
41
|
-
//
|
|
42
|
-
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
-
// },
|
|
44
|
-
// '/api/af-revenue/sql': {
|
|
45
|
-
// pathRewrite: {
|
|
46
|
-
// '/api/af-revenue/sql': '/sql'
|
|
47
|
-
// },
|
|
48
|
-
// target: localUrl
|
|
49
|
-
// },
|
|
50
|
-
'/rs/pay': {
|
|
51
|
-
target: 'http://localhost:8080'
|
|
52
|
-
},
|
|
53
|
-
// '/api/af-revenue': {
|
|
54
|
-
// pathRewrite: {
|
|
55
|
-
// '/api/af-revenue': '/'
|
|
56
|
-
// },
|
|
57
|
-
// target: "http://localhost:9026"
|
|
58
|
-
// },
|
|
59
|
-
'/api': {
|
|
60
|
-
target: serverRul,
|
|
61
|
-
secure: false,
|
|
62
|
-
changeOrigin: true,
|
|
63
|
-
},
|
|
64
|
-
'/resource': {
|
|
65
|
-
target: serverRul,
|
|
66
|
-
secure: false,
|
|
67
|
-
changeOrigin: true
|
|
68
|
-
},
|
|
69
|
-
'/rs': {
|
|
70
|
-
target: serverRul,
|
|
71
|
-
secure: false,
|
|
72
|
-
changeOrigin: true,
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
var checkVersion = require('./versionCheck.js')
|
|
3
|
+
checkVersion()
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://219.151.186.185:31467/', 'http://localhost:9026']
|
|
5
|
+
var merge = require('webpack-merge')
|
|
6
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
7
|
+
var devConfig = {
|
|
8
|
+
devServer: {
|
|
9
|
+
contentBase: path.join(__dirname, 'src'),
|
|
10
|
+
hot: true,
|
|
11
|
+
publicPath: baseConfig.output.publicPath,
|
|
12
|
+
historyApiFallback: true,
|
|
13
|
+
host: '127.0.0.1',
|
|
14
|
+
port: 8089,
|
|
15
|
+
open: false,
|
|
16
|
+
stats: {
|
|
17
|
+
colors: false, // 配置控制台输出彩色日志
|
|
18
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
19
|
+
children: false // 不输出子模块构建信息
|
|
20
|
+
},
|
|
21
|
+
proxy: {
|
|
22
|
+
// '/api/af-revenue/batchdeduction/all': {
|
|
23
|
+
// pathRewrite: {
|
|
24
|
+
// '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
+
// },
|
|
26
|
+
// target: localUrl
|
|
27
|
+
// },
|
|
28
|
+
// '/api/af-revenue/logic': {
|
|
29
|
+
// pathRewrite: {
|
|
30
|
+
// '/api/af-revenue/logic': '/logic'
|
|
31
|
+
// },
|
|
32
|
+
// target: localUrl
|
|
33
|
+
// },
|
|
34
|
+
// '/api/af-revenue/file': {
|
|
35
|
+
// // pathRewrite: {
|
|
36
|
+
// // '/api/af-revenue/file': '/file'
|
|
37
|
+
// // },
|
|
38
|
+
// target: localUrl
|
|
39
|
+
// },
|
|
40
|
+
// '/weixin2/rs':{
|
|
41
|
+
//
|
|
42
|
+
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
|
+
// },
|
|
44
|
+
// '/api/af-revenue/sql': {
|
|
45
|
+
// pathRewrite: {
|
|
46
|
+
// '/api/af-revenue/sql': '/sql'
|
|
47
|
+
// },
|
|
48
|
+
// target: localUrl
|
|
49
|
+
// },
|
|
50
|
+
'/rs/pay': {
|
|
51
|
+
target: 'http://localhost:8080'
|
|
52
|
+
},
|
|
53
|
+
// '/api/af-revenue': {
|
|
54
|
+
// pathRewrite: {
|
|
55
|
+
// '/api/af-revenue': '/'
|
|
56
|
+
// },
|
|
57
|
+
// target: "http://localhost:9026"
|
|
58
|
+
// },
|
|
59
|
+
'/api': {
|
|
60
|
+
target: serverRul,
|
|
61
|
+
secure: false,
|
|
62
|
+
changeOrigin: true,
|
|
63
|
+
},
|
|
64
|
+
'/resource': {
|
|
65
|
+
target: serverRul,
|
|
66
|
+
secure: false,
|
|
67
|
+
changeOrigin: true
|
|
68
|
+
},
|
|
69
|
+
'/rs': {
|
|
70
|
+
target: serverRul,
|
|
71
|
+
secure: false,
|
|
72
|
+
changeOrigin: true,
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -273,7 +273,7 @@
|
|
|
273
273
|
// 如果不支持小数,将划价出的多余非整数气量进行划价为金额
|
|
274
274
|
let tempnum = Math.floor(getGas.data.gas - 0)
|
|
275
275
|
let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_fee_decimal || 4))
|
|
276
|
-
self.dymoney = (getGas.data.chargenum - 0).toFixed(
|
|
276
|
+
self.dymoney = (getGas.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
|
|
277
277
|
self.model.f_pregas = Math.floor(getGas.data.gas - 0)
|
|
278
278
|
}
|
|
279
279
|
}
|