学位-issue修改

src/forge/Team/List.jsx

@@ -99,7 +99,7 @@ function List(props){
             <span className="orz-name task-hide">{organizeDetail && organizeDetail.nickname}</span>
             {organizeDetail && (
               <div>
-                {organizeDetail.is_admin && !enterpriseOpenInfo.isOpen && 
+                {/* {organizeDetail.is_admin && !enterpriseOpenInfo.isOpen && 
                   <Link to={`/${OIdentifier}/enterprise`}>
                     <Button type='primary'>开通工作台</Button>
                   </Link>
@@ -109,20 +109,6 @@ function List(props){
                   <Button type='primary' onClick={() => { window.open(enterpriseOpenInfo.url) }}>前往工作台</Button>
                   :
                   <Button type='primary'>正在开通工作台</Button>)
-                }
-                {/* {
-                  organizeDetail.pms_enable && organizeDetail.is_admin &&(
-                    !enterpriseOpenInfo.isOpen ?  (
-                      <Link to={`/${OIdentifier}/enterprise`}>
-                        <Button type='primary'>开通工作台</Button>
-                      </Link>
-                    ) :
-                    enterpriseOpenInfo.url ? (
-                      <Button type='primary' onClick={() => { window.open(enterpriseOpenInfo.url) }}>前往工作台</Button>
-                    ) : (
-                      <Button type='primary'>正在开通工作台</Button>
-                    )
-                  )
                 } */}
                 {organizeDetail.is_admin && <Link to={`/${OIdentifier}/setting`} className="color-blue ml20 font-14"><Button type='primary' ghost>设置</Button></Link>}
               </div>

src/forge/users/Infos.js

@@ -402,12 +402,12 @@ class Infos extends Component {
                     <Menu.Item key="4"><Link to={`/${user && user.login}/devops/CIService`}><i className="iconfont icon-gongzuoliu1"></i>DevOps引擎</Link></Menu.Item>
                     :""
                   } */}
-                  {/* <Menu.Item key="5">
+                  <Menu.Item key="5">
                     <Link to={`/${user && user.login}/organizes`}>
                       <i className="iconfont icon-zuzhi"></i>参与组织
                       { user && user.user_org_count && user.user_org_count > 0 ? <span className="menuNum">({user.user_org_count})</span>:""}
                     </Link>
-                  </Menu.Item> */}
+                  </Menu.Item>
                   {/* 当前用户+配置了贡献确权 */}
                   {/* {current_user && user && user.login === current_user.login && current_user.open_blockchain && <Menu.Item key="7">
                     <Link to={`/${user && user.login}/blockchain`}><i className="iconfont icon-gongxianquequan"></i>贡献确权</Link>

src/forge/users/Material/Base.jsx

@@ -76,7 +76,7 @@ export default Form.create()(
             <Checkbox>在个人主页展示</Checkbox>
           )}
         </Form.Item>
-        <Form.Item label="昵称">
+        {/* <Form.Item label="昵称">
           {getFieldDecorator("nickname",{
             rules:[]
           })(
@@ -131,12 +131,12 @@ export default Form.create()(
           })(
             <TextArea placeholder="请输入您的签名" rows={4} maxLength={140} style={{width:"600px"}}/>
           )}
-        </Form.Item>
-        <AlignCenter>
+        </Form.Item> */}
+        {/* <AlignCenter>
           <span className="ant-form-item-label"></span>
           <Button className="but25" type={"primary"} onClick={submit}>提交</Button>
-          {/* <Button type={"default"} onClick={()=>props.history.push(`/${current_user && current_user.login}`)} className="ml20">取消</Button> */}
-        </AlignCenter>
+          <Button type={"default"} onClick={()=>props.history.push(`/${current_user && current_user.login}`)} className="ml20">取消</Button>
+        </AlignCenter> */}
       </Form>
     )
   })

src/modules/loginRegister/component/register.jsx

@@ -6,20 +6,20 @@ export const prefix = (iconfontName) => <Fragment><i className={`iconfont mr7 co
 
 export default ({getFieldDecorator, type}) => {
   return <div className="loginRegisterFormItem">
-    <Form.Item label="用户名">
+    <Form.Item label="学号">
       {getFieldDecorator('register_username', {
         rules: [
           {
             required: true,
-            message: "请输入用户名"
+            message: "请输入学号"
           },
           {
-            pattern: /^[a-zA-Z][a-zA-Z0-9]{3,13}$/,
-            message: '用户名必须为4-14位，以字母开头，只能包含字母和数字',
+            pattern: /^[a-zA-Z0-9]{3,13}$/,
+            message: '学号必须为4-14位，只能包含字母和数字',
           }
         ],
         validateTrigger: "onBlur",
-      })(<Input size="large" placeholder="请输入4-14位用户名，以字母开头，只能使用字母、数字" prefix={prefix("icon-yonghuming")} />)}
+      })(<Input size="large" placeholder="请输入4-14位学号，只能使用字母、数字" prefix={prefix("icon-yonghuming")} />)}
     </Form.Item>
     {type === "registerByPhone" ? <Form.Item label="手机号">
       {getFieldDecorator('phone', {