bug fix

src/pages/activity/liveActivity/add/index.jsx

@@ -70,9 +70,7 @@ const header = props => {
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
         <Form.Item label="所属楼盘">
-          {getFieldDecorator('buildingId', {
-            rules: [{ required: true, message: ' 请输入所属楼盘' }],
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {
@@ -87,7 +85,7 @@ const header = props => {
                     message: '请选择直播开始时间',
                   },
                 ],
-              })(<DatePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
         <Form.Item label="直播结束时间">
           {getFieldDecorator('liveEndDate', {
@@ -97,18 +95,8 @@ const header = props => {
                     message: '请选择直播结束时间',
                   },
                 ],
-              })(<DatePicker disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
-        {/* <Form.Item label="直播时间">
-            {getFieldDecorator('liveTime', {
-              rules: [
-                {
-                  required: true,
-                  message: '请选择直播时间',
-                },
-              ],
-            })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item> */}
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
               rules: [{ required: true, message: '请选择直播小程序' }],
@@ -123,7 +111,7 @@ const header = props => {
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {
             rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="请下载文档查看如何获取" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {
@@ -132,7 +120,7 @@ const header = props => {
                 <ImageUpload />,
               )}
         </Form.Item>  
-        <Form.Item label="封面图2" help="建议尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
+        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
               {getFieldDecorator('detailImg', {
                   rules: [{ required: true, message: '请上传封面图2' }],
               })(
@@ -144,7 +132,7 @@ const header = props => {
                   rules: [{ required: true, message: '请上传详情图' }],
               })(
                 <ImageUpload />,
-              )}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 查看详情图示例</a>
+              )}
         </Form.Item>      
         <Form.Item label="权重">
               {getFieldDecorator('weight', {

src/pages/activity/liveActivity/edit/components/base.jsx

@@ -59,9 +59,10 @@ const header = props => {
   function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+      console.log(values, 'values');
       if (!err){
         let {liveTime, ...submitValue} = values
-        if (submitValue.status == '已发布'){
+        if (submitValue.status == '已发布' || submitValue.status == '1'){
           submitValue.status = 1
         }else{
           submitValue.status = 0
@@ -70,6 +71,8 @@ const header = props => {
           message.info("直播结束时间大于开始时间")
           return;
         }
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
         console.log(submitValue)
         request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
           message.info("保存成功")
@@ -95,7 +98,6 @@ const header = props => {
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
             initialValue: liveActivityData.buildingId,
-            rules: [{ required: true, message: ' 请输入所属楼盘' }],
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
         </Form.Item>
         <Form.Item label="直播活动标题">
@@ -112,7 +114,7 @@ const header = props => {
                     message: '请选择直播开始时间',
                   },
                 ],
-              })(<DatePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+              })(<DatePicker placeholder="预计开始时间" style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
         <Form.Item label="直播结束时间">
           {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
@@ -122,18 +124,8 @@ const header = props => {
                     message: '请选择直播结束时间',
                   },
                 ],
-              })(<DatePicker disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
-        {/* <Form.Item label="直播时间">
-            {getFieldDecorator('liveTime', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
-              rules: [
-                {
-                  required: true,
-                  message: '请选择直播时间',
-                },
-              ],
-            })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item> */}
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
               initialValue: liveActivityData.liveApp,
@@ -150,7 +142,7 @@ const header = props => {
           {getFieldDecorator('liveRoomParam', {
             initialValue: liveActivityData.liveRoomParam,
             rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="请下载文档查看如何获取" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填？查看说明</a>
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {
@@ -160,7 +152,7 @@ const header = props => {
                 <ImageUpload />,
               )}
         </Form.Item>  
-        <Form.Item label="封面图2" help="建议尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
+        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
               {getFieldDecorator('detailImg', {
                   initialValue: liveActivityData.detailImg,
                   rules: [{ required: true, message: '请上传封面图2' }],
@@ -173,8 +165,8 @@ const header = props => {
                   initialValue: liveActivityData.detailTypeImg,
                   rules: [{ required: true, message: '请上传详情图' }],
               })(
-                <ImageUpload />,
-              )}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 查看详情图示例</a>
+                <ImageUpload style={{width:'300px',height:'600px'}}/>,
+              )}
         </Form.Item>      
         <Form.Item label="权重">
               {getFieldDecorator('weight', {

src/pages/activity/liveActivity/edit/components/shareRecord.jsx

@@ -140,6 +140,7 @@ const handleSubmit = (e, props) => {
             </Button>
         </Form.Item>
       </Form>
+      <span>共筛选出{data.total}条记录</span>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

src/pages/activity/liveActivity/edit/components/visitRecord.jsx

@@ -142,6 +142,7 @@ const handleSubmit = (e, props) => {
             </Button>
         </Form.Item>
       </Form>
+      <span>共筛选出{data.total}条记录</span>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

src/pages/activity/liveActivity/edit/index.jsx

@@ -64,7 +64,7 @@ function EditHouse(props) {
         <Radio.Button value="poster">海报设置</Radio.Button>
         <Radio.Button value="share">分享设置</Radio.Button>
         <Radio.Button value="shareRecord">分享记录</Radio.Button>
-        <Radio.Button value="visitRecord">访问记录</Radio.Button>
+        <Radio.Button value="visitRecord">访问访问记录</Radio.Button>
       </Radio.Group>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'base' && <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)}/>)} 

src/pages/activity/liveActivity/list/index.jsx

@@ -67,12 +67,21 @@ const header = props => {
       openNotificationWithIcon('error', '请先选择需要删除的直播活动')
       return
     }
-    request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
-      message.info("操作成功")
-      getList({ pageNum: 1, pageSize: 10 });
-    }).catch((err) => {
-      // message.info(err.msg)
-    })
+    Modal.confirm({
+      title: '确定删除直播活动吗',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
+          message.info("操作成功")
+          getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          // message.info(err.msg)
+        })
+      },
+    });
+
+    
   }
 
   /**
@@ -261,12 +270,14 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
+      
       <AuthButton name="admin.live.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
       </AuthButton>
       <AuthButton name="admin.live.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
-      </AuthButton>
+      </AuthButton><br/>
+      <span>共筛选出{data.total}条记录</span>
       <Table rowSelection={rowSelection}
        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/house/list/index.jsx

@@ -67,13 +67,21 @@ const header = props => {
       openNotificationWithIcon('error', '请先选择需要删除的批次')
       return
     }
-    console.log(houseIdList,'houseIdListhouseIdList');
-    request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
-      message.info("操作成功")
-      getList({ pageNum: 1, pageSize: 10 });
-    }).catch((err) => {
-      // message.info(err.msg)
-    })
+
+    Modal.confirm({
+      title: '确定删除批次信息吗',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        console.log(houseIdList,'houseIdListhouseIdList');
+        request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
+          message.info("操作成功")
+          getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          // message.info(err.msg)
+        })
+      },
+    });
   }
 
   const newQrcode = row => {