sale-client 4.2.33 → 4.2.35

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,68 +1,68 @@
1
- var path = require('path')
2
- var checkVersion = require('./versionCheck.js')
3
- checkVersion()
4
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
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': '/af-revenue'
56
- },
57
- target: "http://localhost:8080"
58
- },
59
- '/api': {
60
- target: serverRul
61
- },
62
- '/rs': {
63
- target: serverRul
64
- }
65
- }
66
- }
67
- }
68
- module.exports = merge(baseConfig, devConfig)
1
+ var path = require('path')
2
+ var checkVersion = require('./versionCheck.js')
3
+ checkVersion()
4
+ const [ serverRul, localUrl ] = ['http://61.163.123.47:30785/', 'http://61.163.123.47:30785/']
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': '/af-revenue'
56
+ // },
57
+ // target: "http://localhost:8080"
58
+ // },
59
+ '/api': {
60
+ target: serverRul
61
+ },
62
+ '/rs': {
63
+ target: serverRul
64
+ }
65
+ }
66
+ }
67
+ }
68
+ module.exports = merge(baseConfig, devConfig)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.33",
3
+ "version": "4.2.35",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -45,7 +45,7 @@ let FileManageService = {
45
45
  }
46
46
  }
47
47
  result.f_credentials = result.f_credentials ? result.f_credentials : '身份证'
48
- result.f_user_nature = result.f_user_nature ? result.f_user_nature : '民用'
48
+ // result.f_user_nature = result.f_user_nature ? result.f_user_nature : '民用'
49
49
  result.f_predeposit = result.f_predeposit ? result.f_predeposit : 0
50
50
  result.f_people_num = result.f_people_num ? result.f_people_num : 0
51
51
  result.f_ins_stop_date = result.f_ins_stop_date ? result.f_ins_stop_date : null