ソースを参照

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

liting2017 7 年 前
コミット
9e6f229030
共有28 個のファイルを変更した9718 個の追加14597 個の削除を含む
  1. 29 0
      js/component/addressList.jsx
  2. 135 0
      js/component/areaList.jsx
  3. 33 30
      js/component/manageCenter/achievement/content.jsx
  4. 23 4
      js/component/manageCenter/customer/content.jsx
  5. 27 904
      js/component/manageCenter/customer/customerData/companyCustomer.jsx
  6. 1 1
      js/component/manageCenter/customer/customerData/myClient.jsx
  7. 13 5
      js/component/manageCenter/customer/customerManagement/expertManage.jsx
  8. 12 4
      js/component/manageCenter/customer/customerManagement/organizationManages.jsx
  9. 12 4
      js/component/manageCenter/customer/customerManagement/personalManages.jsx
  10. 15 3316
      js/component/manageCenter/customer/customerManagement/publicManages.jsx
  11. 3334 0
      js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx
  12. 0 1
      js/component/manageCenter/customer/customerService/businessManges.jsx
  13. 1 1
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  14. 3 2
      js/component/manageCenter/customer/customerService/serviceQuery.jsx
  15. 29 817
      js/component/manageCenter/customer/individualCustomer/expertQuery.jsx
  16. 12 4
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  17. 41 4014
      js/component/manageCenter/customer/individualCustomer/publicQuery.jsx
  18. 2459 0
      js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx
  19. 12 4
      js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx
  20. 13 5
      js/component/manageCenter/customer/release/expertRelease.jsx
  21. 12 4
      js/component/manageCenter/customer/reviewed/expertReview.jsx
  22. 85 4333
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  23. 2609 0
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  24. 33 30
      js/component/manageCenter/demand/content.jsx
  25. 89 89
      js/component/manageCenter/idea/content.jsx
  26. 662 1017
      package-lock.json
  27. 4 3
      package.json
  28. 20 5
      webpack.config.js

+ 29 - 0
js/component/addressList.jsx

@@ -0,0 +1,29 @@
+import ajax from 'jquery/src/ajax/xhr.js'
+import $ from 'jquery/src/ajax';
+
+var addressList=[];
+module.exports={
+	getProvinceList:function(){
+		$.ajax({
+    		method: "post",
+            dataType: "json",
+            crossDomain: false,
+            async:false,
+            url: globalConfig.context + "/open/listAllProvince",
+            data: {
+            	
+            },
+            success:function(data){
+            	if (!data.data) {
+	                if (data.error && data.error.length) {
+	                    message.warning(data.error[0].message);
+	                    return;
+	                };
+	            };
+	            addressList=data.data;
+	            return addressList;
+			}
+		})
+		return addressList;
+	}
+}

+ 135 - 0
js/component/areaList.jsx

