Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/pages/adUser/index.jsx

@@ -43,6 +43,7 @@ export default (props) => {
         1: "已激活",
         2: "停用",
       },
+      search: false,
     },
 
     {

src/pages/member/components/ModalNewCard.jsx

@@ -38,11 +38,15 @@ export default (props) => {
       if (modalTitle == "核销卡") {
         // 核销卡
         putTaMemberCardIdWrite(x.cardId)
-          .then((result) => {})
-          .catch((err) => {});
+          .then((result) => {
+            setIsModalOpen(false);
+          })
+          .catch((err) => { });
       } else {
         // 开卡
-        postTaMemberCardIdActive(x).then((res) => {});
+        postTaMemberCardIdActive(x).then((res) => {
+          setIsModalOpen(false);
+        });
       }
     });
   };

src/pages/project/components/ProjectDeployEdit.jsx

@@ -21,7 +21,7 @@ export default (props) => {
 
   const onFinish = (values) => {
     postTaProjectDeploy(values).then((res) => {
-      navigate(`/project/edit?tab=tab2`)
+      navigate(`/project/project/edit?tab=tab2`)
     })
   }
   return (

src/pages/project/index.jsx

@@ -58,6 +58,7 @@ export default (props) => {
       title: '项目简介',
       dataIndex: 'introduction',
       search: false,
+      ellipsis: true,
     },
     {
       title: '项目开始日期',