Преглед изворни кода

接口更改,验证码更改

yee пре 8 година
родитељ
комит
9809fa280a
33 измењених фајлова са 193 додато и 115 уклоњено
  1. 5 5
      js/component/account/services/achievement.jsx
  2. 5 5
      js/component/account/services/activity.jsx
  3. 5 5
      js/component/account/services/activityCostList.jsx
  4. 5 5
      js/component/account/services/annualReport.jsx
  5. 7 7
      js/component/account/services/cognizance.jsx
  6. 2 2
      js/component/account/services/copyright/comPatentAdd.jsx
  7. 8 8
      js/component/account/services/copyright/comPatentChange.jsx
  8. 1 1
      js/component/account/services/copyright/copyright.jsx
  9. 4 4
      js/component/account/services/finance.jsx
  10. 4 4
      js/component/account/services/honorList.jsx
  11. 2 2
      js/component/account/services/intellectual.jsx
  12. 2 2
      js/component/account/services/intellectualDesc.jsx
  13. 7 7
      js/component/account/services/orgTechCenter.jsx
  14. 1 1
      js/component/account/services/patent.jsx
  15. 3 3
      js/component/account/services/patentAdd.jsx
  16. 7 7
      js/component/account/services/patentDesc.jsx
  17. 4 4
      js/component/account/services/ratepay.jsx
  18. 3 3
      js/component/account/services/standard.jsx
  19. 5 5
      js/component/account/services/techProduct.jsx
  20. 3 3
      js/component/account/services/technology.jsx
  21. 1 1
      js/component/account/services/technologyAdd.jsx
  22. 4 4
      js/component/account/services/technologyChange.jsx
  23. 3 3
      js/component/account/set/hrSituation.jsx
  24. 1 1
      js/component/groupCertify/personal.jsx
  25. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx
  26. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  27. 2 2
      js/component/manageCenter/servicesManage/highTech/highTechFoster.jsx
  28. 2 2
      js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx
  29. 50 2
      js/component/manageCenter/servicesManage/patent/comprehensive.jsx
  30. 1 1
      js/component/manageCenter/servicesManage/technology/websiteManage.jsx
  31. 1 0
      js/component/manageCenter/set/member.jsx
  32. 22 7
      js/component/sign/account.jsx
  33. 21 7
      js/component/sign/groupAccount.jsx

+ 5 - 5
js/component/account/services/achievement.jsx