@@ -0,0 +1,135 @@
+import ajax from 'jquery/src/ajax/xhr.js'
+import $ from 'jquery/src/ajax';
+
+
+
+module.exports = {
+   
+    provinceSelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+            option.push({
+                value: item.id,
+                label: item.name
+            });
+        });
+        return option;
+    },
+    citySelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+        	if(item.cityList==null){
+        		item.cityList=[];
+        	}
+            if (item.cityList.length) {
+                let cityArr = [];
+                item.cityList.map(function (city, n) {
+                    cityArr.push({
+                        value: city.id,
+                        label: city.name
+                    });
+                });
+                option.push({
+                    value: item.id,
+                    label: item.name,
+                    children: cityArr
+                });
+            } else {
+                option.push({
+                    value: item.id,
+                    label: item.name
+                });
+            };
+        });
+        return option;
+    },
+    areaSelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+        	if(item.cityList==null){
+        		item.cityList=[];
+        	}
+            if (item.cityList.length) {
+                let cityArr = [];
+                item.cityList.map(function (city, n) {
+                	if(city.areaList==null){
+		        		city.areaList=[];
+		        	}
+                    if (city.areaList.length) {
+                        let areaArr = [];
+                        city.areaList.map(function (area, j) {
+                            areaArr.push({
+                                value: area.id,
+                                label: area.name
+                            });
+                        });
+                        cityArr.push({
+                            value: city.id,
+                            label: city.name,
+                            children: areaArr
+                        });
+                    } else {
+                        cityArr.push({
+                            value: city.id,
+                            label: city.name
+                        });
+                    };
+                });
+                option.push({
+                    value: item.id,
+                    label: item.name,
+                    children: cityArr
+                });
+            } else {
+                option.push({
+                    value: item.id,
+                    label: item.name
+                });
+            };
+        });
+        return option;
+    },
+    getProvince(province, city, area) {
+        let PList = [];
+        for (let i = 0; i < addressList.length; i++) {
+            PList.push({
+                id: addressList[i].id,
+                name: addressList[i].name
+            });
+            if (addressList[i].cityList) {
+                for (let j = 0; j < addressList[i].cityList.length; j++) {
+                    PList.push({
+                        id: addressList[i].cityList[j].id,
+                        name: addressList[i].cityList[j].name
+                    });
+                    if (addressList[i].cityList[j].areaList) {
+                        for (let n = 0; n < addressList[i].cityList[j].areaList.length; n++) {
+                            PList.push({
+                                id: addressList[i].cityList[j].areaList[n].id,
+                                name: addressList[i].cityList[j].areaList[n].name
+                            });
+                        }
+                    };
+                };
+            }
+        };
+        PList.sort(function (a, b) {
+            return a.id - b.id
+        });
+        let provinceKey = "";
+        PList.map(function (item) {
+            if (province) {
+                if (province == item.id) {
+                    provinceKey = item.name;
+                };
+                if (city == item.id) {
+                    provinceKey = provinceKey + "/" + item.name;
+                };
+                if (area == item.id) {
+                    provinceKey = provinceKey + "/" + item.name;
+                };
+            };
+        });
+        return provinceKey;
+    }
+}

+ 33 - 30
js/component/manageCenter/achievement/content.jsx

@@ -31,6 +31,7 @@ class Content extends Component {
     }
     getKey(key) {
         switch (key) {
+        	//管理
             case 'techAchievementManage':
                 require.ensure([], () => {
                     const TechAchievement = require('./techAchievement').default;
@@ -41,6 +42,7 @@ class Content extends Component {
                     });
                 });
                 break;
+            //我的
             case 'myTechAchievement':
                 require.ensure([], () => {
                     const MyTechAchievement = require('./myTechAchievement').default;
@@ -51,6 +53,7 @@ class Content extends Component {
                     });
                 });
                 break;
+            //查询
             case 'techAchievementQuery':
                 require.ensure([], () => {
                     const TechAchievementQuery = require('./techAchievementQuery').default;
@@ -61,36 +64,36 @@ class Content extends Component {
                     });
                 });
                 break;
