yee 7 jaren geleden
bovenliggende
commit
b52e157dcd

+ 1 - 1
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -832,7 +832,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         //
                         switchSign: this.state.switchValue ? 1 : 0,
                         //
-                        ownerId: !this.state.switchValue ? (this.state.dataSourceObj ? this.state.dataSourceObj[values.iOwnerName] : this.props.data.ownerId) : undefined,
+                        ownerId: !this.state.switchValue ? (this.state.dataSourceObj ? this.state.dataSourceObj[values.iOwnerName] : this.state.data.ownerId) : undefined,
                         contacts: !this.state.switchValue ? values.contacts : undefined,
                         ownerType: this.props.detailApiUrl.indexOf('org') != -1 ? 1 : 0,
                         //自定义

+ 1 - 2
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -10,7 +10,6 @@ import PatentChange from './comPatentChange.jsx';
 
 import moment from 'moment';
 import './copyright.less';
-const vacations = getVacations();
 
 const copyright = React.createClass({
     loadData(pageNo) {
@@ -284,7 +283,7 @@ const copyright = React.createClass({
         this.getCompanyList();
         this.getStateList();
         this.getContractList();
-        getVacations((data) => { this.setState({ vacations: data }); });
+        getVacations(function(data){ _me.setState({ vacations: data }); });
         if (window.location.search) {
             let theObj = getSearchUrl(window.location.search);
             if (theObj.rid) {

+ 1 - 1
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -365,7 +365,7 @@ const Patent = React.createClass({
             "&" + "patentName" + "=" + (this.state.patentName || '') +
             "&" + "locationProvince" + "=" + (this.state.province || '') +
             "&" + "uid" + "=" + (this.state.unitId || '') +
-            "&" + "uid" + "=" + (this.state.contractId || '') +
+            "&" + "contractId" + "=" + (this.state.contractId || '') +
             "&" + "patentCatagory" + "=" + (this.state.patentCatagory || '') +
             "&" + "patentState" + "=" + (this.state.patentState || '') +
             "&" + "createTime" + "=" + (this.state.createTime || '') +

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

@@ -4,6 +4,8 @@ import "./account.less";
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
+import Modal from './modal';
+
 import weixin from '../../../image/weixin-w.png';
 import qq from '../../../image/qq-w.png';
 import weibo from '../../../image/weibo-w.png';
@@ -146,6 +148,9 @@ const LoginContent = Form.create()(React.createClass({
     reloadVCode() {
         this.state.vCodeUrl = globalConfig.context + '/open/getVCode?t=' + Math.random();
     },
+    closeModal() {
+        this.setState({ showDesc: false });
+    },
     render() {
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
@@ -251,7 +256,7 @@ const LoginContent = Form.create()(React.createClass({
                             {getFieldDecorator('agreement', {
                                 valuePropName: 'checked',
                             })(
-                                <Checkbox>同意 <a> 阿凡提会员服务协议条款</a></Checkbox>
+                                <Checkbox>同意 <a onClick={() => { this.setState({ showDesc: true }); }}> 阿凡提会员服务协议条款</a></Checkbox>
                                 )}
                         </FormItem>
                         <FormItem {...tailFormItemLayout}>
@@ -274,6 +279,7 @@ const LoginContent = Form.create()(React.createClass({
                         </div>
                     </div>
                 </Spin>
+                <Modal showDesc={this.state.showDesc} closeModal={this.closeModal} />
             </div>
         );
     },

+ 38 - 25
js/component/sign/account.less

@@ -1,33 +1,35 @@
 .account-content {
-    margin-top:50px;
+    margin-top: 50px;
     height: 580px;
     .account-left {
         width: 540px;
         float: left;
         .acc-getVcode {
-             height: 32px;
-             width: 100%;
-             padding-top:32px;
-             position: relative;
-             overflow: hidden;
-             img {
-                 position: absolute;
-                 top: 0;
-                 left: 0;
-                 width: 100%;
-                 height: 32px;
-             }
+            height: 32px;
+            width: 100%;
+            padding-top: 32px;
+            position: relative;
+            overflow: hidden;
+            img {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 32px;
+            }
         }
         .ant-form-extra {
-            color:#ccc;
+            color: #ccc;
             span {
                 margin-left: 2px;
             }
         }
         .redFont {
-            color:#ea0862;
+            color: #ea0862;
+        }
+        button {
+            width: 100%;
         }
-        button {width: 100%;}
         .ant-checkbox-wrapper {
             span {
                 line-height: 32px;
@@ -36,14 +38,14 @@
     }
     .account-right {
         width: 400px;
-        float:left;
+        float: left;
         .title {
-            color:#333;
+            color: #333;
         }
         button {
             width: 132px;
             border-radius: 4px;
-            margin-top:10px; 
+            margin-top: 10px;
         }
         .haveID {
             margin-bottom: 60px;
@@ -52,7 +54,7 @@
             margin-bottom: 30px;
             p {
                 img {
-                    width:20px;
+                    width: 20px;
                     vertical-align: middle;
                 }
                 span {
@@ -60,21 +62,32 @@
                 }
             }
             .relateqq {
-                color:#fff;
+                color: #fff;
                 background: #3174c2;
             }
             .relateweibo {
-                color:#fff;
+                color: #fff;
                 background: #ce321c;
             }
             .relateweixin {
-                color:#fff;
+                color: #fff;
                 background: #13bb20;
             }
         }
-        .about{
+        .about {
             padding-right: 40px;
-            p { margin-bottom: 10px;}
+            p {
+                margin-bottom: 10px;
+            }
         }
     }
+}
+
+.ant-modal-content {
+    .ant-modal-title {
+        text-align: center;
+    }
+    .ant-modal-body {
+        padding-right: 0
+    }
 }

File diff suppressed because it is too large
+ 0 - 92
js/component/sign/content.jsx


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

@@ -3,7 +3,7 @@ import { Form, Input, message, Icon, Cascader, Select, Row, Col, Checkbox, Butto
 import "./group.less";
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
-
+import Modal from './modal';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -145,6 +145,9 @@ const Group = Form.create()(React.createClass({
     reloadVCode() {
         this.state.vCodeUrl = globalConfig.context + '/open/getVCode?t=' + Math.random();
     },
+    closeModal() {
+        this.setState({ showDesc: false });
+    },
     render() {
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
@@ -164,8 +167,7 @@ const Group = Form.create()(React.createClass({
                         {...formItemLayout}
                         label="密码"
                         extra={<span><Icon type="exclamation-circle" /> 建议字母、数字和符号两种以上组合,6-20个字符</span>}
-                        hasFeedback
-                    >
+                        hasFeedback >
                         {getFieldDecorator('password', {
                             rules: [{
                                 required: true, message: '请输入密码!',
@@ -271,13 +273,14 @@ const Group = Form.create()(React.createClass({
                         {getFieldDecorator('agreement', {
                             valuePropName: 'checked',
                         })(
-                            <Checkbox>同意 <a> 阿凡提会员服务协议条款</a></Checkbox>
+                            <Checkbox>同意 <a onClick={() => { this.setState({ showDesc: true }); }}> 阿凡提会员服务协议条款</a></Checkbox>
                             )}
                     </FormItem>
                     <FormItem {...tailFormItemLayout}>
                         <Button type="primary" htmlType="submit" size="large">提 交</Button>
                     </FormItem>
                 </Form>
+                <Modal showDesc={this.state.showDesc} closeModal={this.closeModal} />
             </div>
         );
     },

File diff suppressed because it is too large
+ 77 - 0
js/component/sign/modal.jsx


+ 17 - 13
js/component/tools.js

@@ -293,7 +293,7 @@ module.exports = {
     companySearch(input, option) {
         return option.props.children.indexOf(input) >= 0
     },
-    getVacations(callback){
+    getVacations(ccccc){
         let now = new Date();
         let theYear = now.getFullYear();
         $.ajax({
@@ -302,25 +302,29 @@ module.exports = {
             crossDomain: false,
             url: globalConfig.context + '/open/html/json/vacations' + theYear,
             success: (data)=>{
-                if (!data.data) {
-                    if ( data.error && data.error.length ) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    callback(data.data);
+                if (data) {
+                   ccccc(data);
                 };
             }
         });
     },
     getInUrgentTime(date, inUrgent,vocations) {
-        let now = new Date(date);
-        for (var i = 1; i <= inUrgent;) {
-            now.setDate(now.getDate() + 1);
-            if (!vocations[getKey(now)]) {
-                i++;
+        if ( vocations && vocations.length ){
+            let now = new Date(date),addNum = 0;
+            for (var i = 1; i <= inUrgent;) {
+                now.setDate(now.getDate() + 1);
+                let thebool = true;
+                vocations.map((item)=>{
+                    if ( item == getKey(now)) {
+                        thebool= false;
+                    }
+                });
+                if ( thebool ) {
+                    i++
+                } else {continue};
             };
+            return now;
         };
-        return now;
         function getKey(date) {
             var year = date.getFullYear(),
                 month = date.getMonth() + 1,

+ 10 - 2
js/user/signIn.js

@@ -5,7 +5,8 @@ import '../../css/base.less';
 import '../../css/sign.less';
 
 import LoginTop from '../component/login/loginTop.jsx';
-import Content from '../component/sign/content.jsx';
+import Account from '../component/sign/account.jsx';
+import GroupAccount from '../component/sign/groupAccount.jsx';
 import LoginFooter from '../component/login/loginFooter.jsx';
 
 const TabPane = Tabs.TabPane;
@@ -13,7 +14,14 @@ const TabPane = Tabs.TabPane;
 ReactDOM.render(
     <div className="wrap">
         <LoginTop />
-        <Content />
+        <Tabs type="card" defaultActiveKey="1" className="signIn-form">
+            <TabPane tab="个人注册" key="1">
+                <Account />
+            </TabPane>
+            <TabPane tab="团体注册" key="2" className="tabtwo">
+                <GroupAccount />
+            </TabPane>
+        </Tabs>
         <LoginFooter />
     </div>,
     document.getElementById('root')