liting2017 6 years ago
parent
commit
9a3e795929

+ 5 - 2
js/component/account/business/businessDetails.jsx

@@ -3,6 +3,7 @@ import $ from 'jquery/src/ajax';
 import { Modal, message, Spin, Upload, Button, Form } from 'antd';
 import { getprovince, splitUrl } from '@/tools.js';
 import './business.less';
+import 'react-quill/dist/quill.bubble.css';
 
 const DemandDetail = Form.create()(
 	React.createClass({
@@ -280,8 +281,10 @@ const DemandDetail = Form.create()(
 								</FormItem>
 							</div>
 							<div className="clearfix">
-								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目服务内容">
-									<div className="txt"></div>
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
+									<div className="ql-editor">
+										<div className="txt"></div>
+									</div>
 								</FormItem>
 							</div>
 							<div className="clearfix pictures">

+ 92 - 1
js/component/account/business/businessForm.jsx

@@ -297,7 +297,6 @@ const DemandDetailForm = Form.create()(
 				this.loadData(this.props.data.id);
 			}
 		},
-		
 		//标签
 		tagOk(){
 			this.setState({
@@ -335,6 +334,97 @@ const DemandDetailForm = Form.create()(
 				tagTxt:tags.join(' - ')
 			})
 		},
+		//发布后查看效果
+		lookSee(e){
+			e.preventDefault();
+			if (!this.state.name) {
+				message.warning('请输入项目名称');
+				return;
+			}
+			if ((this.state.name).length>16) {
+				message.warning('项目名称在16个字以内');
+				return false;
+			};
+			if (!this.state.categoryId||!this.state.categoryId[1]) {
+				message.warning('请选择项目二级业务品类');
+				return;
+			}
+			if (!this.state.ProvinceCity.length) {
+				message.warning('请选择省份');
+				return;
+			}
+			if (!this.state.price) {
+				message.warning('请输入正确的市场价');
+				return;
+			}
+			if(this.state.advertisement&&(this.state.advertisement).length>30){
+				message.warning('项目营销说明字数不得超过30个字。');
+				return;
+			}
+			this.setState({
+				loading: true
+			});
+			let minPictureUrl = [];
+			if (this.state.orgCodeUrl.length) {
+				let picArr = [];
+				this.state.orgCodeUrl.map(function(item) {
+					if (item.response && item.response.data && item.response.data.length) {
+						picArr.push(item.response.data);
+					}
+				});
+				minPictureUrl = picArr.join(',');
+			}
+			let maxPictureUrl = [];
+			if (this.state.companyLogoUrl.length) {
+				let picArr = [];
+				this.state.companyLogoUrl.map(function(item) {
+					if (item.response && item.response.data && item.response.data.length) {
+						picArr.push(item.response.data);
+					}
+				});
+				maxPictureUrl = picArr.join(',');
+			}
+			$.ajax({
+				method: 'post',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtBusiness/project/update',
+				data: {
+					id: this.state.id, //业务名称
+					name: this.state.name, //业务名称
+					categoryId: this.state.categoryId[1], //业务品类
+					price: this.state.price, //市场价
+					advertisement:this.state.advertisement,//项目营销说明
+					activityPrice: this.state.activityPrice ? this.state.activityPrice : '0', //最低折扣
+					memberPrice: this.state.memberPrice ? this.state.memberPrice : '0', //会员价
+					offset: this.state.offset ? this.state.offset : '0',
+					activityFlag: this.state.activityFlag, //活动生效标识
+					province: this.state.ProvinceCity ? this.state.ProvinceCity[0] : '', //是否全国
+					city: this.state.ProvinceCity ? this.state.ProvinceCity[1] : '',
+					introduce: this.state.introduce,
+					value: this.state.value,
+					isHot: this.state.isHot,
+					minImgUrl: minPictureUrl.length ? minPictureUrl : '',
+					maxImgUrl: maxPictureUrl.length ? maxPictureUrl : '',
+					applyConditions: this.state.applyConditions,
+					tag:this.state.tagArr.join(',')
+				}
+			}).done(
+				function(data) {
+					if (!data.error.length) {
+						this.setState({
+							loading: false,
+						});
+						message.success('提交预览请求成功,即将跳转预览页面');
+						setTimeout(()=>{
+							window.open(globalConfig.context+'/portal/service/patentDetail?id='+this.state.id)
+						},2000)
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this)
+			);
+		},
 		componentWillReceiveProps(nextProps) {
 			if (!this.props.visible && nextProps.visible) {
 				this.state.textFileList = [];
@@ -615,6 +705,7 @@ const DemandDetailForm = Form.create()(
 										uploadSign={'demand_picture'}
 										handleRichText={(value) => { this.state.introduce = value;  }}
 										visible={this.state.visible} />
+										<Button type="dashed" onClick={this.lookSee} style={{marginTop:10}}>预览发布后效果</Button>
 								</FormItem>
 							</div>
 							<div className="clearfix pictures">

+ 8 - 19
js/component/account/setAccount/expert.jsx

@@ -128,12 +128,14 @@ const Expert = React.createClass({
 					let authenticationState='';
 				if(thisData.auditStatus=='3'){
 					authenticationState=thisData.expert+''
-				}
+				}   
 				this.setState({
 					InformationId: thisData.id,
                     InformationUid: thisData.uid,
 					authentication:thisData.authentication,
 					authenticationState:authenticationState,
+					dateOfBirthYear:thisData.dateOfBirthYear,
+					dateOfBirthMonth:thisData.dateOfBirthMonth,
 					type:thisData.type,          //0-个人认证  1-企业认证 
 					expert:thisData.expert,   //认证类型   0-未认证专家顾问  1-专家认证 2-顾问认证
  					authMessage:thisData.auditInfo,
@@ -217,21 +219,8 @@ const Expert = React.createClass({
 				});
 				thecompanyLogoUrls = picArr.join(',');
 			}
-			//顾问照片
-			let adviserPic = [];
-			if (this.state.adviserUrl.length) {
-				let picArr = [];
-				this.state.adviserUrl.map(function(item) {
-					if (item.response && item.response.data && item.response.data.length) {
-						picArr.push(item.response.data);
-					}
-				});
-				adviserPic = picArr.join(',');
-			}
 			let years = [];
-			let yearMonth =
-				this.state.yearMonth != undefined ? new Date(this.state.yearMonth).toLocaleDateString() : '';
-			years = yearMonth.split('/');
+			years = this.state.yearList!=undefined?(this.state.yearList).split('/'):[this.state.dateOfBirthYear,this.state.dateOfBirthMonth];
         this.setState({
             loading: true
 		});
@@ -243,8 +232,8 @@ const Expert = React.createClass({
 				societyTag: values.societyTag,
 				identifyName: values.identifyName,
 				industry: values.industry,
-				dateOfBirthYear: years[0], //出生年
-				dateOfBirthMonth: years[1], //出生月
+				dateOfBirthYear: years[0]||'', //出生年
+				dateOfBirthMonth: years[1]||'', //出生月
 				province: (values.ProvinceCity)[0], //省-
 				city:(values.ProvinceCity)[1], //市
 				area:(values.ProvinceCity)[2], //区
@@ -425,8 +414,8 @@ const Expert = React.createClass({
                                 <MonthPicker
                                     value={this.state.yearMonth?moment(this.state.yearMonth, monthFormat):undefined}
                                     format={monthFormat}
-                                    onChange={(time) => {
-                                        this.setState({ yearMonth: time });
+                                    onChange={(time,times) => {
+                                        this.setState({ yearMonth: time,yearList:times });
                                     }}
                                 />
 							</FormItem>

+ 22 - 10
js/component/administration/business/businessCategory.jsx

@@ -235,20 +235,29 @@ const BusinessCategory=Form.create()(React.createClass({
                 }
             });
             thePictureUrl = picArr.join(",");
-		};
+        };
+        let dataList={}
+        if(this.state.layer=='1'){
+            dataList.id=this.state.id;
+            dataList.name=this.state.name;
+            dataList.summary=this.state.summary;
+            dataList.imgUrl=thePictureUrl;
+            dataList.module=this.state.moduleNumber;
+            dataList.nextModule=this.state.modules;
+        }else{
+            dataList.id=this.state.id;
+            dataList.name=this.state.name;
+            dataList.summary=this.state.summary;
+            dataList.imgUrl=thePictureUrl;
+            dataList.oldSuperId=this.state.superId;
+            dataList.superId=this.state.superNameId;
+        }
         $.ajax({
             method: "post",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/jtBusiness/category/update",
-            data: {
-                id: this.state.id,
-                name:this.state.name,
-                summary:this.state.summary,
-                imgUrl:thePictureUrl,
-                module:this.state.modules,
-                superId:this.state.superNameId
-            }
+            data:dataList 
         }).done(function (data) {
             if (!data.error.length) {
                 message.success('保存成功!');
@@ -367,7 +376,10 @@ const BusinessCategory=Form.create()(React.createClass({
                         superId:thisdata.superId,//父类id
                         modules:thisdata.module?thisdata.module.toString():undefined,
                         pictureUrl: thisdata.imgUrl ? splitUrl(thisdata.imgUrl, ',', globalConfig.avatarHost + '/upload') : [],
-                        superNameId:thisdata.superId
+                        number:thisdata.number,
+                        layer:thisdata.layer,
+                        superNameId:thisdata.superId,
+                        moduleNumber:thisdata.module?thisdata.module.toString():undefined,
                     })
                 };
             }.bind(this),

+ 5 - 3
js/component/administration/business/businessProject.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import $ from 'jquery/src/ajax';
-import { citySelect } from '@/NewDicProvinceListAll';
+import 'react-quill/dist/quill.bubble.css';
 import {
 	Form,
 	Icon,
@@ -657,8 +657,10 @@ const BusinessProject = Form.create()(
 											</FormItem>
 										</div>
 										<div className="clearfix">
-											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目服务内容">
-												<div className="txt"></div>
+											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
+												<div className="ql-editor">
+													<div className="txt"></div>
+												</div>
 											</FormItem>
 										</div>
 										<div className="clearfix pictures">

+ 0 - 12
js/component/administration/policy/policy.less

@@ -1,12 +0,0 @@
-.txt{
-    p{
-        word-wrap:break-word;
-        width: 726px;
-    }
-    img{
-        width: 520px;
-        height: 200px;
-        margin: 0 auto;
-    }
-
-}

+ 4 - 1
js/component/administration/policy/policyDetails.jsx

@@ -9,6 +9,7 @@ import {
 	Form,
 } from 'antd';
 import {getProvince} from '@/NewDicProvinceList';
+import 'react-quill/dist/quill.bubble.css';
 import './policy.less'
 import {getReleaseStateList,getPolicyPosition,splitUrl} from '@/tools';
 const NewDetail = Form.create()(React.createClass({
@@ -213,7 +214,9 @@ const NewDetail = Form.create()(React.createClass({
 							<span>{theData.summary}</span>
 						</FormItem>
                         <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="政策正文">
-							<div className="txt" ></div>
+                        <div className="ql-editor">
+                            <div className="txt"></div>
+                        </div>
 						</FormItem>
 					</div>
 					<div className="clearfix">

+ 149 - 184
package-lock.json

@@ -253,11 +253,14 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "asn1": {
-      "version": "0.2.3",
-      "resolved": "http://registry.npm.taobao.org/asn1/download/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "version": "0.2.4",
+      "resolved": "http://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz",
+      "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
       "dev": true,
-      "optional": true
+      "optional": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
     },
     "asn1.js": {
       "version": "4.9.1",
@@ -280,11 +283,10 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-      "dev": true,
-      "optional": true
+      "version": "1.0.0",
+      "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -349,16 +351,16 @@
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "version": "0.7.0",
+      "resolved": "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true,
       "optional": true
     },
     "aws4": {
-      "version": "1.6.0",
-      "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "version": "1.8.0",
+      "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz",
+      "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=",
       "dev": true,
       "optional": true
     },
@@ -1070,9 +1072,9 @@
       "dev": true
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "version": "1.0.2",
+      "resolved": "http://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1164,15 +1166,6 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "dev": true,
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.8.tgz",
@@ -1716,9 +1709,9 @@
       "dev": true
     },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "version": "1.0.6",
+      "resolved": "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
         "delayed-stream": "1.0.0"
@@ -2085,16 +2078,6 @@
         "object-assign": "4.1.1"
       }
     },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "http://registry.npm.taobao.org/cryptiles/download/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boom": "2.10.1"
-      }
-    },
     "crypto-browserify": {
       "version": "3.11.1",
       "resolved": "http://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.11.1.tgz",
@@ -2281,15 +2264,6 @@
       "optional": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "date-now": {
@@ -2624,13 +2598,14 @@
       }
     },
     "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "version": "0.1.2",
+      "resolved": "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "0.1.1"
+        "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2"
       }
     },
     "echarts": {
@@ -2992,6 +2967,13 @@
       "resolved": "http://registry.npm.taobao.org/fast-diff/download/fast-diff-1.1.1.tgz",
       "integrity": "sha1-CuoOTmBbaiGJ8Ok21Lf7rxt8/Zs="
     },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "http://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true,
+      "optional": true
+    },
     "fastparse": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/fastparse/download/fastparse-1.1.1.tgz",
@@ -3214,14 +3196,14 @@
       "optional": true
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.2",
+      "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "dev": true,
       "optional": true,
       "requires": {
         "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
+        "combined-stream": "1.0.6",
         "mime-types": "2.1.16"
       }
     },
@@ -3345,15 +3327,6 @@
       "optional": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "glob": {
@@ -3434,32 +3407,34 @@
       "dev": true
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "version": "2.0.0",
+      "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true,
       "optional": true
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.1.0",
+      "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-5.1.0.tgz",
+      "integrity": "sha1-RGV/VoiiLP1LckhugbOj+xF0LCk=",
       "dev": true,
       "optional": true,
       "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "4.11.8",
-          "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "version": "5.5.2",
+          "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "optional": true,
           "requires": {
             "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         }
       }
@@ -3567,19 +3542,6 @@
         "minimalistic-assert": "1.0.0"
       }
     },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "http://registry.npm.taobao.org/hawk/download/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
-      }
-    },
     "he": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/he/download/he-1.1.1.tgz",
@@ -3609,12 +3571,6 @@
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "http://registry.npm.taobao.org/hoek/download/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
-    },
     "hoist-non-react-statics": {
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-1.2.0.tgz",
@@ -3847,15 +3803,15 @@
       }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "optional": true,
       "requires": {
-        "assert-plus": "0.2.0",
+        "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
+        "sshpk": "1.14.2"
       }
     },
     "https-browserify": {
@@ -4468,15 +4424,6 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "jstransform": {
@@ -4567,7 +4514,7 @@
         "mime": "1.3.6",
         "mkdirp": "0.5.1",
         "promise": "7.3.1",
-        "request": "2.81.0",
+        "request": "2.88.0",
         "source-map": "0.5.6"
       }
     },
@@ -5245,9 +5192,9 @@
       "dev": true
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "version": "0.9.0",
+      "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz",
+      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
       "dev": true,
       "optional": true
     },
@@ -5671,9 +5618,9 @@
       }
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "version": "2.1.0",
+      "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true,
       "optional": true
     },
@@ -6355,6 +6302,13 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
+    "psl": {
+      "version": "1.1.29",
+      "resolved": "http://registry.npm.taobao.org/psl/download/psl-1.1.29.tgz",
+      "integrity": "sha1-YPWA02AXC7cip5fMcEQR5tqFDGc=",
+      "dev": true,
+      "optional": true
+    },
     "public-encrypt": {
       "version": "4.0.0",
       "resolved": "http://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.0.tgz",
@@ -6414,9 +6368,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "version": "6.5.2",
+      "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
+      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=",
       "dev": true,
       "optional": true
     },
@@ -7395,34 +7349,72 @@
       }
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "http://registry.npm.taobao.org/request/download/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "version": "2.88.0",
+      "resolved": "http://registry.npm.taobao.org/request/download/request-2.88.0.tgz",
+      "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=",
       "dev": true,
       "optional": true,
       "requires": {
-        "aws-sign2": "0.6.0",
-        "aws4": "1.6.0",
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
         "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.2",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.1.0",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.16",
-        "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "mime-types": "2.1.19",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
         "tunnel-agent": "0.6.0",
-        "uuid": "3.1.0"
+        "uuid": "3.3.2"
+      },
+      "dependencies": {
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
+          "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
+          "dev": true,
+          "optional": true
+        },
+        "mime-db": {
+          "version": "1.35.0",
+          "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.35.0.tgz",
+          "integrity": "sha1-BWnWV0ZkkSg3CWY603mpm5DZq0c=",
+          "dev": true,
+          "optional": true
+        },
+        "mime-types": {
+          "version": "2.1.19",
+          "resolved": "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.19.tgz",
+          "integrity": "sha1-ceRkU3p++BwV8tudl+kT/A/2BvA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mime-db": "1.35.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
+          "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
+          "dev": true,
+          "optional": true
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.2.tgz",
+          "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "require-directory": {
@@ -7512,6 +7504,12 @@
       "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
       "dev": true
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "dev": true
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "http://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz",
@@ -7840,16 +7838,6 @@
         "kind-of": "3.2.2"
       }
     },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "http://registry.npm.taobao.org/sntp/download/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "hoek": "2.16.3"
-      }
-    },
     "sockjs": {
       "version": "0.3.19",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
@@ -8053,29 +8041,21 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "http://registry.npm.taobao.org/sshpk/download/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.14.2",
+      "resolved": "http://registry.npm.taobao.org/sshpk/download/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
       "dev": true,
       "optional": true,
       "requires": {
-        "asn1": "0.2.3",
+        "asn1": "0.2.4",
         "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
+        "bcrypt-pbkdf": "1.0.2",
         "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
+        "ecc-jsbn": "0.1.2",
         "getpass": "0.1.7",
         "jsbn": "0.1.1",
+        "safer-buffer": "2.1.2",
         "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "ssri": {
@@ -8302,13 +8282,6 @@
       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
       "dev": true
     },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "http://registry.npm.taobao.org/stringstream/download/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-      "dev": true,
-      "optional": true
-    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
@@ -8576,12 +8549,13 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.4.3",
+      "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.4.3.tgz",
+      "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=",
       "dev": true,
       "optional": true,
       "requires": {
+        "psl": "1.1.29",
         "punycode": "1.4.1"
       }
     },
@@ -9024,15 +8998,6 @@
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "vm-browserify": {

+ 1 - 1
webpack-dll.config.js

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

+ 4 - 4
webpack.config.js

@@ -47,7 +47,7 @@ module.exports = (function () {
         new webpack.ProvidePlugin({
 			$: 'jquery',
 			React:'react',
-			Mock:'mockjs'
+            Mock:'mockjs'
 		}),
 		//定义全局常量
 		// new webpack.DefinePlugin({
@@ -115,7 +115,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188';    
+    let staticHost = 'http://192.168.1.188';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -150,9 +150,9 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.188',
+            host: '192.168.1.188',
             port: 80,
-            allowedHosts: ['127.0.0.1','192.168.0.185'],
+            allowedHosts: ['127.0.0.1','192.168.1.165'],
             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.1.188', // 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.1.188', // 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.1.188', // 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.1.188', // 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.1.188', // 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.1.188', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/admin/index.js'
     ]