sale-client 4.2.34 → 4.2.35

package/build/dev-server.js

@@ -1,68 +1,68 @@
-var path = require('path')
-var checkVersion = require('./versionCheck.js')
-checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-    // '/api/af-revenue/batchdeduction/all': {
-    //   pathRewrite: {
-    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
-    //   },
-    //   target: localUrl
-    // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
-      '/api/af-revenue': {
-        pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
-        },
-        target: "http://localhost:8080"
-      },
-      '/api': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+var checkVersion = require('./versionCheck.js')
+checkVersion()
+const [ serverRul, localUrl ] = ['http://61.163.123.47:30785/', 'http://61.163.123.47:30785/']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+    // '/api/af-revenue/batchdeduction/all': {
+    //   pathRewrite: {
+    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
+    //   },
+    //   target: localUrl
+    // },
+    //   '/api/af-revenue/logic': {
+    //     pathRewrite: {
+    //       '/api/af-revenue/logic': '/logic'
+    //     },
+    //     target: localUrl
+    //   },
+      // '/api/af-revenue/file': {
+      //   // pathRewrite: {
+      //   //   '/api/af-revenue/file': '/file'
+      //   // },
+      //   target: localUrl
+      // },
+      // '/weixin2/rs':{
+      //
+      //   target: 'http://410663id1ia4.vicp.fun'
+      // },
+      // '/api/af-revenue/sql': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/sql': '/sql'
+      //   },
+      //   target: localUrl
+      // },
+      '/rs/pay': {
+        target: 'http://localhost:8080'
+      },
+      // '/api/af-revenue': {
+      //   pathRewrite: {
+      //     '/api/af-revenue': '/af-revenue'
+      //   },
+      //   target: "http://localhost:8080"
+      // },
+      '/api': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.34",
+  "version": "4.2.35",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/fugou/FileManageService.js

@@ -45,7 +45,7 @@ let FileManageService = {
       }
     }
     result.f_credentials = result.f_credentials ? result.f_credentials : '身份证'
-    result.f_user_nature = result.f_user_nature ? result.f_user_nature : '民用'
+    // result.f_user_nature = result.f_user_nature ? result.f_user_nature : '民用'
     result.f_predeposit = result.f_predeposit ? result.f_predeposit : 0
     result.f_people_num = result.f_people_num ? result.f_people_num : 0
     result.f_ins_stop_date = result.f_ins_stop_date ? result.f_ins_stop_date : null