合并

src/pages/activity/drainage/DrainageList.jsx

   });
 }
 
-
-
-const data = [
-
-  {
-    Id: '1',
-    name: 'zls',
-    // StartTime:'',
-    // EndTime:'',
-    number: 33,
-  }
-
-
-];
-
 const header = (props) => {
   // const [data, setData] = useState({ data: [] })
   const [datas, setDatas] = useState([])//表格数据
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <AuthButton name="admin.taDrainage.id.put" noRight={null}><div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div></AuthButton>
+      render: (text, datas) => <>
+
+        <div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div>
+
+      </>
     },
     {
       title: 'appid',
       dataIndex: 'appid',
       key: 'appid',
       align: 'center',
-      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>, 
     },
     {
       title: 'secret',
   const Forms = props => {
 
     console.log(date, '---------------')
-    console.log(formsdate, '---------------')
+    console.log(formsdate.name, '---------------')
     console.log(formsdate, '22222222')
-    const fields = [
-      {
-        label: 'H5项目名称',
-        name: 'name',
-        type: FieldTypes.Text,
-        placeholder: "请输入H5项目名称",
-        value: formsdate.name,
-
-      },
-      {
-        label: '截止时间',
-        name: 'endDate',
-        type: FieldTypes.DatePicker,
-        value: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
-        // render: <DatePicker placeholder="截止时间" value= {formsdate.endDate} />,
-      },
-
-
-    ]
-
-    const handleSubmit = val => {
-      console.log(date, '111---------------')
-      console.log(formsdate, '111---------------')
-      console.log(formsdate, '11122222222')
-      // data: { ...submitValue }
-
-      console.log(formsdate.drainageId, '9999999999999')
-      if (formsdate.drainageId) {
-        // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val }).then((data) => {
-          message.info('操作成功！')
-          // gettaDrainage({ pageNum: 1, pageSize: 10 })
-        }).catch((err) => {
-          console.log('111111', err)
-          message.info(err.msg || err.message)
-        })
-
-      } else {
 
 
-
-        request({ ...apis.activity.addtaDrainage, data: val }).then((data) => {
-          message.info("保存成功")
-          console.log(data, '22222')
-
-        }).catch((err) => {
-          message.error(err.msg || err.message)
-        })
+    const { formsDate } = props
+    useEffect(() => {
+      if (formsDate) {
+        props.form.setFieldsValue({ name: formsdate.name, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
       }
-      setDate({
-        visible: false,
+    }, [formsDate])
+
+
+    const handleSubmit = e => {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          if (formsDate.drainageId) {
+            // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
+            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then((data) => {
+              message.info('操作成功！')
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              console.log('111111', err)
+              message.info(err.msg || err.message)
+            })
+
+          } else {
+
+            request({ ...apis.activity.addtaDrainage, data: values }).then((data) => {
+              message.info("操作成功")
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+              setDate({
+                visible: false,
+              });
+            }).catch((err) => {
+              message.error(err.msg || err.message)
+            })
+          }
+        }
       });
-      gettaDrainage({ pageNum: 1, pageSize: 10 })
     }
 
     const handleCancel = val => {
       });
     }
 
-    return <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields}></XForm>
+    const tailFormItemLayout = {
+      wrapperCol: {
+        xs: {
+          span: 24,
+          offset: 0,
+        },
+        sm: {
+          span: 16,
+          offset: 8,
+        },
+      },
+    };
 
-  }
+    const formItemLayout = {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+    };
 
+    const { getFieldDecorator } = props.form;
+    {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
+
+    return <Form {...formItemLayout} onSubmit={handleSubmit}>
+
+
+      <Form.Item label="H5项目名称">
+        {getFieldDecorator('name')(
+          <Input
+            placeholder="请输入H5项目名称"
+          />,
+        )}
+      </Form.Item>
+      <Form.Item label="截止时间">
+        {getFieldDecorator('endDate')(
+          <DatePicker
+          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+          // placeholder={formsdate.endDate}
+          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          />,
+        )}
+      </Form.Item>
+      <Form.Item {...tailFormItemLayout}>
+        <AuthButton name="admin.taDrainage.id.put" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
+            确定
+    </Button>
+        </AuthButton>
+        <Button style={{ marginLeft: 8 }} onClick={handleCancel}>
+          取消
+      </Button>
+      </Form.Item>
+    </Form>
+
+  }
+  const Formss = Form.create({ name: 'Forms' })(Forms);
 
 
 
     console.log(formsdate, '22222222')
     setDate({
       visible: true,
+      title: "修改H5项目"
     });
+
+
+    console.log('form :', props.form)
+
+
   };
   function showModal () {
     setFormsDate({
     })
     setDate({
       visible: true,
+      title: '新建H5项目'
     });
   };
   const changePageNum = pageNumber => {
   }
 
   const { getFieldDecorator } = props.form;
-  const { visible, confirmLoading, ModalText } = date;
+  const { visible, confirmLoading, ModalText, title } = date;
   return (
     <>
       <div>
               />,
             )}
           </Form.Item>
-          <Form.Item>
+          <Form.Item >
             <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
               搜索
           </Button>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
         <Modal