-            case 'userTechAchievement':
-                require.ensure([], () => {
-                    const TechAchievement = require('./techAchievement').default;
-                    this.setState({
-                        component: TechAchievement,
-                        listApiUrl: '/api/admin/achievement/userList',
-                        detailApiUrl: '/api/admin/achievement/userDetail'
-                    });
-                });
-                break;
-            case 'userAchievementOrder':
-                require.ensure([], () => {
-                    const AchievementOrder = require('./achievementOrder').default;
-                    this.setState({
-                        component: AchievementOrder,
-                        listApiUrl: '/api/admin/portal/order/userAchievementOrderList',
-                        detailApiUrl: '/api/admin/achievement/userDetail'
-                    });
-                });
-                break;
-            case 'orgAchievementOrder':
-                require.ensure([], () => {
-                    const AchievementOrder = require('./achievementOrder').default;
-                    this.setState({
-                        component: AchievementOrder,
-                        listApiUrl: '/api/admin/portal/order/orgAchievementOrderList',
-                        detailApiUrl: '/api/admin/achievement/orgDetail'
-                    });
-                });
-                break;
+//          case 'userTechAchievement':
+//              require.ensure([], () => {
+//                  const TechAchievement = require('./techAchievement').default;
+//                  this.setState({
+//                      component: TechAchievement,
+//                      listApiUrl: '/api/admin/achievement/userList',
+//                      detailApiUrl: '/api/admin/achievement/userDetail'
+//                  });
+//              });
+//              break;
+//          case 'userAchievementOrder':
+//              require.ensure([], () => {
+//                  const AchievementOrder = require('./achievementOrder').default;
+//                  this.setState({
+//                      component: AchievementOrder,
+//                      listApiUrl: '/api/admin/portal/order/userAchievementOrderList',
+//                      detailApiUrl: '/api/admin/achievement/userDetail'
+//                  });
+//              });
+//              break;
+//          case 'orgAchievementOrder':
+//              require.ensure([], () => {
+//                  const AchievementOrder = require('./achievementOrder').default;
+//                  this.setState({
+//                      component: AchievementOrder,
+//                      listApiUrl: '/api/admin/portal/order/orgAchievementOrderList',
+//                      detailApiUrl: '/api/admin/achievement/orgDetail'
+//                  });
+//              });
+//              break;
             //审核
             case 'techAchievementAudit':
                 require.ensure([], () => {

+ 23 - 4
js/component/manageCenter/customer/content.jsx

@@ -29,7 +29,8 @@ class Content extends Component {
         };
     }
     getKey(key) {
-        switch (key) {          	
+        switch (key) {    
+        	//我的单位客户
             case 'myOrganization':
                 require.ensure([], () => {
                     const MyClient = require('./customerData/myClient').default;
@@ -37,7 +38,8 @@ class Content extends Component {
                         component: <MyClient />                      
                     });
                 });
-                break;           
+                break;
+           // 单位客户查询
             case 'organizationQuery':
                 require.ensure([], () => {
 	                const CompanyCustomer = require('./customerData/companyCustomer').default;
@@ -46,6 +48,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//我的个人客户
           	case 'myPersonal':
                 require.ensure([], () => {
                     const IndividualCustomer = require('./individualCustomer/individualCustomer').default;
@@ -54,7 +57,8 @@ class Content extends Component {
                       
                     });
                 });
-                break;          
+                break; 
+            //个人客户查询
             case 'personalQuery':
                 require.ensure([], () => {
 	                const QueryCustomer = require('./individualCustomer/queryCustomer').default;
@@ -63,6 +67,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//专家查询
 			case 'expertQuery':
                 require.ensure([], () => {
 	                const ExpertQuery = require('./individualCustomer/expertQuery').default;
@@ -71,14 +76,16 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//公共客户查询
           	case 'publicQuery':
                 require.ensure([], () => {
-	                const Qublicquery = require('./individualCustomer/publicquery').default;
+	                const Qublicquery = require('./individualCustomer/publicQuery').default;
 	                this.setState({
 	                    component:<Qublicquery />,	                    	                  
 	                });
           	    });
           	    break;
+          	//个人客户管理
           	case 'personalManage':
                 require.ensure([], () => {
 	                const PersonalManage = require('./customerManagement/personalManages').default;
@@ -87,6 +94,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//专家管理    
           	case 'expertManage':
                 require.ensure([], () => {
 	                const ExpertManage = require('./customerManagement/expertManage').default;
@@ -95,6 +103,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//专家审核
           	case 'expertAudit':
                 require.ensure([], () => {
 	                const ExpertReview = require('./reviewed/expertReview').default;
@@ -103,6 +112,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//实名认证
           	case 'identityAudit':
                 require.ensure([], () => {
 	                const IdentityAudits = require('./reviewed/identityAudits').default;
@@ -111,6 +121,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//专家发布
           	case 'expertPublish':
                 require.ensure([], () => {
 	                const ExpertRelease = require('./release/expertRelease').default;
@@ -119,6 +130,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//公共客户管理
           	case 'publicManage':
                 require.ensure([], () => {
 	                const PublicManages = require('./customerManagement/publicManages').default;
@@ -127,6 +139,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//单位客户管理
           	case 'organizationManage':
                 require.ensure([], () => {
 	                const OrganizationManage = require('./customerManagement/organizationManages').default;
@@ -135,6 +148,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//我的业务
       	    case 'myBusiness':
 	            require.ensure([], () => {
 	                const MyBusiness = require('./customerService/myBusiness').default;
@@ -143,6 +157,7 @@ class Content extends Component {
 	                });
 	      	    });
 	      	    break;
+	      	//业务管理
 	      	case 'businessMange':
 	            require.ensure([], () => {
 	                const BusinessMange = require('./customerService/businessManges').default;
@@ -151,6 +166,7 @@ class Content extends Component {
 	                });
 	      	    });
 	      	    break;
+	      	//业务查询
       	    case 'businessQuery':
             require.ensure([], () => {
                 const ServiceQuery = require('./customerService/serviceQuery').default;
@@ -159,6 +175,7 @@ class Content extends Component {
                 });
       	    });
       	    break;
+      	    //客户拜访统计
       	    case 'visitStatistics':
             require.ensure([], () => {
                 const VisitStatistics = require('./statistics/visitStatistics').default;
@@ -167,6 +184,7 @@ class Content extends Component {
                 });
       	    });
       	    break;
+      	    //状态统计
       	    case 'statusStatistics':
             require.ensure([], () => {
                 const StatusStatistics = require('./statistics/statusStatistics').default;
@@ -175,6 +193,7 @@ class Content extends Component {
                 });
       	    });
       	    break;
+      	    //进度统计
       	    case 'followStatistics':
             require.ensure([], () => {
                 const FollowStatistics = require('./statistics/followStatistics').default;

File diff suppressed because it is too large
+ 27 - 904
js/component/manageCenter/customer/customerData/companyCustomer.jsx


+ 1 - 1
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2042,7 +2042,7 @@ const MyClient = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>我的客户</span>
+                    <span>我的单位客户</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"

+ 13 - 5
js/component/manageCenter/customer/customerManagement/expertManage.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -846,9 +847,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1950,7 +1958,7 @@ const QueryCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>个人客户管理</span>
+                    <span>专家管理</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户姓名"
@@ -1963,7 +1971,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2106,7 +2114,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/customerManagement/organizationManages.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 import CustomerDetail from './myClientDesc.jsx';
@@ -950,9 +951,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		this.setState({ companyLogoUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2020,7 +2028,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2192,7 +2200,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 12 - 4
js/component/manageCenter/customer/customerManagement/personalManages.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -846,9 +847,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1963,7 +1971,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2122,7 +2130,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

File diff suppressed because it is too large
+ 15 - 3316
js/component/manageCenter/customer/customerManagement/publicManages.jsx


File diff suppressed because it is too large
+ 3334 - 0
js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx


+ 0 - 1
js/component/manageCenter/customer/customerService/businessManges.jsx

@@ -6,7 +6,6 @@ import moment from 'moment';
 const Option = AutoComplete.Option;
 const OptGroup = AutoComplete.OptGroup;
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';

+ 1 - 1
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -6,7 +6,7 @@ import moment from 'moment';
 const Option = AutoComplete.Option;
 const OptGroup = AutoComplete.OptGroup;
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
+
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';

+ 3 - 2
js/component/manageCenter/customer/customerService/serviceQuery.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
+
+
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getStatusFollow,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';
@@ -487,7 +488,7 @@ const ServiceQuery= Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">                  
-                    <span>我的业务</span>
+                    <span>业务查询</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"

File diff suppressed because it is too large
+ 29 - 817
js/component/manageCenter/customer/individualCustomer/expertQuery.jsx


+ 12 - 4
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 import CustomerDetail from './myClientDesc.jsx';
@@ -906,9 +907,16 @@ const IndividualCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2091,7 +2099,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
@@ -2306,7 +2314,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                            {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

File diff suppressed because it is too large
+ 41 - 4014
js/component/manageCenter/customer/individualCustomer/publicQuery.jsx


File diff suppressed because it is too large
+ 2459 - 0
js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx


+ 12 - 4
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -811,9 +812,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1928,7 +1936,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2083,7 +2091,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 13 - 5
js/component/manageCenter/customer/release/expertRelease.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -906,9 +907,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2010,7 +2018,7 @@ const QueryCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>专家申请审核</span>
+                    <span>专家发布审核</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户姓名"
@@ -2023,7 +2031,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2178,7 +2186,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/reviewed/expertReview.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -865,8 +866,15 @@ const QueryCustomer = Form.create()(React.createClass({
 	},
 	componentWillMount() {
 		//城市
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1981,7 +1989,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2143,7 +2151,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

File diff suppressed because it is too large
+ 85 - 4333
js/component/manageCenter/customer/reviewed/identityAudits.jsx


File diff suppressed because it is too large
+ 2609 - 0
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx


+ 33 - 30
js/component/manageCenter/demand/content.jsx

@@ -31,6 +31,7 @@ class Content extends Component {
     }
     getKey(key) {
         switch (key) {
+        	//管理
             case 'techDemandManage':
                 require.ensure([], () => {
                     const TechDemand = require('./techDemand').default;
@@ -41,6 +42,7 @@ class Content extends Component {
                     });
                 });
                 break;
+            //我的
             case 'myTechDemand':
                 require.ensure([], () => {
                     const MyTechDemand = require('./myTechDemand').default;
@@ -51,6 +53,7 @@ class Content extends Component {
                     });
                 });
                 break;
+            //查询
              case 'techDemandQuery':
                 require.ensure([], () => {
                     const TechDemandQuery = require('./techDemandQuery').default;
@@ -61,36 +64,36 @@ class Content extends Component {
                     });
                 });
                 break;
-            case 'userTechDemand':
-                require.ensure([], () => {
-                    const TechDemand = require('./techDemand').default;
-                    this.setState({
-                        component: TechDemand,
-                        listApiUrl: '/api/admin/demand/userList',
-                        detailApiUrl: '/api/admin/demand/userDemandDetail'
-                    });
-                });
-                break;
-            case 'orgDemandOrder':
-                require.ensure([], () => {
-                    const DemandOrder = require('./demandOrder').default;
-                    this.setState({
-                        component: DemandOrder,
-                        listApiUrl: '/api/admin/portal/order/orgDemandOrderList',
-                        detailApiUrl: '/api/admin/demand/orgDemandDetail'
-                    });
-                });
-                break;
-            case 'userDemandOrder':
-                require.ensure([], () => {
-                    const DemandOrder = require('./demandOrder').default;
-                    this.setState({
-                        component: DemandOrder,
-                        listApiUrl: '/api/admin/portal/order/userDemandOrderList',
-                        detailApiUrl: '/api/admin/demand/userDemandDetail'
-                    });
-                });
-                break;
+//          case 'userTechDemand':
+//              require.ensure([], () => {
+//                  const TechDemand = require('./techDemand').default;
+//                  this.setState({
+//                      component: TechDemand,
+//                      listApiUrl: '/api/admin/demand/userList',
+//                      detailApiUrl: '/api/admin/demand/userDemandDetail'
+//                  });
+//              });
+//              break;
+//          case 'orgDemandOrder':
+//              require.ensure([], () => {
+//                  const DemandOrder = require('./demandOrder').default;
+//                  this.setState({
+//                      component: DemandOrder,
+//                      listApiUrl: '/api/admin/portal/order/orgDemandOrderList',
+//                      detailApiUrl: '/api/admin/demand/orgDemandDetail'
+//                  });
+//              });
+//              break;
+//          case 'userDemandOrder':
+//              require.ensure([], () => {
+//                  const DemandOrder = require('./demandOrder').default;
+//                  this.setState({
+//                      component: DemandOrder,
+//                      listApiUrl: '/api/admin/portal/order/userDemandOrderList',
+//                      detailApiUrl: '/api/admin/demand/userDemandDetail'
+//                  });
+//              });
+//              break;
             //需求审核  
             case 'techDemandAudit':
                 require.ensure([], () => {

+ 89 - 89
js/component/manageCenter/idea/content.jsx

@@ -31,88 +31,88 @@ class Content extends Component {
     }
     getKey(key) {
         switch (key) {
-            case 'star':
-                require.ensure([], () => {
-                    const Star = require('./bigShot/star').default;
-                    this.setState({
-                        component: <Star />
-                    });
-                });
-                break;
-            case 'lecture':
-                require.ensure([], () => {
-                    const Lecture = require('./bigShot/lecture').default;
-                    this.setState({
-                        component: <Lecture />
-                    });
-                });
-                break;
-            case 'banner':
-                require.ensure([], () => {
-                    const Banner = require('./bannerManage/bannerManage').default;
-                    this.setState({
-                        component: <Banner />
-                    });
-                });
-                break;
-            case 'flash':
-                require.ensure([], () => {
-                    const News = require('./news/news').default;
-                    this.setState({
-                        component: <News newsType={1} />
-                    });
-                });
-                break;
-            case 'nationalPolicy':
-                require.ensure([], () => {
-                    const News = require('./news/news').default;
-                    this.setState({
-                        component: <News newsType={4} />
-                    });
-                });
-                break;
-            case 'localPolicy':
-                require.ensure([], () => {
-                    const News = require('./news/news').default;
-                    this.setState({
-                        component: <News newsType={5} />
-                    });
-                });
-                break;
-            case 'jitao':
-                require.ensure([], () => {
-                    const News = require('./news/news').default;
-                    this.setState({
-                        component: <News newsType={3} />
-                    });
-                });
-                break;
-            case 'contact':
-                require.ensure([], () => {
-                    const News = require('./news/news').default;
-                    this.setState({
-                        component: <News newsType={2} />
-                    });
-                });
-                break;
-            case 'activity':
-                require.ensure([], () => {
-                    const Activity = require('./activity/activity').default;
-                    this.setState({
-                        component: <Activity />
-                    });
-                });
-                break;
-            case 'activityUserList':
-                require.ensure([], () => {
-                    const ActivityUserList = require('./activity/activityUserList').default;
-                    this.setState({
-                        component: <ActivityUserList />
-                    });
-                });
-                break;
-            //新增科技政策
-            case 'techPolicyManage': //科技政策管理
+//          case 'star':
+//              require.ensure([], () => {
+//                  const Star = require('./bigShot/star').default;
+//                  this.setState({
+//                      component: <Star />
+//                  });
+//              });
+//              break;
+//          case 'lecture':
+//              require.ensure([], () => {
+//                  const Lecture = require('./bigShot/lecture').default;
+//                  this.setState({
+//                      component: <Lecture />
+//                  });
+//              });
+//              break;
+//          case 'banner':
+//              require.ensure([], () => {
+//                  const Banner = require('./bannerManage/bannerManage').default;
+//                  this.setState({
+//                      component: <Banner />
+//                  });
+//              });
+//              break;
+//          case 'flash':
+//              require.ensure([], () => {
+//                  const News = require('./news/news').default;
+//                  this.setState({
+//                      component: <News newsType={1} />
+//                  });
+//              });
+//              break;
+//          case 'nationalPolicy':
+//              require.ensure([], () => {
+//                  const News = require('./news/news').default;
+//                  this.setState({
+//                      component: <News newsType={4} />
+//                  });
+//              });
+//              break;
+//          case 'localPolicy':
+//              require.ensure([], () => {
+//                  const News = require('./news/news').default;
+//                  this.setState({
+//                      component: <News newsType={5} />
+//                  });
+//              });
+//              break;
+//          case 'jitao':
+//              require.ensure([], () => {
+//                  const News = require('./news/news').default;
+//                  this.setState({
+//                      component: <News newsType={3} />
+//                  });
+//              });
+//              break;
+//          case 'contact':
+//              require.ensure([], () => {
+//                  const News = require('./news/news').default;
+//                  this.setState({
+//                      component: <News newsType={2} />
+//                  });
+//              });
+//              break;
+//          case 'activity':
+//              require.ensure([], () => {
+//                  const Activity = require('./activity/activity').default;
+//                  this.setState({
+//                      component: <Activity />
+//                  });
+//              });
+//              break;
+//          case 'activityUserList':
+//              require.ensure([], () => {
+//                  const ActivityUserList = require('./activity/activityUserList').default;
+//                  this.setState({
+//                      component: <ActivityUserList />
+//                  });
+//              });
+//              break;
+           
+            case 'techPolicyManage': //科技政策管理1
                 require.ensure([], () => {
                     const Manage = require('./policy/manage').default;
                     this.setState({
@@ -120,7 +120,7 @@ class Content extends Component {
                     });
                 });
                 break;
-           	case 'techPolicyPublish': //科技政策发布
+           	case 'techPolicyPublish': //科技政策发布1
                 require.ensure([], () => {
                     const TechPolicyPublishs = require('./policy/techPolicyPublishs').default;
                     this.setState({
@@ -128,7 +128,7 @@ class Content extends Component {
                     });
                 });
                 break; 
-            case 'techPolicyQuery': //科技政策查询
+            case 'techPolicyQuery': //科技政策查询1
                 require.ensure([], () => {
                     const Inquiry = require('./policy/inquiry').default;
                     this.setState({
@@ -136,7 +136,7 @@ class Content extends Component {
                     });
                 });
                 break;
-            case 'techPolicyAudit': //科技政策审核
+            case 'techPolicyAudit': //科技政策审核1
                 require.ensure([], () => {
                     const TechPolicyAudits = require('./policy/techPolicyAudits').default;
                     this.setState({
@@ -144,8 +144,8 @@ class Content extends Component {
                     });
                 });
                 break;
-            //科技活动   
-            case 'techActivityManage': //科技政策管理
+           
+            case 'techActivityManage': 
                 require.ensure([], () => {
                     const Module = require('../module').default;
                     this.setState({
@@ -153,7 +153,7 @@ class Content extends Component {
                     });
                 });
                 break;
-            case 'techActivityAudit': //科技政策审核
+            case 'techActivityAudit': 
                 require.ensure([], () => {
                     const Module = require('../module').default;
                     this.setState({
@@ -161,7 +161,7 @@ class Content extends Component {
                     });
                 });
                 break;
-            case 'techActivityPublish': //科技政策发布
+            case 'techActivityPublish': 
                 require.ensure([], () => {
                     const Module = require('../module').default;
                     this.setState({

File diff suppressed because it is too large
+ 662 - 1017
package-lock.json


+ 4 - 3
package.json

@@ -8,12 +8,11 @@
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
     "dllstage": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy stage --env.host 'http://aftts.hnzhiming.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://static.goafanti.com'",
+    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://s.jishutao.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
     "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"
   },
   "repository": {
@@ -29,10 +28,12 @@
     "babel-plugin-import": "^1.1.1",
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-react": "^6.23.0",
+    "copy-webpack-plugin": "^4.3.1",
     "css-loader": "^0.26.2",
     "del": "^3.0.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.10.1",
+    "html-webpack-include-assets-plugin": "^1.0.2",
     "html-webpack-plugin": "^2.28.0",
     "jquery": "^3.1.1",
     "jsx-loader": "^0.13.2",
@@ -43,7 +44,7 @@
     "style-loader": "^0.13.2",
     "url-loader": "^0.5.8",
     "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.4.1"
+    "webpack-dev-server": "^2.9.7"
   },
   "dependencies": {
     "antd": "^2.7.4",

+ 20 - 5
webpack.config.js

@@ -2,6 +2,8 @@
 const path = require('path');
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const HtmlWebpackIncludeAssetsPlugin = require('html-webpack-include-assets-plugin');
 const WebpackDevServer = require('webpack-dev-server');
 const entries = require('./webpack/entry.config.js');
 const version = require('./package.json').version;
@@ -24,11 +26,24 @@ module.exports = (function () {
         new webpack.optimize.CommonsChunkPlugin({
             name: 'vendors'
         }),
-        // /* 配置好Dll */
-        // new webpack.DllReferencePlugin({
-        //     context: dirVars.staticRootDir, // 指定一个路径作为上下文环境,需要与DllPlugin的context参数保持一致,建议统一设置为项目根目录
-        //     manifest: require('./dll/'+argv.env.deploy+'/manifest.json') // 指定manifest.json
-        // }),
+       /* 配置好Dll */
+       new webpack.DllReferencePlugin({
+           context: dirVars.staticRootDir, // 指定一个路径作为上下文环境,需要与DllPlugin的context参数保持一致,建议统一设置为项目根目录
+           manifest: require('./dll/'+argv.env.deploy+'/manifest.json') // 指定manifest.json
+       }),
+	 // copy custom static assets
+		new CopyWebpackPlugin([
+		    {
+		      from: path.resolve('./dll/'+argv.env.deploy),
+		      to: (__dirname, './dll/'),
+		      ignore: ['.*']
+		    }
+		]),
+		  // 将 vendor.dll.js 插入HTML里
+		new HtmlWebpackIncludeAssetsPlugin({
+		    assets: [(__dirname, 'dll/dll.js'),(__dirname, 'dll/dll.css')],
+		    append: false
+		}),
         new ExtractTextPlugin({
             filename: "[name].css",
             disable: false,