fix

config/routes.js

@@ -540,19 +540,7 @@ export default [
                 component: './carouselFigure/editAdvertising',
                 menuCode: '/carouselFigure/editAdvertising',
               },
-              {
-                path: '/carouselFigure/customImg/list',
-                name: '其他',
-                component: './carouselFigure/customImg/list',
-                menuCode: '/carouselFigure/customImg/list',
-              },
-              {
-                path: '/carouselFigure/customImg/edit',
-                name: '其他编辑',
-                hideInMenu: true,
-                component: './carouselFigure/customImg/edit',
-                menuCode: '/carouselFigure/customImg/edit',
-              },
+             
             ],
           },
          
@@ -600,6 +588,19 @@ export default [
                 component: './staff/Organization',
                 menuCode: '/system/Organization/List',
               },
+              // {
+              //   path: '/system/customImg/list',
+              //   name: '首页分享',
+              //   component: './carouselFigure/customImg/list',
+              //   menuCode: '/carouselFigure/customImg/list',
+              // },
+              {
+                path: '/system/customImg/edit',
+                name: '首页分享',
+                // hideInMenu: true,
+                component: './carouselFigure/customImg/edit',
+                menuCode: '/carouselFigure/customImg/edit',
+              },
             ],
           },
           {

src/components/Share/index.jsx

@@ -68,6 +68,12 @@ const ShareForm = (props) => {
     }
   }, [targetId, targetType])
 