@@ -58,7 +58,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeAchievement",
+                    url: globalConfig.context + "/api/user/cognizance/disposeAchievement",
                     data: {
                         id: this.props.data.id,
                         achievementName: values.achievementName,
@@ -160,7 +160,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'achievement' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -257,7 +257,7 @@ const Achievement = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/achievementList",
+            url: globalConfig.context + "/api/user/cognizance/achievementList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -266,7 +266,7 @@ const Achievement = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityNumber",
+            url: globalConfig.context + "/api/user/cognizance/activityNumber",
         })).done((data1, data2) => {
             let data = data1[0];
             let activityNumber = data2[0];
@@ -389,7 +389,7 @@ const Achievement = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteAchievement",
+            url: globalConfig.context + "/api/user/cognizance/deleteAchievement",
             data: {
                 ids: deletedIds
             }

+ 5 - 5
js/component/account/services/activity.jsx

@@ -25,7 +25,7 @@ const ActivityDesc = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activity",
+            url: globalConfig.context + "/api/user/cognizance/activity",
             data: {
                 id: this.props.data.id,
                 activityName: this.state.activityName,
@@ -251,7 +251,7 @@ const ActivityDesc = React.createClass({
                         <div style={{ width: '50%' }}>
                             <Upload
                                 name="ratepay"
-                                action={globalConfig.context + "/techservice/cognizance/upload"}
+                                action={globalConfig.context + "/api/user/cognizance/upload"}
                                 data={{ 'sign': 'proof' }}
                                 beforeUpload={beforeUploadFile}
                                 showUploadList={false}
@@ -295,7 +295,7 @@ const Activity = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityList",
+            url: globalConfig.context + "/api/user/cognizance/activityList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -308,7 +308,7 @@ const Activity = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/intellectualList",
+            url: globalConfig.context + "/api/user/cognizance/intellectualList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: 99,
@@ -468,7 +468,7 @@ const Activity = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteActivity",
+            url: globalConfig.context + "/api/user/cognizance/deleteActivity",
             data: {
                 ids: deletedIds
             }

+ 5 - 5
js/component/account/services/activityCostList.jsx

@@ -48,7 +48,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/activityCost",
+                    url: globalConfig.context + "/api/user/cognizance/activityCost",
                     data: {
                         id: this.props.data.id,
                         aid: this.state.aid,
@@ -266,7 +266,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                 <div style={{ width: '50%', marginTop: '20px' }}>
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'activity_cost_account' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -364,7 +364,7 @@ const Activity = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityCostList",
+            url: globalConfig.context + "/api/user/cognizance/activityCostList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -376,7 +376,7 @@ const Activity = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/activityNumber",
+            url: globalConfig.context + "/api/user/cognizance/activityNumber",
         })).done((data1, data2) => {
             let data = data1[0];
             let activityNumber = data2[0];
@@ -559,7 +559,7 @@ const Activity = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteActivityCost",
+            url: globalConfig.context + "/api/user/cognizance/deleteActivityCost",
             data: {
                 ids: deletedIds
             }

+ 5 - 5
js/component/account/services/annualReport.jsx

@@ -33,7 +33,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeAnnualReport",
+                    url: globalConfig.context + "/api/user/cognizance/disposeAnnualReport",
                     data: {
                         id: this.props.data.id,
                         year: this.props.data.year,
@@ -324,7 +324,7 @@ const AnnualReportDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/annualReportDetail",
+            url: globalConfig.context + "/api/user/cognizance/annualReportDetail",
             data: {
                 year: this.props.data ? this.props.data.year : (new Date().getFullYear() - 1)
             }
@@ -477,7 +477,7 @@ const AnnualReportAdd = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/disposeAnnualReport",
+            url: globalConfig.context + "/api/user/cognizance/disposeAnnualReport",
             data: {
                 year: this.state.year,
                 totalTax: this.state.totalTax,
@@ -574,7 +574,7 @@ const AnnualReport = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/annualReport",
+            url: globalConfig.context + "/api/user/cognizance/annualReport",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -684,7 +684,7 @@ const AnnualReport = React.createClass({
     //         method: "POST",
     //         dataType: "json",
     //         crossDomain: false,
-    //         url: globalConfig.context + "/techservice/cognizance/deleteAnnualReport",
+    //         url: globalConfig.context + "/api/user/cognizance/deleteAnnualReport",
     //         data: {
     //             ids: deletedIds
     //         }

+ 7 - 7
js/component/account/services/cognizance.jsx

@@ -17,7 +17,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/cognizanceDetail",
+            url: globalConfig.context + "/api/user/cognizance/cognizanceDetail",
             data: {
                 cid: this.props.data.cid,
                 year: this.props.data.year
@@ -63,7 +63,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/cognizanceLog",
+            url: globalConfig.context + "/api/user/cognizance/cognizanceLog",
             data: {
                 cid: this.props.data.cid
             },
@@ -154,7 +154,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeCognizanceDetail",
+                    url: globalConfig.context + "/api/user/cognizance/disposeCognizanceDetail",
                     data: {
                         id: this.props.data.cid,
                         technicalField1: values.technicalField[0],
@@ -431,7 +431,7 @@ const CognizanceAdd = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/applyCognizance",
+            url: globalConfig.context + "/api/user/cognizance/applyCognizance",
             data: {
                 year: this.state.year,
                 contacts: this.state.contacts,
@@ -517,12 +517,12 @@ const Cognizance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/getContacts"
+            url: globalConfig.context + "/api/user/cognizance/getContacts"
         }), $.ajax({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/listCognizance",
+            url: globalConfig.context + "/api/user/cognizance/listCognizance",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize
@@ -683,7 +683,7 @@ const Cognizance = React.createClass({
     //         method: "POST",
     //         dataType: "json",
     //         crossDomain: false,
-    //         url: globalConfig.context + "/techservice/cognizance/deleteTechProduct",
+    //         url: globalConfig.context + "/api/user/cognizance/deleteTechProduct",
     //         data: {
     //             ids: deletedIds
     //         }

+ 2 - 2
js/component/account/services/copyright/comPatentAdd.jsx

@@ -11,7 +11,7 @@ const PatentAddFrom = Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/getContacts",
+            url: globalConfig.context + "/api/user/cognizance/getContacts",
             success: function (data) {
                 let theOption = [];
                 if (data.error.length || !data.data) {
@@ -46,7 +46,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/copyright/apply",
+                    url: globalConfig.context + "/api/user/copyright/apply",
                     data: {
                         //"uid": values.uid, // 公司用户id,size 0-36, required
                         "contact": values.contact, // 联系人, 1,2,3

+ 8 - 8
js/component/account/services/copyright/comPatentChange.jsx

@@ -57,7 +57,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
             dataType: "json",
             crossDomain: false,
             cache: false,
-            url: globalConfig.context + "/techservice/copyright/logs",
+            url: globalConfig.context + "/api/user/copyright/logs",
             data: {
                 id: id || this.props.data.id
             }
@@ -66,13 +66,13 @@ const CopyrightDescForm = Form.create()(React.createClass({
             dataType: "json",
             crossDomain: false,
             cache: false,
-            url: globalConfig.context + "/techservice/cognizance/getContacts"
+            url: globalConfig.context + "/api/user/cognizance/getContacts"
         }), $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
             cache: false,
-            url: globalConfig.context + "/techservice/copyright/detail",
+            url: globalConfig.context + "/api/user/copyright/detail",
             data: {
                 id: id || this.props.data.id
             }
@@ -165,7 +165,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/copyright/modify",
+                    url: globalConfig.context + "/api/user/copyright/modify",
                     data: {
                         "id": this.props.data.id,
                         "contact": values.contact, // 联系人, 1,2,3
@@ -306,7 +306,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="copyright_apply"
-                        action={globalConfig.context + "/techservice/copyright/upload"}
+                        action={globalConfig.context + "/api/user/copyright/upload"}
                         data={{ 'sign': 'copyright_apply', id: this.props.data.id }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -329,12 +329,12 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     >
                         <Button><Icon type="upload" /> 上传软著申请书 </Button>
                     </Upload>
-                    <p style={{ margin: '10px 0' }}>{theData.applicationUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_apply', '/techservice/copyright/download')}>{theData.applicationUrlDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
+                    <p style={{ margin: '10px 0' }}>{theData.applicationUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_apply', '/api/user/copyright/download')}>{theData.applicationUrlDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
                 <div className="hrSituation-roster">
                     <Upload
                         name="copyright_auth"
-                        action={globalConfig.context + "/techservice/copyright/upload"}
+                        action={globalConfig.context + "/api/user/copyright/upload"}
                         data={{ 'sign': 'copyright_auth', id: this.props.data.id }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -357,7 +357,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     >
                         <Button><Icon type="upload" /> 上传软著证书 </Button>
                     </Upload>
-                    <p style={{ margin: '10px 0' }}>{theData.certificateUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_auth', '/techservice/copyright/download')}>{theData.certificateUrlDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
+                    <p style={{ margin: '10px 0' }}>{theData.certificateUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_auth', '/api/user/copyright/download')}>{theData.certificateUrlDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
                 <p>状态流转记录: </p>
                 <Table style={{ margin: '10px 0' }}

+ 1 - 1
js/component/account/services/copyright/copyright.jsx

@@ -20,7 +20,7 @@ const copyright = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/copyright/list",
+            url: globalConfig.context + "/api/user/copyright/list",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,

+ 4 - 4
js/component/account/services/finance.jsx

@@ -36,7 +36,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeFinance",
+                    url: globalConfig.context + "/api/user/cognizance/disposeFinance",
                     data: {
                         id: this.props.data.id,
                         mainBusinessIncome: values.mainBusinessIncome,
@@ -215,7 +215,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'finance_' + (this.state.year || theData.year) }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -311,7 +311,7 @@ const Finance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/finance",
+            url: globalConfig.context + "/api/user/cognizance/finance",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -442,7 +442,7 @@ const Finance = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteFinance",
+            url: globalConfig.context + "/api/user/cognizance/deleteFinance",
             data: {
                 ids: deletedIds
             }

+ 4 - 4
js/component/account/services/honorList.jsx

@@ -21,7 +21,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeHonor",
+                    url: globalConfig.context + "/api/user/cognizance/disposeHonor",
                     data: {
                         id: this.props.data.id,
                         name: values.name,
@@ -97,7 +97,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'achievement' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -195,7 +195,7 @@ const HonorList = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/honorList",
+            url: globalConfig.context + "/api/user/cognizance/honorList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize
@@ -302,7 +302,7 @@ const HonorList = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteHonor",
+            url: globalConfig.context + "/api/user/cognizance/deleteHonor",
             data: {
                 ids: deletedIds
             }

+ 2 - 2
js/component/account/services/intellectual.jsx

@@ -18,7 +18,7 @@ const Intellectual = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/intellectualList",
+            url: globalConfig.context + "/api/user/cognizance/intellectualList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -142,7 +142,7 @@ const Intellectual = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteIntellectual",
+            url: globalConfig.context + "/api/user/cognizance/deleteIntellectual",
             data: {
                 ids: deletedIds
             }

+ 2 - 2
js/component/account/services/intellectualDesc.jsx

@@ -37,7 +37,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/intellectual",
+                    url: globalConfig.context + "/api/user/cognizance/intellectual",
                     data: {
                         id: this.props.data.id,
                         intellectualPropertyNumber: values.intellectualPropertyNumber,
@@ -173,7 +173,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 <div>
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'property_ritht' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}

+ 7 - 7
js/component/account/services/orgTechCenter.jsx

@@ -21,7 +21,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeCenterDetail",
+                    url: globalConfig.context + "/api/user/cognizance/disposeCenterDetail",
                     data: {
                         id: this.props.data.id,
                         projectName: values.projectName,
@@ -104,7 +104,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'protocol' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -197,7 +197,7 @@ const CenterList = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/center",
+            url: globalConfig.context + "/api/user/cognizance/center",
             data: {
             }
         }).done((data) => {
@@ -232,7 +232,7 @@ const CenterList = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/centerDetail",
+            url: globalConfig.context + "/api/user/cognizance/centerDetail",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -344,7 +344,7 @@ const CenterList = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteOrgTechCenterDetail",
+            url: globalConfig.context + "/api/user/cognizance/deleteOrgTechCenterDetail",
             data: {
                 ids: deletedIds
             }
@@ -374,7 +374,7 @@ const CenterList = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/disposeCenter",
+            url: globalConfig.context + "/api/user/cognizance/disposeCenter",
             data: {
                 id: this.state.cid,
                 principal: this.state.principal,
@@ -451,7 +451,7 @@ const CenterList = React.createClass({
                     <div style={{ margin: '10px 0' }}>
                         <Upload
                             name="ratepay"
-                            action={globalConfig.context + "/techservice/cognizance/upload"}
+                            action={globalConfig.context + "/api/user/cognizance/upload"}
                             data={{ 'sign': 'institution' }}
                             beforeUpload={beforeUploadFile}
                             showUploadList={false}

+ 1 - 1
js/component/account/services/patent.jsx

@@ -24,7 +24,7 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/clientApplyList?pageNo=" + page + "&pageSize=" + pageSize + "&patentNumber=" + patentNumber + "&patentName=" + patentName + "&patentCatagory=" + patentCatagory + "&patentState=" + patentState,
+            url: globalConfig.context + "/api/user/patent/clientApplyList?pageNo=" + page + "&pageSize=" + pageSize + "&patentNumber=" + patentNumber + "&patentName=" + patentName + "&patentCatagory=" + patentCatagory + "&patentState=" + patentState,
             success: function (data) {
                 if (!data.data) {
                     if (data.error && data.error.length) {

+ 3 - 3
js/component/account/services/patentAdd.jsx

@@ -30,7 +30,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/patent/clientApplyPatent",
+                    url: globalConfig.context + "/api/user/patent/clientApplyPatent",
                     data: {
                         'firstInventorIdNumber': values.firstInventorID,
                         'firstInventorName': values.firstInventorName,
@@ -181,7 +181,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'patent_prory_statement' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -205,7 +205,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                         <Button><Icon type="upload" /> 上传专利代理委托书 </Button>
                     </Upload>
                     <p style={{ paddingLeft: '10px', marginTop: '10px' }}>
-                        <a onClick={() => { window.open(globalConfig.context + "/techservice/patent/downloadTemplateFile?sign=patent_prory_statement") }}>专利代理委托书模板下载</a>
+                        <a onClick={() => { window.open(globalConfig.context + "/api/user/patent/downloadTemplateFile?sign=patent_prory_statement") }}>专利代理委托书模板下载</a>
                     </p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>

+ 7 - 7
js/component/account/services/patentDesc.jsx

@@ -29,7 +29,7 @@ const PatentDesc = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/clientPatentInfo?pid=" + thepid,
+            url: globalConfig.context + "/api/user/patent/clientPatentInfo?pid=" + thepid,
             success: function (data) {
                 let thisData = data.data;
                 if (!thisData) {
@@ -47,7 +47,7 @@ const PatentDesc = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         if (nextProps.data && nextProps.data.pid !== null && !this.state.visible && nextProps.showDesc) {
-            this.state.stepList = getStepList(nextProps.data.pid, '/techservice/patent/patentProcess');
+            this.state.stepList = getStepList(nextProps.data.pid, '/api/user/patent/patentProcess');
             this.getPatentInfo(nextProps.data.pid);
         };
         this.state.visible = nextProps.showDesc;
@@ -66,7 +66,7 @@ const PatentDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/clientConfirm",
+            url: globalConfig.context + "/api/user/patent/clientConfirm",
             data: {
                 pid: this.props.data.pid
             }
@@ -113,26 +113,26 @@ const PatentDesc = React.createClass({
                                 <span>专利相关材料:</span>
                                 {theData.patentWritingUrl !== null && theData.patentWritingUrl !== undefined && theData.patentWritingUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_writing', '/techservice/patent/download')}>{theData.patentWritingDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_writing', '/api/user/patent/download')}>{theData.patentWritingDownloadFileName}</a>
                                         {theData.confirmState == 0 ? <Button onClick={this.confirmButton}>确认稿件</Button> : <span></span>}
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利稿件未上传</p>
                                 }
                                 {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== undefined && theData.authorizationNoticeUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={newDownloadFile.bind(this, theData.id, 'authorization_notice', '/techservice/patent/download')}>{theData.authorizationNoticeDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'authorization_notice', '/api/user/patent/download')}>{theData.authorizationNoticeDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />授权通知书未上传</p>
                                 }
                                 {theData.patentCertificateUrl !== null && theData.patentCertificateUrl !== undefined && theData.patentCertificateUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_certificate', '/techservice/patent/download')}>{theData.patentCertificateDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_certificate', '/api/user/patent/download')}>{theData.patentCertificateDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利证书未上传</p>
                                 }
                                 {theData.patentProryStatementUrl !== null && theData.patentProryStatementUrl !== undefined && theData.patentProryStatementUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_prory_statement', '/techservice/patent/download')}>{theData.patentProryStatementDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_prory_statement', '/api/user/patent/download')}>{theData.patentProryStatementDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利代理委托书未上传</p>
                                 }

+ 4 - 4
js/component/account/services/ratepay.jsx

@@ -35,7 +35,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeRatepay",
+                    url: globalConfig.context + "/api/user/cognizance/disposeRatepay",
                     data: {
                         id: this.props.data.id,
                         operatingIncome: values.operatingIncome,
@@ -193,7 +193,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'ratepay_' + (this.state.year || theData.year) }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -289,7 +289,7 @@ const Ratepay = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/ratepay",
+            url: globalConfig.context + "/api/user/cognizance/ratepay",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize
@@ -410,7 +410,7 @@ const Ratepay = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteRatepay",
+            url: globalConfig.context + "/api/user/cognizance/deleteRatepay",
             data: {
                 ids: deletedIds
             }

+ 3 - 3
js/component/account/services/standard.jsx

@@ -19,7 +19,7 @@ const StandardDesc = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/developStandard",
+            url: globalConfig.context + "/api/user/cognizance/developStandard",
             data: {
                 id: this.props.data.id,
                 standardName: this.state.standardName,
@@ -121,7 +121,7 @@ const Standard = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/standard",
+            url: globalConfig.context + "/api/user/cognizance/standard",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -249,7 +249,7 @@ const Standard = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteStandard",
+            url: globalConfig.context + "/api/user/cognizance/deleteStandard",
             data: {
                 ids: deletedIds
             }

+ 5 - 5
js/component/account/services/techProduct.jsx

@@ -41,7 +41,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/techProduct",
+                    url: globalConfig.context + "/api/user/cognizance/techProduct",
                     data: {
                         id: this.props.data.id,
                         serialNumber: values.serialNumber,
@@ -230,7 +230,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <div style={{ width: '50%' }}>
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'tech_product' }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -329,7 +329,7 @@ const TechProduct = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/techProductList",
+            url: globalConfig.context + "/api/user/cognizance/techProductList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize
@@ -338,7 +338,7 @@ const TechProduct = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/intellectualList",
+            url: globalConfig.context + "/api/user/cognizance/intellectualList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: 99,
@@ -493,7 +493,7 @@ const TechProduct = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteTechProduct",
+            url: globalConfig.context + "/api/user/cognizance/deleteTechProduct",
             data: {
                 ids: deletedIds
             }

+ 3 - 3
js/component/account/services/technology.jsx

@@ -19,7 +19,7 @@ const Technology = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/techproject/listClientTechProject",
+            url: globalConfig.context + "/api/user/techproject/listClientTechProject",
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);
@@ -75,7 +75,7 @@ const Technology = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getAdmin",
+            url: globalConfig.context + "/api/user/patent/getAdmin",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -188,7 +188,7 @@ const Technology = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteCognizance",
+            url: globalConfig.context + "/api/user/cognizance/deleteCognizance",
             data: {
                 ids: deletedIds
             }

+ 1 - 1
js/component/account/services/technologyAdd.jsx

@@ -79,7 +79,7 @@ const ApplyAdd = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/techproject/applyTechProject",
+            url: globalConfig.context + "/api/user/techproject/applyTechProject",
             data: {
                 contacts: this.state.contacts,
                 department: this.state.department,

+ 4 - 4
js/component/account/services/technologyChange.jsx

@@ -14,7 +14,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/techproject/techProjectDetial",
+            url: globalConfig.context + "/api/user/techproject/techProjectDetial",
             data: {
                 pid: id || this.props.data.pid
             },
@@ -51,7 +51,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/techproject/techProjectLog",
+            url: globalConfig.context + "/api/user/techproject/techProjectLog",
             data: {
                 pid: id || this.props.data.pid
             },
@@ -174,7 +174,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/api/techproject/updateTechProject",
+                    url: globalConfig.context + "/api/user/techproject/updateTechProject",
                     data: {
                         id: this.props.data.pid,
                         contacts: contacts,
@@ -375,7 +375,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     <div className="hrSituation-roster">
                         <Upload
                             name="avatar"
-                            action={globalConfig.context + "/api/techproject/upload"}
+                            action={globalConfig.context + "/api/user/techproject/upload"}
                             data={{ 'uid': this.props.data.uid }}
                             beforeUpload={beforeUploadFile}
                             showUploadList={false}

+ 3 - 3
js/component/account/set/hrSituation.jsx

@@ -450,7 +450,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'roster_' + (this.state.year || theData.year) }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -478,7 +478,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
+                        action={globalConfig.context + "/api/user/cognizance/upload"}
                         data={{ 'sign': 'social_security_' + (this.state.year || theData.year) }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
@@ -731,7 +731,7 @@ const HrSituation = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteFinance",
+            url: globalConfig.context + "/api/user/cognizance/deleteFinance",
             data: {
                 ids: deletedIds
             }

+ 1 - 1
js/component/groupCertify/personal.jsx

@@ -426,7 +426,7 @@ const Content = Form.create()(React.createClass({
                         <div className="hrSituation-roster">
                             <Upload
                                 name="ratepay"
-                                action={globalConfig.context + "/techservice/cognizance/upload"}
+                                action={globalConfig.context + "/api/user/cognizance/upload"}
                                 data={{ 'sign': 'ratepay_' + (new Date().getFullYear() - 1) }}
                                 beforeUpload={beforeUploadFile}
                                 showUploadList={false}

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx

@@ -684,7 +684,7 @@ const AnnualReport = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteAnnualReport",
+            url: globalConfig.context + "/api/user/cognizance/deleteAnnualReport",
             data: {
                 ids: deletedIds
             }

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -733,7 +733,7 @@ const HrSituation = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteFinance",
+            url: globalConfig.context + "/api/user/cognizance/deleteFinance",
             data: {
                 ids: deletedIds
             }

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/highTechFoster.jsx

@@ -75,7 +75,7 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getAdmin",
+            url: globalConfig.context + "/api/user/patent/getAdmin",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -101,7 +101,7 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/user/patent/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;

+ 2 - 2
js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx

@@ -23,7 +23,7 @@ const PatentAddFrom = Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/user/patent/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -64,7 +64,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/patent/managerInputPatent",
+                    url: globalConfig.context + "/api/user/patent/managerInputPatent",
                     data: {
                         "uid": this.state.companyId,
                         "patentNumber": values.patentNumber,

+ 50 - 2
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -110,7 +110,7 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/user/patent/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -141,6 +141,8 @@ const Patent = React.createClass({
             searchMore: true,
             data: [],
             loading: false,
+            selectedRowKeys: [],
+            selectedRows: [],
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -306,7 +308,49 @@ const Patent = React.createClass({
                 break;
         }
     },
+    delectRow() {
+        let deletedIds = [];
+        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+            let rowItem = this.state.selectedRows[idx];
+            if (rowItem.pid) {
+                deletedIds.push(rowItem.pid)
+            }
+        }
+        this.setState({
+            selectedRowKeys: [],
+            loading: deletedIds.length > 0
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/patent/delete",
+            data: {
+                ids: deletedIds
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('保存成功!');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
     render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows,
+                    selectedRowKeys: selectedRowKeys
+                });
+            }
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
         const { MonthPicker, RangePicker } = DatePicker;
         return (
             <div className="patent-content" >
@@ -349,10 +393,13 @@ const Patent = React.createClass({
                     </Select>
                     <Input value={this.state.searchValue} onChange={this.searchSelect} />
                     <Select placeholder="专利状态" value={this.state.patentState} style={{ width: 200 }} onChange={(e) => { this.setState({ patentState: e }); }}>{this.state.patentStateOption}</Select>
+                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button type="ghost" onClick={this.exportComposite}>导出</Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                        disabled={!hasSelected}
+                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <p>
                             <span>派单日:</span><RangePicker onChange={this.searchcreateTime} />
@@ -379,6 +426,7 @@ const Patent = React.createClass({
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
+                            rowSelection={rowSelection}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick} />

+ 1 - 1
js/component/manageCenter/servicesManage/technology/websiteManage.jsx

@@ -65,7 +65,7 @@ const Cognizance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/user/patent/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;

+ 1 - 0
js/component/manageCenter/set/member.jsx

@@ -156,6 +156,7 @@ const Member = React.createClass({
                 </Popconfirm>
             },
             width: '15%'
+            //onCellClick: () => { return; }
         }];
         return (
             <Spin spinning={this.state.loading}>

+ 22 - 7
js/component/sign/account.jsx

@@ -17,7 +17,8 @@ const LoginContent = Form.create()(React.createClass({
         return {
             passwordDirty: false,
             getCodeButton: true,
-            loading: false
+            loading: false,
+            mCodeText: '获取验证码'
         };
     },
     handleSubmit(e) {
@@ -93,10 +94,13 @@ const LoginContent = Form.create()(React.createClass({
             url: globalConfig.context + "/open/getMCode",
             data: {
                 "mobile": form.getFieldValue('phone'),
+                "sign": false,
                 "verificationCode": form.getFieldValue('captcha')
             },
             success: function (data) {
-                if (data.error.length == 0) {
+                if (data.error && data.error.length) {
+                    message.warning(data.error[0].message);
+                } else {
                     message.success('验证码发送成功!');
                     this.setState({
                         getCodeButton: true
@@ -107,10 +111,21 @@ const LoginContent = Form.create()(React.createClass({
                         });
                         clearInterval(interval);
                     }, 60000);
-                } else {
-                    message.warning(data.error[0].message);
-                }
-            }.bind(this),
+                    let i = 59;
+                    let countDown = setInterval(function () {
+                        _me.setState({
+                            mCodeText: '剩余' + i + '秒'
+                        });
+                        i--;
+                        if (i == 0) {
+                            clearInterval(countDown);
+                            _me.setState({
+                                mCodeText: '获取验证码'
+                            });
+                        };
+                    }, 1000);
+                };
+            }.bind(this)
         }).always(function () {
             this.setState({
                 loading: false
@@ -227,7 +242,7 @@ const LoginContent = Form.create()(React.createClass({
                                         )}
                                 </Col>
                                 <Col span={8}>
-                                    <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>获取验证码</Button>
+                                    <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>{this.state.mCodeText}</Button>
                                 </Col>
                             </Row>
                         </FormItem>

+ 21 - 7
js/component/sign/groupAccount.jsx

@@ -14,7 +14,8 @@ const Group = Form.create()(React.createClass({
         return {
             passwordDirty: false,
             getCodeButton: true,
-            loading: false
+            loading: false,
+            mCodeText: '获取验证码'
         };
     },
     handleSubmit(e) {
@@ -68,7 +69,9 @@ const Group = Form.create()(React.createClass({
                 "verificationCode": form.getFieldValue('captcha')
             },
             success: function (data) {
-                if (data.error.length == 0) {
+                if (data.error && data.error.length) {
+                    message.warning(data.error[0].message);
+                } else {
                     message.success('验证码发送成功!');
                     this.setState({
                         getCodeButton: true
@@ -79,10 +82,21 @@ const Group = Form.create()(React.createClass({
                         });
                         clearInterval(interval);
                     }, 60000);
-                } else {
-                    message.warning(data.error[0].message);
-                }
-            }.bind(this),
+                    let i = 59;
+                    let countDown = setInterval(function () {
+                        _me.setState({
+                            mCodeText: '剩余' + i + '秒'
+                        });
+                        i--;
+                        if (i == 0) {
+                            clearInterval(countDown);
+                            _me.setState({
+                                mCodeText: '获取验证码'
+                            });
+                        };
+                    }, 1000);
+                };
+            }.bind(this)
         }).always(function () {
             this.setState({
                 loading: false
@@ -225,7 +239,7 @@ const Group = Form.create()(React.createClass({
                                     )}
                             </Col>
                             <Col span={8}>
-                                <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>获取验证码</Button>
+                                <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>{this.state.mCodeText}</Button>
                             </Col>
                         </Row>
                     </FormItem>