回归第三方测试代码

src/forge/GetData/getData.jsx

@@ -5,7 +5,7 @@ export const getBranch = async (id,owner)=>{
 }
 // 获取标签列表
 export const getTag = async (id,owner)=>{
-  return (await axios.get(`/${owner}/${id}/tags.json`)).data;
+  return (await axios.get(`/${owner}/${id}/tags.json`,{params:{only_name:true}})).data.tags;
 }
 // 获取hooks（仓库设置-管理web钩子）列表
 export const getHooks = async (id,params)=>{

src/forge/Main/CoderRootTag.js

@@ -14,10 +14,10 @@ export default (( props, { projectDetail }) => {
   useEffect(() => {
     if (projectsId) {
       const url = `/${owner}/${projectsId}/tags.json`;
-      axios.get(url).then((result) => {
+      axios.get(url,{params:{page:1,limit:1000}}).then((result) => {
-        if (result) {
+        if (result.data) {
           setSpin(false);
-          setData(result.data);
+          setData(result.data.tags);
         }
       }).catch(error => {
         console.log(error);

src/forge/Main/Index.js

@@ -272,11 +272,11 @@ class Index extends Component {
   newItem = ()=>{
     return(
       <ul>
-        <li>
+        <li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
-          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile>
+          {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
         </li>
-        <li>
+        <li onClick={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目
-          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
+          {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> */}
         </li>
       </ul>
     )

src/forge/Main/tag/Index.jsx

@@ -1,6 +1,6 @@
-import React,{ useEffect , useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import SubMenu from '../sub/SubMenu';
-import { Table , Tooltip , Spin } from 'antd';
+import { Table, Tooltip, Spin,Pagination } from 'antd';
 import axios from 'axios';
 import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../../common/util';
@@ -12,32 +12,41 @@ import moment from 'moment';
 
 function Tags(props) {
 
-  const [ source , setSource ] = useState(undefined);
+  const [source, setSource] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(true);  
+  const [isSpin, setIsSpin] = useState(true);
-
+  const [page, setPage] = useState(1);
-  const { projectsId , owner } = props.match.params;
+  const [total,setTotal] =useState(0);
+  const [limit,setLimit] =useState(10);
+  const { projectsId, owner } = props.match.params;
 
   useEffect(() => {
     if (projectsId) {
+      setIsSpin(true);
       const url = `/${owner}/${projectsId}/tags.json`;
-      axios.get(url).then((result) => {
+      axios.get(url, {
+        params: {
+          limit,
+          page: page
+        }
+      }).then((result) => {
         if (result) {
-          setSource(result.data);
+          setSource(result.data.tags);
+          setTotal(result.data.total_count);
           setIsSpin(false);
         }
-      }).catch(error => {})
+      }).catch(error => { })
     }
-  }, [owner, projectsId]);
+  }, [owner, projectsId,page]);
 
-  const columns=[
+  const columns = [
     {
-      title:"标签名",
+      title: "标签名",
-      dataIndex:"name",
+      dataIndex: "name",
-      key:1,
+      key: 1,
-      ellipsis:true,
+      ellipsis: true,
-      width:"200px",
+      width: "200px",
-      render:(txt,item)=>{
+      render: (txt, item) => {
-        return(
+        return (
           <div className="tagBranch">
             <Link className="hover tagClass" to={`/${owner}/${projectsId}/tree/${item.name}`}>{item.name}</Link>
           </div>
@@ -45,11 +54,11 @@ function Tags(props) {
       }
     },
     {
-      title:"创建时间",
+      title: "创建时间",
-      dataIndex:"time_ago",
+      dataIndex: "time_ago",
-      key:2,
+      key: 2,
-      ellipsis:true,
+      ellipsis: true,
-      render:(txt,item)=>{
+      render: (txt, item) => {
         return (
           <span className="color-grey-3 tagModel">
             {
@@ -57,13 +66,13 @@ function Tags(props) {
               <Tooltip placement="top" title={item.tagger.name}>
                 {
                   item.tagger.id ?
-                  <Link className="mr3 tagModelImg" to={`/${item.tagger.login}`} >
+                    <Link className="mr3 tagModelImg" to={`/${item.tagger.login}`} >
-                    <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt="" />
-                  </Link>
+                    </Link>
-                  :
+                    :
-                  <span className="mr3 tagModelImg" style={{cursor:"default"}}>
+                    <span className="mr3 tagModelImg" style={{ cursor: "default" }}>
-                    <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.tagger && item.tagger.image_url}`)} alt="" />
-                  </span>
+                    </span>
                 }
               </Tooltip>
             }
@@ -73,36 +82,36 @@ function Tags(props) {
       }
     },
     {
-      title:"提交ID",
+      title: "提交ID",
-      dataIndex:"id",
+      dataIndex: "id",
-      key:3,
+      key: 3,
-      ellipsis:true,
+      ellipsis: true,
-      render:(txt,item)=>{
+      render: (txt, item) => {
         return (
-          <Tooltip placement="top" title={`最后提交日期:${item.created_at_unix ? moment(item.created_at_unix*1000).format('YYYY-MM-DD'):''}`}>
+          <Tooltip placement="top" title={`最后提交日期:${item.created_at_unix ? moment(item.created_at_unix * 1000).format('YYYY-MM-DD') : ''}`}>
-            <img src={Tree} alt="提交ID" width="22px" className="mr4"/>
+            <img src={Tree} alt="提交ID" width="22px" className="mr4" />
             <Link className="hover color-blue" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`}>{truncateCommitId(item.id)}</Link>
           </Tooltip>
         )
       }
     },
     {
-      title:"描述信息",
+      title: "描述信息",
-      dataIndex:"message",
+      dataIndex: "message",
-      key:4,
+      key: 4,
-      ellipsis:true,
+      ellipsis: true,
-      render:(txt,item)=>{
+      render: (txt, item) => {
         return item.message || "--"
       }
     },
     {
-      title:"下载",
+      title: "下载",
-      dataIndex:"stage_type",
+      dataIndex: "stage_type",
-      key:5,
+      key: 5,
-      ellipsis:true,
+      ellipsis: true,
-      align:"center",
+      align: "center",
-      width:"204px",
+      width: "204px",
-      render:(txt,item)=>{
+      render: (txt, item) => {
         return (
           <React.Fragment>
             <a href={`${item.tarball_url}`} download className="btn-83">
@@ -116,20 +125,36 @@ function Tags(props) {
       }
     }
   ]
-  return(
+
+
+  return (
     <div>
-      <SubMenu tab={"tags"} projectsId={projectsId} owner={owner}/>
+      <SubMenu tab={"tags"} projectsId={projectsId} owner={owner} />
       <Spin spinning={isSpin}>
         <div className="tagSpin">
-        {
+          {
-          source && source.length > 0 &&
+            source && source.length > 0 &&
-          <Table 
+            <Table
-            className="tagTable"
+              rowKey={(record) => record.id}
-            dataSource={source} columns={columns} pagination={false}></Table>
+              className="tagTable"
-        }
+              dataSource={source} columns={columns} pagination={false}></Table>
-        {
+          }
-          source && source.length === 0 && <Nonedata _html={'暂无数据~'}/>
+          {total > limit ? (
-        }
+            <div className="mt30 mb50 edu-txt-center">
+              <Pagination
+                simple
+                current={page}
+                total={total}
+                pageSize={limit}
+                onChange={(e)=>{setPage(e)}}
+              ></Pagination>
+            </div>
+          ) : (
+            ""
+          )}
+          {
+            source && source.length === 0 && <Nonedata _html={'暂无数据~'} />
+          }
         </div>
       </Spin>
     </div>

src/forge/Main/version/New.jsx

@@ -61,12 +61,12 @@ export default Form.create()(
           const url = `/${owner}/${projectsId}/tags.json`;
           axios
             .get(url,{params:{
-              limit:1000
+              page:1,limit:1000
             }})
             .then(result => {
-              if (result) {
+              if (result.data) {
-                setTagList(result.data);
+                setTagList(result.data.tags);
-                setOptions(renderTagList(result.data));
+                setOptions(renderTagList(result.data.tags));
               }
             })
             .catch(error => {

src/forge/Team/List.jsx

@@ -103,11 +103,11 @@ function List(props){
   )
   const menu_new=(
     <ul>
-      <li>
+      <li onClick={()=>{this.props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
-        <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目</CheckProfile>
+        {/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目</CheckProfile> */}
       </li>
-      <li>
+      <li onClick={()=>{this.props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
-        <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目</CheckProfile>
+        {/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目</CheckProfile> */}
       </li>
     </ul>
   )

src/forge/users/GeneralView/ConcentrateBox.jsx

@@ -171,11 +171,12 @@ function ConcentrateBox({ visible , onCancel , onSure , getProjectListUrl , choo
         { 
           (list && list.length === 0) && (copyList && copyList.length === 0) && 
           <div style={{textAlign:"center"}}>您还没有公开的{search && `“${search}”`}项目，先去
-            <CheckProfile 
+          <span onClick={()=>{history.push(createProjectUrl)}} className="color-blue">新建项目</span>
+            {/* <CheckProfile 
               showCompeleteDialog={showCompeleteDialog}
               completeProfile={completeProfile}
               sureFunc={()=>{history.push(createProjectUrl)}} 
-              className="color-blue">新建项目</CheckProfile>
+              className="color-blue">新建项目</CheckProfile> */}
           </div> 
         }
       </Spin>

src/forge/users/InfosUser.js

@@ -115,12 +115,18 @@ class InfosUser extends Component {
 
   newItem =()=> (
     <ul>
-      <li>
+       <li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
+          {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
+        </li>
+        <li onClick={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目
+          {/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile> */}
+        </li>
+      {/* <li>
         <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}} >新建项目</CheckProfile>
       </li>
       <li>
         <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
-      </li>
+      </li> */}
     </ul>
   );
 

src/military/task/api.js

@@ -642,4 +642,13 @@ export function followTaskList(params) {
     method: 'get',
     params,
   });
+}
+
+// 验证验证码
+export function checkVerificationCode(data) {
+  return fetch({
+    url: `/api/weixin/checkVerificationCode`,
+    method: 'post',
+    data: data,
+  });
 }

src/military/task/taskDetail/index.scss

@@ -34,6 +34,7 @@
       height: 30px;
       line-height: 30px;
       border-radius:5px 0px 0px 5px;
+      cursor: pointer;
       &:hover
       {
         background-color: #F3F4F6;

src/military/task/taskEdit/codeModal.jsx

@@ -0,0 +1,143 @@
+import React, {  useCallback, useEffect, useState } from 'react';
+import { Form,  Input, Button, Modal, message } from 'antd';
+import axios from 'axios';
+import { setmiyah, isMobile } from 'educoder';
+import { formModalLayout } from '../static';
+import {checkVerificationCode} from '../api';
+
+export default Form.create()(({ visible, history, form, setVisible,changeContactPhone }) => {
+  const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form;
+  const [getCaptchaBut, setGetCaptchaBut] = useState(false);
+  const [num, setNum] = useState(0) // 倒计时
+  const [isSend, setIsSend] = useState(false) // 是否发送验证码
+
+  const helper = useCallback(
+    (label, name, rules, widget, initialValue, rightComponent) => (
+      <Form.Item label={label}>
+        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
+        {rightComponent}
+      </Form.Item>
+    ), []);
+
+  /** 倒计时显示*/
+  useEffect(() => {
+    let timer = 0;
+    if (isSend && num !== 0) {
+      timer = setInterval(() => {
+        setNum(n => {
+          if (n === 1) {
+            setIsSend(false)
+            clearInterval(timer)
+          }
+          return n - 1;
+        });
+      }, 1000);
+    }
+    return () => {
+      // 组件销毁时，清除定时器
+      clearInterval(timer)
+    };
+  }, [isSend]);
+
+  function getCode() {
+    setIsSend(true);
+    setNum(60);
+    validateFields(['phone'], (err, values) => {
+      //请求获取验证码接口
+      axios.get(`/accounts/get_verification_code.json`, {
+        params: {
+          login: values.phone,
+          type: 5,
+          smscode: setmiyah(values.phone),
+        }
+      }).then(res => {
+        debugger
+        if (res && res.data && res.data && res.data.status === 0) {
+          //验证码发送成功
+          message.success({
+            content: <span>验证码已发送，请注意查收。</span>,
+            getContainer: document.querySelector('.phoneEdit')
+          });
+        } else {
+          //验证码发送失败,获取验证码按钮变灰并且文案变回【获取验证码】
+          message.error({ content: <span>验证码发送失败</span> ,
+          getContainer: document.querySelector('.phoneEdit')});
+          setGetCaptchaBut(false);
+        }
+      })
+    })
+  }
+
+
+  function checkItem() {
+    validateFields((err, values) => {
+      // 验证验证码接口
+      checkVerificationCode({
+          phoneNumber: values.phone,
+          verificationCode:values.code,
+      }).then(res=>{
+        if(res&&res.data){
+          message.success({
+            content: <span>修改联系手机号成功！</span>,
+            getContainer: document.querySelector('.phoneEdit')
+          });
+          changeContactPhone(values.phone)
+          setVisible(false)
+        }else{
+          message.error({ content: '验证失败',
+          getContainer: document.querySelector('.phoneEdit')});
+        }
+      })
+    })
+  }
+
+  return (
+    <Modal
+      title="修改联系电话"
+      visible={visible}
+      onOk={checkItem}
+      onCancel={() => { setVisible(false) }}
+      className="form-edit-modal phoneEdit"
+    >
+      <Form {...formModalLayout}>
+        <Form.Item label={"新手机号码："} >
+          {getFieldDecorator('phone', {
+            rules: [
+              {
+                required: true,
+                message: "请输入手机号"
+              },
+              {
+                validator: (rule, val, callback) => {
+                  const pattern = /^1(3|4|5|6|7|8|9)\d{9}$/;
+                  if (pattern.test(val)) {
+                    setGetCaptchaBut(true);
+                    callback();
+                  } else {
+                    setGetCaptchaBut(false);
+                    callback('请输入正确的手机号码！');
+                  }
+                }
+              },
+            ],
+            validateTrigger: "onChange",
+            validateFirst: true,
+          })(<Input className="tel-input" placeholder="请输入手机号" />)}
+        </Form.Item>
+
+        <Form.Item label={"验证码："} >
+          {getFieldDecorator('code', {
+            rules: [{
+              required: true,
+              message: "请输入验证码"
+            }],
+            validateTrigger: "onBlur",
+          })(
+            <Input className="code-input" placeholder="请输入验证码" />
+          )}
+          <Button className="ml10" type="primary" disabled={num !== 0 || !getCaptchaBut} onClick={getCode}>{num || '获取验证码'}</Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})

src/military/task/taskEdit/index.jsx

@@ -9,6 +9,7 @@ import { httpUrl } from '../fetch';
 import { getTaskDetail, addTask, updateTask, getTaskCategory, getCompanyInfo } from '../api';
 import { formItemLayout, formModalLayout } from '../static';
 import { editorConfig } from '../../components/config';
+import CodeModal from './codeModal';
 import './index.scss';
 
 const { info } = Modal;
@@ -41,7 +42,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
   const [visible, setVisible] = useState(false);
   const [num, setNum] = useState(0) // 倒计时
   const [isSend, setIsSend] = useState(false) // 是否发送验证码
-
+  
   const id = match.params.taskId;
   const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form;
 
@@ -111,14 +112,14 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
       if (res && res.message === 'success') {
         setEnterpriseName(res.data.enterpriseName);
         setFieldsValue({
-          contactPhone:res.data.phone,
+          contactPhone: res.data.phone,
-          contactName:res.data.userName,
+          contactName: res.data.userName,
         })
-      }else{
+      } else {
         showNotification(res.message);
       }
     });
-  },[]);
+  }, []);
 
   useEffect(() => {
     getTaskCategory().then(data => {
@@ -152,11 +153,6 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
     };
   }, [isSend]);
 
-  function getCode() {
-    setIsSend(true);
-    setNum(60);
-  }
-
   // 上传附件后得到的文件数组
   function UploadFunc(fileList) {
     setFileList(fileList);
@@ -195,11 +191,12 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
   // 新增或者修改后的处理函数
   const publishDeal = useCallback((status, publishMode, res) => {
     if (res && res.data) {
-      showNotification("任务保存成功！");
       if (!status) {
         history.push("/task/myTask?published=false");
+        showNotification("任务保存成功！");
       } else if (current_user.admin) {
         history.push("/task");
+        showNotification("任务发布成功！");
       } else {
         info({
           title: '提示',
@@ -211,7 +208,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
             history.push("/task/myTask?published=false");
           },
         });
-      } 
+      }
     } else {
       showNotification(res.message);
     }
@@ -263,6 +260,12 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
     setDisplayTime({ collectingTime, choosingTime, makePublicTime, signingTime, payingTime });
   }
 
+  function changeContactPhone(e){
+    console.log(e);
+    setFieldsValue({
+      contactPhone:e
+    })
+  }
   return (
     <div className="centerbox">
       <div className="head-navigation">
@@ -298,7 +301,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
               <Input
                 className="contact-input"
                 placeholder="请输入联系电话"
-              disabled
+                disabled
               />, '', <Icon className="editPhone" type="edit" onClick={() => { setVisible(true) }} />
             )}
 
@@ -521,29 +524,8 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
       <Button className="mr20" type={"primary"} onClick={() => { saveItem(0) }}>保存</Button>
       <Button onClick={() => { history.go(-1) }}>取消</Button>
 
-      <Modal
+      <CodeModal visible={visible} setVisible={setVisible} changeContactPhone={changeContactPhone}/>
-        title="修改联系电话"
+     
-        visible={visible}
-        // onOk={checkItem}
-        onCancel={() => { setVisible(false) }}
-        className="form-edit-modal"
-      >
-        <Form {...formModalLayout}>
-          <Form.Item label={"新手机号码："} >
-            <Input
-              className="tel-input"
-              placeholder="请输入11位手机号"
-            />
-          </Form.Item>
-          <Form.Item label={"验证码："} >
-            <Input
-              className="code-input"
-              placeholder="请输入验证码"
-            />
-            <Button className="ml10" type="primary" disabled={num !== 0} onClick={getCode}>{num || '获取验证码'}</Button>
-          </Form.Item>
-        </Form>
-      </Modal>
     </div>
   )
 })

src/military/task/taskEdit/index.scss

@@ -152,3 +152,12 @@
   }
 }
 
+.phoneEdit{
+  .ant-form-explain{
+    position: absolute;
+  }
+}
+
+.ant-message{
+  z-index: 1040;
+}