+
+  const onCancel =()=>{
+    setFieldsValue({ shareContentImg:'', shareContentTitle:'' })
+    message.info('内容已清空，点击保持后生效')
+  }
+
   useEffect(() => {
     const { shareContentImg, shareContentTitle } = formData || {}
 
@@ -79,19 +85,19 @@ const ShareForm = (props) => {
     <Form {...formItemLayout} onSubmit={handleSubmit}>
       <Form.Item label="分享标题">
       {getFieldDecorator('shareContentTitle', {
-        rules: [{required: true, message: '请填写分享标题'}]
+        // rules: [{required: true, message: '请填写分享标题'}]
       })(<Input placeholder="建议不要超过20字" />)}
       </Form.Item>
       <Form.Item label="分享图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
       {getFieldDecorator('shareContentImg', {
-          rules: [{ required: true, message: '请上传分享图' }],
+          // rules: [{ required: true, message: '请上传分享图' }],
       })(<ImageUpload />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
         <AuthButton name={rights}>
           <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
         </AuthButton>
-        {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
+        <Button style={{marginLeft: '2em'}} onClick={onCancel}>清空</Button>
       </Form.Item>
     </Form>
   )

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -230,7 +230,6 @@ const header = props => {
         <Form.Item label="权重">
           {getFieldDecorator('weight', {
             initialValue: liveActivityData.weight,
-            rules: [{ required: true, message: '请设置权重' }],
           })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
         <Form.Item label="发布状态">

src/pages/Live/LiveActivity/add/index.jsx

@@ -194,7 +194,6 @@ const header = props => {
         </Form.Item>
         <Form.Item label="权重">
           {getFieldDecorator('weight', {
-            rules: [{ required: true, message: '请设置权重' }],
           })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
         <Form.Item label="发布状态">

src/pages/Live/video/Edit/index.jsx

@@ -164,7 +164,6 @@ const header = props => {
         <Form.Item label="权重">
           {getFieldDecorator('weight', {
             initialValue: data.weight,
-            rules: [{ required: true, message: '请设置权重' }],
           })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
 

src/pages/activity/SignupActivity/edit/Basic.jsx

@@ -27,10 +27,6 @@ const BasicForm = props => {
   const [data, setData] = useState(1);
   const [showSignupTime, setShowSignupTime] = useState([]);
 
-  const radioOnChange = e => {
-    setIsEnlist(e.target.value);
-  };
-
   const { dynamicId, type } = props;
 
   // 查询详情

src/pages/activity/groupRoomActivity/detail.jsx

@@ -134,9 +134,9 @@ const BasicForm = props => {
         <Form.Item label="活动标题">
           <span>{detailData.title}</span>
         </Form.Item>
-        {/* <Form.Item label="副标题">
+        <Form.Item label="副标题">
           <span>{detailData.halfTitle}</span>
-        </Form.Item> */}
+        </Form.Item>
         <Form.Item label="活动时间">
           <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
             detailData.endDate,

src/pages/activity/groupRoomActivity/edit/Basic.jsx

@@ -188,7 +188,7 @@ const BasicForm = props => {
         </Form.Item> */}
         <Form.Item
           label="活动详情主图"
-          help="建议图片尺寸：750*415px，比例16:9,格式：jpg，用于：普通活动详情"
+          help="建议图片尺寸：750*415px，比例16:9,格式：jpg，用于：活动详情"
         >
           {getFieldDecorator('imgUrl', {
             rules: [
@@ -209,6 +209,16 @@ const BasicForm = props => {
             ],
           })(<Input />)}
         </Form.Item>
+        <Form.Item label="活动副标题">
+          {getFieldDecorator('halfTitle', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动副标题',
+              },
+            ],
+          })(<Input />)}
+        </Form.Item>
         <Form.Item label="活动时间">
           {getFieldDecorator('activityTime', {
             rules: [

src/pages/building/Edit/Basic/index.jsx

@@ -179,7 +179,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
             {getFieldDecorator('isRecentOpening', { valuePropName: 'checked' })(<Switch />)}
           </Form.Item>
         </FormGroupItem>
-        <Form.Item label="列表均价" help="项目列表展示价格，示例：约10000元/㎡、约1000万元/套起">
+        <Form.Item label="列表均价" help="项目列表展示价格，示例：约10000元/㎡、约1000万元/套起；建议不要超过10个中文字符或20个英文字符，否则可能影响小程序端展示美观">
           {getFieldDecorator('price', {
               rules: [{ required: true, message: '请输入列表均价' }],
           })(<Input />)}

src/pages/building/Edit/Panorama/Form.jsx

@@ -23,6 +23,8 @@ const AMForm = props => {
       }
       const data = values;
       data.buildingId = props.buildingId;
+      data.panoramaType = 'building';
+      
       const api = apis.paorama.add;
 
       // 网路请求
@@ -40,7 +42,7 @@ const AMForm = props => {
 
   return (
     <ModalForm title="全景设置" visible={visible} onCancel={onCancel} modalProps={{destroyOnClose:true}} onSubmit={submitData}>
-      <Form.Item label="全景类型">
+      {/* <Form.Item label="全景类型">
         {getFieldDecorator('panoramaType', {
           initialValue:panoramaType,
           rules: [{ required: true, message: '请选择全景类型' }],
@@ -50,7 +52,7 @@ const AMForm = props => {
             <Radio.Button value="building">项目</Radio.Button>
           </Radio.Group>,
         )}
-      </Form.Item>
+      </Form.Item> */}
       {/* {panoramaType == 'apartment' && (
         <Form.Item label="全景内容">
           {getFieldDecorator('apartmentId', {

src/pages/building/Edit/Panorama/List.jsx

@@ -21,17 +21,17 @@ export default props => {
         />
       ),
     },
-    {
-      title: '类型',
-      dataIndex: 'panoramaType',
-      key: 'panoramaType',
-      render: (x, record) => <span>{x === 'apartment' ? '户型' : '项目'}</span>,
-    },
-    {
-      title: '内容',
-      dataIndex: 'content',
-      key: 'content',
-    },
+    // {
+    //   title: '类型',
+    //   dataIndex: 'panoramaType',
+    //   key: 'panoramaType',
+    //   render: (x, record) => <span>{x === 'apartment' ? '户型' : '项目'}</span>,
+    // },
+    // {
+    //   title: '内容',
+    //   dataIndex: 'content',
+    //   key: 'content',
+    // },
     {
       title: '链接地址',
       dataIndex: 'panoramaLink',

src/pages/carouselFigure/customImg/edit.jsx

@@ -16,31 +16,12 @@ let helpTips = '';
 const XForm = createForm();
 
 const header = props => {
-  const {
-    currentUser = {
-      avatar: '',
-      userName: '',
-    },
-    menu,
-  } = props;
-
-  const imgId = props.location.query.imgId;
-  const imgType = props.location.query.imgType;
-
-  const [data, setData] = useState({}
-    // imgType === 'index'
-    //   ? {
-    //       imgUrl:
-    //         'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
-    //       imgType: 'index',
-    //       imgDesc: '小程序首页分享配图',
-    //       imgDocument: currentUser.orgName + ' 精准获客平台',
-    //     }
-    //   : {
-    //       imgUrl: 'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
-    //       imgType: 'indexNews',
-    //     },
-  );
+
+
+  const imgId =1;
+
+
+  const [data, setData] = useState({});
 
   if (imgId) {
     useEffect(() => {
@@ -49,7 +30,8 @@ const header = props => {
 
     // 查询列表
     const getData = imgId => {
-      request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: imgId } }).then(data => {
+
+      request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: 1 } }).then(data => {
 
         setData(data);
       });
@@ -65,51 +47,62 @@ const header = props => {
       help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
       rules: [{ required: true, message: '请选择图片' }],
     },
+    // {
+    //   label: '类型',
+    //   name: 'imgType',
+    //   type: FieldTypes.Select,
+    //   value: data.imgType,
+    //   dict: [
+    //     {
+    //       label: '首页分享',
+    //       value: 'index',
+    //     },
+    //     // {
+    //     //   label: '首页资讯',
+    //     //   value: 'indexNews',
+    //     // },
+    //   ],
+    //   rules: [{ required: true, message: '请选择类型' }],
+    // },
     {
-      label: '类型',
-      name: 'imgType',
-      type: FieldTypes.Select,
-      value: data.imgType,
-      dict: [
-        {
-          label: '首页分享',
-          value: 'index',
-        },
-        // {
-        //   label: '首页资讯',
-        //   value: 'indexNews',
-        // },
-      ],
-      rules: [{ required: true, message: '请选择类型' }],
-    },
-    data.imgType === 'index' && {
       label: '分享文案',
       name: 'imgDocument',
       type: FieldTypes.Text,
       value: data.imgDocument,
       rules: [{ required: true, message: '请输入分享文案' }],
     },
+    {
+      label: '是否启用',
+      name: 'status',
+      type: FieldTypes.Switch,
+      value: data.status===1?true:false,
+      // rules: [{ required: true, message: '请输入分享文案' }],
+    },
   ];
 
   const handleSubmit = values => {
     if (imgId) {
       values.imgId = imgId;
+      values.imgType = 'index'
+      values.status = values.status==true?1:-1
       request({ ...apis.carsuseFigure.updateCustomImg, data: values })
         .then(data => {
-          cancelPage();
-        })
-        .catch(err => {
-          message.info(err.msg || err.message);
-        });
-    } else {
-      request({ ...apis.carsuseFigure.addCustomImg, data: values })
-        .then(data => {
-          cancelPage();
+          message.info('操作成功');
+          // cancelPage();
         })
         .catch(err => {
           message.info(err.msg || err.message);
         });
-    }
+    } 
+    // else {
+    //   request({ ...apis.carsuseFigure.addCustomImg, data: values })
+    //     .then(data => {
+    //       cancelPage();
+    //     })
+    //     .catch(err => {
+    //       message.info(err.msg || err.message);
+    //     });
+    // }
   };
 
   const cancelPage = () => {

src/pages/carouselFigure/customImg/list.jsx

@@ -35,7 +35,7 @@ function header(props) {
   // 跳转到编辑商品
   const toEditCustom = (imgId, imgType) => () => {
     router.push({
-      pathname: '/carouselFigure/customImg/edit',
+      pathname: '/system/customImg/edit',
       query: {
         imgId,
         imgType: imgType

src/pages/carouselFigure/editAdvertising.jsx

@@ -360,22 +360,22 @@ const createEditor = () => {
         value: data.targetId,
         rules: [{ required: true, message: '请选择发布直播活动' }],
       },
-      {
-        label: '状态',
-        name: 'status',
-        type: FieldTypes.Select,
-        dict: [
-          {
-            label: '上架',
-            value: 1,
-          },
-          {
-            label: '下架',
-            value: 0,
-          },
-        ],
-        value: data.status != null ? data.status : 1,
-      },
+      // {
+      //   label: '状态',
+      //   name: 'status',
+      //   type: FieldTypes.Select,
+      //   dict: [
+      //     {
+      //       label: '上架',
+      //       value: 1,
+      //     },
+      //     {
+      //       label: '下架',
+      //       value: 0,
+      //     },
+      //   ],
+      //   value: data.status != null ? data.status : 1,
+      // },
     ];
 
     const handleSubmit = val => {
@@ -402,6 +402,7 @@ const createEditor = () => {
             message.info(err.msg || err.message);
           });
       } else {
+        val.status=0
         request({ ...apis.carsuseFigure.addExtendContent, data: val })
           .then(data => {
             cancelPage();

src/pages/carouselFigure/editCarousel.jsx

@@ -331,22 +331,22 @@ const Edit = props => {
         value: data.targetId,
         rules: [{ required: true, message: '请选择发布直播活动' }],
       },
-      {
-        label: '状态',
-        name: 'status',
-        type: FieldTypes.Select,
-        dict: [
-          {
-            label: '上架',
-            value: 1,
-          },
-          {
-            label: '下架',
-            value: 0,
-          },
-        ],
-        value: data.status != null ? data.status : 1,
-      },
+      // {
+      //   label: '状态',
+      //   name: 'status',
+      //   type: FieldTypes.Select,
+      //   dict: [
+      //     {
+      //       label: '上架',
+      //       value: 1,
+      //     },
+      //     {
+      //       label: '下架',
+      //       value: 0,
+      //     },
+      //   ],
+      //   value: data.status != null ? data.status : 1,
+      // },
       {
         label: '权重',
         name: 'orderNo',
@@ -383,6 +383,7 @@ const Edit = props => {
             message.info(err.msg || err.message);
           });
       } else {
+        val.status=0
         request({ ...apis.carsuseFigure.addExtendContent, data: val })
           .then(data => {
             message.info('操作成功');

src/pages/channel/independentList/index.jsx

@@ -9,7 +9,7 @@ import {
   Card,
   Row,
   Col,
-  Pagination,
+  Popconfirm,
   Alert,
   Table,
   Avatar,
@@ -433,7 +433,7 @@ function body(props) {
     request({ ...apis.customer.deleteChannelPerson, urlData: { id: row.personId } })
       .then(response => {
         message.info('删除成功');
-        getList({ pageNum: pageNum, pageSize: 10, ...fieldsValue });
+        getList({ pageNum: 1, pageSize: 10, ...fieldsValue });
       })
       .catch(error => {});
   }

src/pages/customer/Customer/PublicCustomer/index.jsx

@@ -225,7 +225,7 @@ const PublicCustomer = () => {
         <Button type="primary" loading={exportLoding} onClick={() => exportCustomer()}>
           导出
         </Button>
-        {/* <AuthButton name="admin.customer.import" noRight={null}>
+        <AuthButton name="admin.customer.import" noRight={null}>
           <Button
             type="primary"
             onClick={() => batchAssistConsultant()}
@@ -233,7 +233,7 @@ const PublicCustomer = () => {
           >
             批量分配置业顾问
           </Button>
-        </AuthButton> */}
+        </AuthButton>
       </>
     );
   };
@@ -255,7 +255,7 @@ const PublicCustomer = () => {
     <>
       <QueryTable
         ref={ref}
-        // rowSelection={rowSelection}
+        rowSelection={rowSelection}
         rowKey="customerId"
         api={apis.customer.customerRecommend}
         searchFields={searchFields}

src/pages/staff/Role/Edit/index.jsx

@@ -183,13 +183,14 @@ const Poster = props => {
   const gridStyle1 = {
     width: '20%',
     textAlign: 'left',
-    height: '72px',
+    height: '120px',
     padding: '24px',
   };
   const gridStyle2 = {
+    // flex:'1',
     width: '80%',
     textAlign: 'left',
-    height: '72px',
+    height: '120px',
   };
 
   function toRoleList() {
@@ -277,7 +278,7 @@ const Poster = props => {
                           menu =>
                             item.menuId === menu.menuRoot &&
                             item.menuId !== menu.menuId && (
-                              <>
+                              <div >
                                 <Card.Grid style={gridStyle1}>
                                   <Checkbox
                                     checked={dataMenuId.includes(menu.menuId)}
@@ -301,7 +302,7 @@ const Poster = props => {
                                       </>
                                     ))}
                                 </Card.Grid>
-                              </>
+                              </div>
                             ),
                         )}
                       </Card>

src/pages/staff/staff/list/index.jsx

@@ -127,6 +127,11 @@ export default props => {
       label: '姓名',
       placeholder: '请输入姓名',
     },
+    {
+      name: 'phone',
+      label: '电话',
+      placeholder: '请输入手机号',
+    },
     {
       name: 'isConsultant',
       label: '类型',