fix: '消息平台界面优化'

src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx

@@ -14,6 +14,7 @@ import {
   message,
   Tooltip,
   Spin,
+  notification,
 } from 'antd';
 import {
   PlusCircleOutlined,
@@ -364,21 +365,29 @@ const ProjectManage = props => {
     setTreeLoading(true);
     GetMessageConfigList(params).then(res => {
       setTreeLoading(false);
-      let mesList = [];
       if (res.code === 0) {
-        res.data.MessageConfigModels.map(item => {
-          mesList.push({
-            name: item.MessageConfig.MsgType,
-            type: item.MessageConfig.ThemeName,
-            send_pattern: item.MessageConfig.PushMode,
-            receive_person: item.MessageConfig.PushGroup,
-            is_use: item.MessageConfig.IsStarted,
-            ...item.MessageConfig,
-            item,
+        let mesList = [];
+        if (res.code === 0) {
+          res.data.MessageConfigModels.map(item => {
+            mesList.push({
+              name: item.MessageConfig.MsgType,
+              type: item.MessageConfig.ThemeName,
+              send_pattern: item.MessageConfig.PushMode,
+              receive_person: item.MessageConfig.PushGroup,
+              is_use: item.MessageConfig.IsStarted,
+              ...item.MessageConfig,
+              item,
+            });
           });
-        });
 
-        setDataList(mesList);
+          setDataList(mesList);
+        }
+      } else {
+        notification.error({
+          message: '提示',
+          duration: 3,
+          description: res.msg,
+        });
       }
     });
   };

src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx

@@ -720,12 +720,16 @@ const EditModal = props => {
                 {listType.map(item => (
                   <div key={item.title} className={styles.cardListItem}>
                     {item.title != '自定义' && item.title != '定时推送' ? (
-                      <Button
-                        type={item.title === btnType ? 'primary' : 'default'}
-                        style={{ cursor: 'not-allowed', marginRight: '1rem', width: '88px' }}
+                      <span
+                        style={{
+                          display: 'inline-block',
+
+                          width: '88px',
+                          marginLeft: '16px',
+                        }}
                       >
-                        {item.title}
-                      </Button>
+                        {item.title}：
+                      </span>
                     ) : (
                       <Button
                         type={item.title === btnType ? 'primary' : 'default'}
@@ -750,7 +754,7 @@ const EditModal = props => {
           {btnType === '定时推送' ? (
             <Card title="推送计划" style={{ width: '100%', marginTop: '1rem' }}>
               <div style={{ display: 'flex', alignItems: 'center' }}>
-                <Item labelCol={{ span: 6 }}>
+                <Item labelCol={{ span: 5 }}>
                   <div style={{ display: 'flex' }}>
                     <Item
                       label="推送组"
@@ -810,7 +814,7 @@ const EditModal = props => {
           )}
           <div className={styles.push_trench}>
             <Row>
-              <Col xxl={8} xl={12} sm={24} xs={40}>
+              <Col xxl={8} xl={12} sm={24} xs={24}>
                 {
                   <div className={styles.trench_card}>
                     <div className={styles.card_title}>
@@ -821,7 +825,7 @@ const EditModal = props => {
                       />
                     </div>
                     <div className={styles.card_body}>
-                      <Item label="模板" name="web_template" labelCol={{ span: 6 }}>
+                      <Item label="模板" name="web_template" labelCol={{ span: 5 }}>
                         <Select style={{ width: '97%' }} disabled={!currentTrench.isWEBShow}>
                           {WEB_ITEMS.map((item, idx) => (
                             <Select.Option value={item.Id} key={idx}>
@@ -831,8 +835,8 @@ const EditModal = props => {
                         </Select>
                       </Item>
                       <Row>
-                        <Col span={16}>
-                          <Item label="标题" name="webTitile" labelCol={{ span: 9 }}>
+                        <Col span={15}>
+                          <Item label="标题" name="webTitile" labelCol={{ span: 8 }}>
                             <Input
                               placeholder="请输入标题"
                               style={{ width: '97%' }}
@@ -844,14 +848,14 @@ const EditModal = props => {
                           <Item
                             label="图标"
                             name="WebIcon"
-                            style={{ height: '112px' }}
-                            labelCol={{ span: 6 }}
+                            style={{ height: '82px' }}
+                            labelCol={{ span: 12 }}
                           >
                             {imageUrl ? (
                               <div
                                 style={{
-                                  width: '104px',
-                                  height: '104px',
+                                  width: '74px',
+                                  height: '74px',
                                   border: '1px solid #d9d9d9',
                                   borderRadius: '2px',
                                   padding: '8px',
@@ -882,8 +886,8 @@ const EditModal = props => {
                                       style={{
                                         position: 'absolute',
                                         fontSize: '18px',
-                                        left: '24px',
-                                        top: '45px',
+                                        left: '12px',
+                                        top: '25px',
                                         color: 'white',
                                         zIndex: '999',
                                       }}
@@ -893,8 +897,8 @@ const EditModal = props => {
                                       style={{
                                         position: 'absolute',
                                         fontSize: '18px',
-                                        left: '54px',
-                                        top: '45px',
+                                        left: '40px',
+                                        top: '25px',
                                         color: 'white',
                                         zIndex: '999',
                                       }}
@@ -906,14 +910,14 @@ const EditModal = props => {
                               </div>
                             ) : (
                               <Image
-                                width="104px"
+                                width="74px"
                                 // height={100}
                                 src="error"
                                 onClick={
                                   currentTrench.isWEBShow
                                     ? () => {
-                                        pictruePreview();
-                                    }
+                                      pictruePreview();
+                                      }
                                     : ''
                                 }
                                 fallback="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg=="
@@ -922,7 +926,7 @@ const EditModal = props => {
                           </Item>
                         </Col>
                       </Row>
-                      <Item label="功能路径" name="web_path" labelCol={{ span: 6 }}>
+                      <Item label="功能路径" name="web_path" labelCol={{ span: 5 }}>
                         {/* <TextArea
                           rows={1}
                           style={{ width: '97%' }}
@@ -966,7 +970,7 @@ const EditModal = props => {
                       />
                     </div>
                     <div className={styles.card_body}>
-                      <Item label="模板" name="app_template" labelCol={{ span: 6 }}>
+                      <Item label="模板" name="app_template" labelCol={{ span: 5 }}>
                         <Select style={{ width: '97%' }} disabled={!currentTrench.isAPPShow}>
                           {APP_ITEMS.map((item, idx) => (
                             <Select.Option value={item.Id} key={idx}>
@@ -975,7 +979,7 @@ const EditModal = props => {
                           ))}
                         </Select>
                       </Item>
-                      <Item label="功能路径" name="app_path" labelCol={{ span: 6 }}>
+                      <Item label="功能路径" name="app_path" labelCol={{ span: 5 }}>
                         {/* <TextArea
                           rows={1}
                           style={{ width: '97%' }}
@@ -1018,7 +1022,7 @@ const EditModal = props => {
                       />
                     </div>
                     <div className={styles.card_body}>
-                      <Item label="模板" name="wx_template" labelCol={{ span: 6 }}>
+                      <Item label="模板" name="wx_template" labelCol={{ span: 5 }}>
                         <Select style={{ width: '97%' }} disabled={!currentTrench.isWXShow}>
                           {WX_ITEMS.map((item, idx) => (
                             <Select.Option value={item.Id} key={idx}>
@@ -1027,14 +1031,14 @@ const EditModal = props => {
                           ))}
                         </Select>
                       </Item>
-                      <Item label="H5路由" name="h5_path" labelCol={{ span: 6 }}>
+                      <Item label="H5路由" name="h5_path" labelCol={{ span: 5 }}>
                         <Input
                           style={{ width: '97%' }}
                           disabled={!currentTrench.isWXShow}
                           placeholder="请输入功能路径"
                         />
                       </Item>
-                      <Item label="小程序路由" name="miniprogram_path" labelCol={{ span: 6 }}>
+                      <Item label="小程序路由" name="miniprogram_path" labelCol={{ span: 5 }}>
                         <Input
                           style={{ width: '97%' }}
                           disabled={!currentTrench.isWXShow}
@@ -1057,7 +1061,7 @@ const EditModal = props => {
                       />
                     </div>
                     <div className={styles.card_body}>
-                      <Item label="模板" name="message_template" labelCol={{ span: 6 }}>
+                      <Item label="模板" name="message_template" labelCol={{ span: 5 }}>
                         <Select style={{ width: '97%' }} disabled={!currentTrench.isMessageShow}>
                           {MES_ITEMS.map((item, idx) => (
                             <Select.Option value={item.Id} key={idx}>
@@ -1081,7 +1085,7 @@ const EditModal = props => {
                       />
                     </div>
                     <div className={styles.card_body}>
-                      <Item label="模板" name="enterprise_template" labelCol={{ span: 6 }}>
+                      <Item label="模板" name="enterprise_template" labelCol={{ span: 5 }}>
                         <Select
                           style={{ width: '97%' }}
                           disabled={!currentTrench.isEnterpriseWXShow}

src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.less

@@ -65,7 +65,7 @@
         margin-top: 10px;
         width: 100%;
         padding: 10px;
-        height: 16rem;
+        height: 14rem;
         display: flex;
         flex-direction: column;
         overflow: hidden;
@@ -74,7 +74,7 @@
         margin-right: 0.5rem;
       }
       .ant-form-item {
-        margin-left: 1.3rem;
+        margin-left: 0;
       }
     }
   }
@@ -84,8 +84,8 @@
   position: relative;
   top: -95px;
   left: -9px;
-  height: 104px;
-  width: 104px;
+  height: 74px;
+  width: 74px;
   background: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   z-index: 1;