liting2017 6 years ago
parent
commit
326d6673b5

+ 2 - 2
js/component/administration/banner/banner.jsx

@@ -64,7 +64,7 @@ class Banner extends Component {
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/open/api/admin/banners/list",
+            url: globalConfig.context + "/api/admin/banners/list",
             data: {
                 pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
@@ -148,7 +148,7 @@ class Banner extends Component {
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/open/api/admin/banners/delete",
+            url: globalConfig.context + "/api/admin/banners/delete",
             data: {
                 id: deletedIds[0]
             }

+ 1 - 1
js/component/administration/banner/bannerDes.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Modal, Spin } from 'antd';
-import BannerForm from '@/administration/banner/BannerForm';
+import BannerForm from '@/administration/banner/bannerForm';
 
 class DemandDesc extends React.Component {
 	constructor(props) {

+ 3 - 3
js/component/administration/banner/bannerForm.jsx

@@ -49,7 +49,7 @@ const PicturesWall = React.createClass({
 		return (
 			<div className="clearfix">
 				<Upload
-					action={globalConfig.context + '/open/api/admin/banners/uploadPicture'}
+					action={globalConfig.context + '/api/admin/banners/uploadPicture'}
 					data={{ sign: 'banners'}}
 					listType="picture-card"
 					fileList={fileList}
@@ -86,7 +86,7 @@ class BannerForm extends React.Component {
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +  '/open/api/admin/banners/details' ,
+            url: globalConfig.context +  '/api/admin/banners/details' ,
             data: {
                 id: id
             },
@@ -137,7 +137,7 @@ class BannerForm extends React.Component {
                     method: "post",
 					dataType: "json",
 					async:true,
-                    url: this.props.data.id ? globalConfig.context + '/open/api/admin/banners/update' : globalConfig.context + '/open/api/admin/banners/save',
+                    url: this.props.data.id ? globalConfig.context + '/api/admin/banners/update' : globalConfig.context + '/api/admin/banners/save',
                     data: {
                         id:this.props.data.id,
                         text:values.text,

+ 24 - 22
js/component/administration/business/userLibrary.jsx

@@ -25,18 +25,18 @@ class UserLibrary extends Component {
 			columns: [
 				{
 					title: '客户名称',
-					dataIndex: 'name',
-					key: 'name'
+					dataIndex: 'username',
+					key: 'username'
 				},
 				{
 					title: '手机号码',
-					dataIndex: 'photo',
-					key: 'photo'
+					dataIndex: 'mobile',
+					key: 'mobile'
 				},
 				{
 					title: '用户类型',
-					dataIndex: 'userType',
-					key: 'userType',
+					dataIndex: 'type',
+					key: 'type',
 					render: (text) => {
 						return text == '1' ? '企业用户' : '个人用户';
 					}
@@ -59,13 +59,13 @@ class UserLibrary extends Component {
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/achievement/lis",
+            url: globalConfig.context + "api/admin/user/info",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                userType: this.state.userType, //需求名称
-				userName: this.state.userName,
-				photo:this.state.photo
+                type: this.state.type, //需求名称
+				username: this.state.username,
+				mobile:this.state.mobile
             },
             success: function (data) {
                 let theArr = [];
@@ -79,9 +79,11 @@ class UserLibrary extends Component {
                         theArr.push({
                             key: i,
                             id: thisdata.id,
-                            name: thisdata.name, //编号
-                            photo: thisdata.photo,
-                            userType: thisdata.userType,
+                            type: thisdata.type, //编号
+							nickname: thisdata.nickname,
+							username:thisdata.username,
+							mobile: thisdata.mobile,
+							email:thisdata.email,
                             createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():''
                         });
                     };
@@ -108,9 +110,9 @@ class UserLibrary extends Component {
 		this.loadData();
 	}
 	reset() {
-		this.state.userName = '';
-		this.state.userType = undefined;
-		this.state.photo = '';
+		this.state.username = '';
+		this.state.type = undefined;
+		this.state.mobile = '';
 		this.loadData();
 	}
 	componentWillMount() {
@@ -135,26 +137,26 @@ class UserLibrary extends Component {
 					<div className="user-search">
 						<Input
 							style={{ marginRight: 10 }}
-							value={this.state.userName}
+							value={this.state.username}
 							placeholder="用户名称"
 							onChange={(e) => {
-								this.setState({ userName: e.target.value });
+								this.setState({ username: e.target.value });
 							}}
 						/>
 						<Input
 							style={{ marginRight: 10 }}
-							value={this.state.photo}
+							value={this.state.mobile}
 							placeholder="手机号码"
 							onChange={(e) => {
-								this.setState({ photo: e.target.value });
+								this.setState({ mobile: e.target.value });
 							}}
 						/>
 						<Select
-							value={this.state.userType}
+							value={this.state.type}
 							style={{ width: 150 }}
 							placeholder="用户类型"
 							onChange={(e) => {
-								this.setState({ userType: e });
+								this.setState({ type: e });
 							}}
 						>
 							<Select.Option value="0">个人用户</Select.Option>

+ 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 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 8088 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
     "type": "git",

+ 2 - 2
webpack.config.js

@@ -115,7 +115,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188';    
+    let staticHost = 'http://192.168.0.188:8088';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -151,7 +151,7 @@ module.exports = (function () {
         devServer: {
             disableHostCheck: true,
             host: '192.168.0.188',
-            port: 80,
+            port: 8088,
             allowedHosts: ['127.0.0.1','192.168.0.20'],
             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.0.188', // WebpackDevServer host and port
+    'user/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/index.js'
     ],
-    'user/login': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+    'user/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/login.js'
     ],
-    'user/signIn': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+    'user/signIn': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/signIn.js'
     ],
-    'user/account/index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+    'user/account/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/index.js'
     ],
     //admin
-    'admin/login': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+    'admin/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
     'webpack/hot/only-dev-server',
     './js/user/adminLogin.js'
     ],
-    'admin/index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
+    'admin/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]