bug fix

src/components/SelectButton/LivePlatSelect.jsx

@@ -22,7 +22,7 @@ function usePrevious(props) {
 const LivePlatSelect = props => {
   const [data, setData] = useState([])
   const [value, setValue] = useState([])
-  console.log('props', props.cityId);
+  console.log('props', props);
   useEffect(() => {
     getLivePlatList();
   }, [props.cityId])
@@ -38,9 +38,9 @@ const LivePlatSelect = props => {
 
 
   const checkValue = (data) => {
-    if (props.value) {
-      const tempData = data.filter(f => f.buildingId == props.value)
-      const va = (tempData.length > 0) ? props.value : '平台已下线，请重新选择'
+    if (props.liveApp) {
+      const tempData = data.filter(f => f.id == props.liveApp)
+      const va = (tempData.length > 0) ? props.liveApp : '平台已下线，请重新选择'
       props.onChange(va)
 
     }
@@ -57,7 +57,7 @@ const LivePlatSelect = props => {
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
           {data.map(building => (
-            <Option key={building.id} value={building.livePlatValue}>{building.livePlatName}</Option>
+            <Option key={building.id} value={building.id}>{building.livePlatName}</Option>
           ))}
       </Select>
   )

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -303,7 +303,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*668px，比例375:334,格式：jpg，用于拼团活动海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

src/pages/activity/groupActivity/helpRecord.jsx

@@ -478,7 +478,7 @@ function helpRecord(row) {
       render: (x, row) => (
         <>
           {row.verificationStatus === 0 &&
-          <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
+          <AuthButton name="admin.taShare.writeOff" noRight={null}>
            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
           </AuthButton>
         }

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -416,7 +416,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>助力海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*668px，比例375:334,格式：jpg，用于助力活动海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

src/pages/activity/helpActivity/signList.jsx

@@ -487,7 +487,7 @@ function helpRecord(row) {
       render: (x, row) => (
         <>
           {row.verificationStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
+          <AuthButton name="admin.help.writeOff" noRight={null}>
            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
           </AuthButton>
         }

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

@@ -33,7 +33,7 @@ const header = props => {
   const getLiveActivityData = (liveActivityId) => {
     request({ ...apis.taliveActivity.getTaLiveActivity, urlData: {id: liveActivityId} }).then((data) => {
         console.log(data)
-        setLiveActivityData(data)
+        setLiveActivityData(data.data)
         // if(data.qrCode == 'null'){
         //   message.error("暂时无法获取二维码")
         // }
@@ -135,9 +135,9 @@ const header = props => {
         </Form.Item>
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
-              initialValue: liveActivityData.liveApp,
+              initialValue: liveActivityData.liveAppName,
               rules: [{ required: true, message: '请选择直播小程序' }],
-            })(<LivePlatSelect />)}
+            })(<LivePlatSelect liveApp={liveActivityData.liveAppName}/>)}
         </Form.Item>
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {

src/pages/house/raise/edit/components/BatchRaise/Refund.jsx

@@ -1,5 +1,5 @@
 import React, { PureComponent, useState, useEffect } from 'react'
-import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input, message, Select } from 'antd'
 import EnDash from '../EnDash'
 import AuthButton from '@/components/AuthButton';
 
@@ -10,13 +10,58 @@ import request from '../../../../../../utils/request';
 
 const Refund = props => {
   const raiseRecordId = props.raiseRecordId;
+  const raiseId = props.raiseId;
+  const [data, setData] = useState([])
 
+  
+
+  useEffect(() => {
+    getList();
+  }, [props,raiseRecordId])
+
+  function getList(params) {
+    request({
+      ...apis.house.taRaiseById,
+      urlData: { id: raiseId }
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  function toDecimal2 (x){
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  function regFenToYuan(fen){
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = toDecimal2(num)
+    return num
+  }
+  
   function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err){
         request({ ...apis.house.refund, data: {targetId:raiseRecordId, targetType:"house", refundReason:values.refundReason}, }).then((data) => {
-            message.info("操作成功")
+          console.log('caozuochgegngong')
+            message.info("操作成功，微信退费会有延迟，请在稍后查询认筹单状态")
             props.onSuccess(false);
         }).catch((err) => {
             // message.info(err.msg)
@@ -31,6 +76,18 @@ const Refund = props => {
     <>
       <Modal footer={null} title="退款" visible={props.visible} onCancel={props.onCancel} width={600}>
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <div><span>当前系统设置认筹金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <div><span>用户实付金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <div><span>即将退费金额：{regFenToYuan(data.raisePrice)}元</span></div>
+          <Form.Item label="退费方式" labelAlign='left'>
+              {getFieldDecorator('refundType', {
+                  rules: [{ required: true, message: ' 退款原因' }],initialValue:'onLine'
+                })(
+                <Select style={{width: '120px'}} disabled>
+                  <Option value="onLine">线上退费</Option>
+                </Select>,
+              )}
+          </Form.Item>
           <Form.Item label="退款原因" labelAlign='left'>
             {getFieldDecorator('refundReason', {
               rules: [{ required: true, message: ' 退款原因' }],
@@ -42,6 +99,11 @@ const Refund = props => {
             </Button>
           </Form.Item>
         </Form>
+        <div>
+          <font style={{color:'#999'}}>支持退费的认筹单：</font><br/>
+          <font style={{color:'#999'}}>1.认筹单缴费状态为已缴费且缴费结果为成功且退费状态为未退费的。</font><br/><br/>
+          <font style={{color:'#999'}}>注意：发起线上退费后需要微信和银行处理，退费是否成功结果请到退费记录中查看</font><br/>
+        </div>
       </Modal>
     </>
   );

src/pages/house/raise/edit/components/IdentifyingChips.jsx

@@ -56,8 +56,9 @@ function PreselectionRecord(props) {
 
   function getList(params) {
     // 网路请求
-    console.log(params,'params')
+
     request({ ...apis.house.houseRaiseRecord, params: { ...params, salesBatchId: salesBatchId, raiseId: raiseId } }).then(res => {
+      console.log(params,'params')
       setData(res)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
@@ -115,7 +116,6 @@ function PreselectionRecord(props) {
   }
 
   function showBatchDel(e){
-    console.log(e,'eeeeeee')
     if (taRaiseRecords.length <= 0){
       message.info("请选择数据");
       return;
@@ -143,8 +143,9 @@ function PreselectionRecord(props) {
   }
 
   function raiseRefund(e){
+    console.log('页面刷新')
     setSingleRefund(e);
-    getList({ pageNumber: 1, pageSize: 10 })
+    getList();
   }
 
   function toDelBatch(){
@@ -425,11 +426,11 @@ function PreselectionRecord(props) {
       <Button type="primary" onClick={() => showRefund({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下退费</Button>
       <UserInfo visible={userInfo.visable} raiseId={userInfo.raiseId} raiseRecordId={userInfo.raiseRecord} onCancel={e => setUserInfo(e)} />
       <HouseInfo visible={houseInfo.visable} salesBatchId={houseInfo.salesBatchId} raiseRecordId={houseInfo.raiseRecordId} raiseId={raiseId} buildingId={houseInfo.buildingId} onCancel={(e) => hideHouseInfo({visable:false, raiseRecordId:''})} />
-      <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
+      <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid({visable:false, houseIds: taRaiseRecords})} onSuccess={() => showInvalid({visable:false, taRaiseRecords:[]})}/>
       <BatchDel visible={batchDel.visable} houseIds={batchDel.houseIds} onCancel={() => showBatchDel({visable:false, houseIds: taRaiseRecords})} onSuccess={() => showBatchDel({visable:false, houseIds:'' })}/>
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />
       <BatchRefund visible={refund.visable} houseIds={refund.houseIds} onCancel={() => setRefund(false)} onSuccess={() => showRefund(false)}/>
-      <Refund visible={singleRefund.visable} raiseRecordId={singleRefund.raiseRecordId} onCancel={() => raiseRefund({visable:false, raiseRecordId:''})} onSuccess={() => raiseRefund({visable:false, raiseRecordId:''})}></Refund>
+      <Refund visible={singleRefund.visable} raiseId={raiseId} raiseRecordId={singleRefund.raiseRecordId} onCancel={() => raiseRefund({visable:false, raiseRecordId:''})} onSuccess={(e) => raiseRefund(e)}></Refund>
       <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/services/apis.js

@@ -1306,6 +1306,11 @@ export default {
     method: 'PUT',
     action: 'admin.taRaise.put',
   },
+  checkBeforeInvalidRecord:{
+    url: `${prefix}/raise/checkBeforeInvalidRecord`,
+    method: 'POST',
+    action: 'admin.taRaise.post',
+  },
   batchDeleteRaiseRecord: {
     url: `${prefix}/batchDeleteRaiseRecord`,
     method: 'PUT',