-          title="新建H5项目"
+          title={title}
+
           visible={visible}
           //  onOk={handleOk}
           confirmLoading={confirmLoading}
           onCancel={handleCancel}
           footer={null}
         >
-          <Forms />
+          <Formss formsDate={formsdate} />
         </Modal>
         <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/building/list/add/components/amap.jsx

 import styles from '../amap.less'
 
 class Amap extends React.Component {
+
   constructor(props) {
     super(props);
+    
     // 高德地图 Marker 实例
     this.markerInstance = undefined
     // 高德地图 Map 实例
     this.mapInstance = undefined
+
     this.amapEvents = {
       created: mapInstance => {
         console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
           // 实例化Autocomplete
           const autoOptions = {
             // city 限定城市，默认全国
-            city: '全国',
+            // city: '025',
             // input 为绑定输入提示功能的input的DOM ID
             input: 'amapInput',
           }
       },
     }
     this.markerPosition = { longitude: 120, latitude: 30 };
+    const { value } = this.props
+    console.log('项目地图 value', value)
+
+
+
+    this.setMapPosition.bind(this)
   }
 
-  render() {
+  componentDidUpdate(prevProps) {
     const { value } = this.props
-    if (value) {
-     // this.markerInstance.setPosition(value.split(','))
+    // console.log('项目地图 value', value)
+    console.log('this.markerInstance: ', this.markerInstance, this.props)
+    if (this.props.value !== prevProps.value) {
+      if (value) {
+        console.log('项目地图 value', value)
+        this.setMapPosition(value)
+      }
+    }
+  }
+
+  setMapPosition(value) {
+    console.log('获取this：', this.markerInstance)
+    if (this.markerInstance) {
+      // this.markerInstance.setPosition(value)
     }
+  }
 
+  render() {
     return (
       <>
         <div style={{ width: '100%', height: '400px', position: 'relative' }}>

src/pages/building/list/add/components/base.jsx

             {getFieldDecorator('name')(<Input />)}
           </Form.Item> */}
           <Form.Item label="项目类型">
-            {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
+            {getFieldDecorator('buildingProjectType', {
+              rules: [{ required: true, message: '请选择项目类型' }],
+            })(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" >
             {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
             )}
           </Form.Item>
           <Form.Item label="销售状态" >
-            {getFieldDecorator('marketStatus')(
+            {getFieldDecorator('marketStatus', {
+              rules: [{ required: true, message: '请选择销售状态' }],
+            })(
               <Select placeholder="销售状态" style={{ width: '1016px' }}>
                 <Option value="待定">待定</Option>
                 <Option value="在售">在售</Option>
             )}
           </Form.Item>
           <Form.Item label="项目主图" help="建议图片尺寸：640px*360px">
-            {getFieldDecorator('avatarImage')(
+            {getFieldDecorator('avatarImage', {
+              rules: [{ required: true, message: '请选择项目主图' }],
+            })(
               <ImageListUpload />,
             )}
           </Form.Item>
             )}
           </Form.Item>
           <Form.Item label="楼盘区域" >
-            {getFieldDecorator('buildingArea')(<Input />)}
+            {getFieldDecorator('buildingArea', {
+              rules: [{ required: true, message: '请输入楼盘区域' }],
+            })(<Input />)}
           </Form.Item>
           <Form.Item label="项目地址" >
-            {getFieldDecorator('address')(<Input />)}
+            {getFieldDecorator('address', {
+              rules: [{ required: true, message: '请输入项目地址' }],
+            })(<Input />)}
           </Form.Item>
           <Form.Item label="项目坐标" >
-            {getFieldDecorator('coordinate')(<Input disabled />)}
+            {getFieldDecorator('coordinate', {
+              rules: [{ required: true, message: '请输入项目坐标' }],
+            })(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" >
             {getFieldDecorator('coordinate')(<Amap />)}

src/pages/building/list/index.jsx

       <p className={Styles.cardItem}>
         <span className={Styles.title}>均价</span>
         <span >
-          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m²
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>元/m²
         </span>
       </p>
       <p className={Styles.cardItem}>

src/pages/customer/independentList/index.jsx

         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-          if (records.status === 1) { return '报备' }
+          console.log("retrun", records)
+          if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
           if (records.status === 2) { return '到访' }
           if (records.status === 3) { return '认购' }
           if (records.status === 4) { return '签约' }
           if (records.verifyStatus === 1) { return '待审核' }
           if (records.verifyStatus === 2) { return '审核同意' }
           if (records.verifyStatus === 3) { return '签约' }
+          // reportRecommendStatus
         },
       },
     ]

src/pages/indexEcharts/components/UserBehavior.jsx

           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} checkFirst></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

src/pages/integralMall/writeOff.jsx

   return (
     <>
       <Tabs onChange={callback} type="card">
-        <TabPane tab="扫码核销" key="1">
+        {/* <TabPane tab="扫码核销" key="1">
           <Row>
             <Col span={8} style={{ textAlign: 'center' }}>
               <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
             </Col>
           </Row>
           <Dialog onEnter={handleEnter} onChange={changeCode} />
-        </TabPane>
+        </TabPane> */}
         <TabPane tab="手机号核销" key="2">
           <Row>
             <Col span={12} style={{ textAlign: 'center' }}>