liting2017 6 years ago
parent
commit
1247e166f0

+ 0 - 1
js/component/administration/authentication/authExamine.jsx

@@ -45,7 +45,6 @@ const DemandList = React.createClass({
                             mobile: thisdata.contactMobile,
                             industry: thisdata.industry,
                             expert:thisdata.expert,
-                           
                         });
                     };
                 }

+ 2 - 1
js/component/administration/authentication/techAuth.jsx

@@ -18,7 +18,7 @@ const DemandList = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/demand/list",
+            url: globalConfig.context + "/api/user/getExpertAuditList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -42,6 +42,7 @@ const DemandList = React.createClass({
                             id: thisdata.id,
                             serialNumber: thisdata.serialNumber,
                             expert: thisdata.expert,
+                            industry:thisdata.industry,
                             identifyName: thisdata.username,
                             mobile:thisdata.contactMobile,
                             expertAudit:thisdata.expertAudit,

+ 4 - 3
js/component/administration/business/businessCategory.jsx

@@ -89,7 +89,7 @@ const BusinessCategory=Form.create()(React.createClass({
                             id: thisdata.id,//品类ID
                             sort:thisdata.sort,//品类序号
                             number: thisdata.number,//品类编号
-                            module:thisdata.module,
+                            module:thisdata.module?thisdata.module.toString():undefined,
                             name: thisdata.name,//品类名称
                             layer:thisdata.layer,
                             superId:thisdata.superId,
@@ -181,7 +181,7 @@ const BusinessCategory=Form.create()(React.createClass({
             name:'',
             addFirst:1,
             superId:recard.id,
-            module:recard.module
+            module:recard.module?recard.module.toString():'undefined'
         });
     },
 	//编辑保存
@@ -254,13 +254,14 @@ const BusinessCategory=Form.create()(React.createClass({
         }.bind(this));
     },
     addClick() {
+        alert(1)
         this.state.RowData = {};
         this.setState({
             visible: true,
             addFirst:0,
             name:'',
             superId:'',
-            module:'0'
+            module:"1"
         });
     },
     //新增保存

+ 1 - 1
package.json

@@ -12,7 +12,7 @@
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 8088  --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 80  --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
     "type": "git",

+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-	let staticHost = 'http://192.168.1.124:8088';    
+	let staticHost = 'http://192.168.1.124:80';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';

+ 3 - 3
webpack.config.js

@@ -115,7 +115,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.1.124:8088';    
+    let staticHost = 'http://192.168.1.124:80';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -153,8 +153,8 @@ module.exports = (function () {
         devServer: {
             disableHostCheck: true,
             host: '192.168.1.124',
-            port: 8088,
-            allowedHosts: ['127.0.0.1','192.168.1.123','192.168.1.128'],
+            port: 80,
+            allowedHosts: ['127.0.0.1','192.168.1.123','192.168.1.128','192.168.1.127'],
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }

+ 6 - 6
webpack/entry.config.js

@@ -10,28 +10,28 @@ module.exports = {
     'admin/index': './js/admin/index.js',
   },
   watch: {
-    'user/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'user/index': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/index.js'
     ],
-    'user/login': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'user/login': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/login.js'
     ],
-    'user/signIn': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'user/signIn': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/signIn.js'
     ],
-    'user/account/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'user/account/index': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/index.js'
     ],
     //admin
-    'admin/login': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'admin/login': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
     'webpack/hot/only-dev-server',
     './js/user/adminLogin.js'
     ],
-    'admin/index': ['webpack-dev-server/client?http://192.168.1.124:8088', // WebpackDevServer host and port
+    'admin/index': ['webpack-dev-server/client?http://192.168.1.124:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]