Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

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

 
   const cancelPage = () =>{
     router.push({
-      pathname: '/activity/liveActivity/list',
+      pathname: '/activity/liveActivity/list/index    ',
     });
   }
 
     props.form.validateFields((err, values) => {
       if (!err){
         let {liveTime, ...submitValue} = values
+        console.log(submitValue.status, 'submitValue.status = 1submitValue.status = 1')
+        if (submitValue.status == '已发布'){
+          submitValue.status = 1
+        }else{
+          submitValue.status = 0
+        }
         if(null != liveTime && liveTime.length > 0){
           const [liveStartDate, livenEndDate] = liviTime
           submitValue.liveStartDate = moment(liveStartDate).format('YYYY-MM-DD HH:mm:ss');
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="所属城市">
           {getFieldDecorator('cityId', {
+            initialValue: liveActivityData.cityId,
             rules: [{ required: true, message: ' 请输入所属城市' }],
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
+            initialValue: liveActivityData.buildingId,
             rules: [{ required: true, message: ' 请输入所属楼盘' }],
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {
+            initialValue: liveActivityData.liveActivityTitle,
             rules: [{ required: true, message: '请输入直播活动标题' }],
           })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
         </Form.Item>
-        <Form.Item label="直播时间">
-            {getFieldDecorator('liveTime', {
+        {/* <Form.Item label="直播时间">
+            {getFieldDecorator('liveTime', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
               rules: [
                 {
                   required: true,
                 },
               ],
             })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
+              initialValue: liveActivityData.liveApp,
               rules: [{ required: true, message: '请选择直播小程序' }],
             })(<Select placeholder="选择在哪个平台直播" style={{ width: '300px' }}>
             <Option value="1">腾讯NOW直播(推荐)</Option>
         </Form.Item>
         <Form.Item label="房间参数">
           {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>
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {
+                  initialValue: liveActivityData.listImg,
                   rules: [{ required: true, message: '请上传封面图1' }],
               })(
                 <ImageUpload />,
         </Form.Item>  
         <Form.Item label="封面图2" help="建议尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
               {getFieldDecorator('detailImg', {
+                  initialValue: liveActivityData.detailImg,
                   rules: [{ required: true, message: '请上传封面图2' }],
               })(
                 <ImageUpload />,
         </Form.Item>  
         <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
               {getFieldDecorator('detailTypeImg', {
+                  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>
         </Form.Item>      
         <Form.Item label="权重">
-              {getFieldDecorator('detailImg', {
+              {getFieldDecorator('weight', {
+                  initialValue: liveActivityData.weight,
                   rules: [{ required: true, message: '请设置权重' }],
               })(
                 <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
         </Form.Item>
         <Form.Item label="发布状态">
           {getFieldDecorator('status', {
+              initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
               rules: [{ required: true, message: '请选择发布状态' }],
             })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">否</Option>
-            <Option value="1">是</Option>
+            <Option value="0">未发布</Option>
+            <Option value="1">已发布</Option>
           </Select>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>

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

   const [posterId, setPosterId] = useState('')
 
   const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
-  const salesBatchId = props.salesBatchId.batchId
-  if (salesBatchId) {
+  const liveActivityId = props.liveActivityId.liveId
+  if (liveActivityId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       request({
         ...apis.activity.poster,
-        params: { targetId: salesBatchId, targetType: 'live' },
+        params: { targetId: liveActivityId, targetType: 'live' },
       }).then(data => {
         if (data.length > 0) {
           setPosterId(data[0].posterId)
   }
 
   const submitPoster = () => {
-    if (salesBatchId) {
+    if (liveActivityId) {
       if (!imgValue) {
         message.error('请选择海报图片')
         return
         request({
           ...apis.activity.updatePoster,
           urlData: { id: posterId },
-          data: { targetId: salesBatchId, targetType: 'house', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+          data: { targetId: liveActivityId, targetType: 'live', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
         }).then(() => {
           message.info('保存成功')
         }).catch(err => {
       } else {
         request({
           ...apis.activity.addPoster,
-          data: { targetId: salesBatchId, targetType: 'house', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+          data: { targetId: liveActivityId, targetType: 'live', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
         }).then(data => {
           setPosterId(data.posterId)
           message.info('保存成功')

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

   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
-  const salesBatchId = props.salesBatchId.batchId
-  if (salesBatchId) {
+  const liveActivityId = props.liveActivityId.liveId
+  if (liveActivityId) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
       request({
         ...apis.activity.shareContent,
-        params: { targetId: salesBatchId, targetType: 'live' },
+        params: { targetId: liveActivityId, targetType: 'live' },
       }).then(data => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
           changeImg(data[0].shareContentImg)
           changeInput(data[0].shareContentTitle)
-        }else{
-          changeInput("诚挚邀您在线选房购房~");
-          request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
-            changeImg(data.aerialViewImg);
-        })
         }
+        // else{
+        //   changeInput("诚挚邀您在线选房购房~");
+        //   request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
+        //     changeImg(data.aerialViewImg);
+        // })
+        // }
       }).catch(err => {
         message.info(err.msg || err.message)
       })
   }
 
   const submitShare = () => {
-    if (salesBatchId) {
+    if (liveActivityId) {
       if (shareContentId) {
         request({
           ...apis.activity.updateShareContent,
           urlData: { id: shareContentId },
-          data: { targetId: salesBatchId, shareContentType: 'live', shareContentImg: imgValue,shareContentTitle: inputValue },
+          data: { targetId: liveActivityId, shareContentType: 'live', shareContentImg: imgValue,shareContentTitle: inputValue },
         }).then(data => {
           message.info('保存成功')
         }).catch(err => {
        } else {
         request({
           ...apis.activity.addShareContent,
-          data: { targetId: salesBatchId, shareContentType: 'house', shareContentImg: imgValue,shareContentTitle: inputValue },
+          data: { targetId: liveActivityId, shareContentType: 'live', shareContentImg: imgValue,shareContentTitle: inputValue },
         }).then(data => {
           setShareContentId(data.shareContentId)
           message.info('保存成功')

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

 const header = (props) => {
   const [ data, setData ] = useState({})
   const [page, changePage] = useState({})
-  const salesBatchId = props.salesBatchId.batchId
+  const liveActivityId = props.liveActivityId.liveId
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
+    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
   },[])
 
   // 查询列表
     },
     {
       title: '分享内容',
-      dataIndex: 'salesBatchName',
-      key: 'salesBatchName',
+      dataIndex: 'liveActivityTitle',
+      key: 'liveActivityTitle',
       align: 'center',
-      render: (x, row) => <span>{ row.liveActivityTitle }的房源列表</span>
+      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
     },
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : salesBatchId, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId,  ...values })
+        getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId,  ...values })
       }
     });
   }

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

 const header = (props) => {
   const [ data, setData ] = useState({})
   // const [page, changePage] = useState({})
-  const salesBatchId = props.salesBatchId.batchId
+  const liveActivityId = props.liveActivityId.liveId
 
   useEffect(() => {
-    console.log(salesBatchId, 'salesBatchId')
-    getList({ pageNum: 1, pageSize: 10, salesBatchId : salesBatchId});
+    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
   },[])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.house.taHouseVisit, salesBatchId : salesBatchId, params: { ...params },}).then((data) => {
+    request({ ...apis.taliveActivity.taLiveVisit, liveActivityId : liveActivityId, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
     // },
     {
       title: '访问内容',
-      dataIndex: 'salesBatchName',
-      key: 'salesBatchName',
+      dataIndex: 'liveActivityTitle',
+      key: 'liveActivityTitle',
       align: 'center',
-      render: (x, row) => <span>{ row.salesBatchName }的房源列表</span>
+      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
     },
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : salesBatchId, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
     props.form.validateFields((err, values) => {
       if (!err) {
         console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, salesBatchId: salesBatchId, ...values})
+        getList({ pageNum: 1, pageSize: 10, liveActivityId: liveActivityId, ...values})
       }
     });
   }

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

       dataIndex: 'liveActivityTitle',
       key: 'liveActivityTitle',
       align: 'center',
-      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddLive(row)}>{row.liveActivityTitle}</span></>,
+      // render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddLive(row)}>{row.liveActivityTitle}</span></>,
     },
     {
       title: '所属城市',

src/services/apis.js

     method: 'GET',
     action: 'admin.taLiveShare.get',
   },
+  taLiveVisit:{
+    url: `${prefix}/taLiveVisit`,
+    method: 'GET',
+    action: 'admin.taLiveVisit.get',
+  },
   addTaLiveActivity: {
     method: 'POST',
     url: `${prefix}/taLiveActivity`,
   getTaLiveActivity:{
     url: `${prefix}/taLiveActivity/:id`,
     method: 'get',
-    action: 'admin.taLiveActivity.put',
+    action: 'admin.taLiveActivity.get',
   },
   taLiveActivity: {
     method: 'GET',