Merge branch 'dev' of http://git.ycjcjy.com/estateagents/pc-channel into dev

# Conflicts:
#	src/pages/fundManagement/RefundOrder.jsx

src/pages/fundManagement/AccountDetail.jsx

@@ -12,6 +12,7 @@ import RechargeOrder from './RechargeOrder';
 import ConsumeOrder from './ConsumeOrder';
 import RefundOrder from './RefundOrder';
 import Recharge from './components/Recharge'
+import { regFenToYuan } from '@/utils/money';
 
 function header(props) {
     const orgId = props.location.query.id || ''
@@ -57,35 +58,35 @@ function header(props) {
             label: '总充值金额',
             name: 'recharge',
             type: FieldTypes.Message,
-            value: newsData.totalRechargeAmount || '0',
+            value: regFenToYuan(newsData.totalRechargeAmount) || '0',
             help: '对账请在充值订单中查看充值状态为“已支付”的充值记录',
         },
         {
             label: '已消费金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: newsData.purchaseAmount || '0',
+            value: regFenToYuan(newsData.purchaseAmount) || '0',
             help: '对账请在充值订单中查看充值状态为“成功”的充值记录',
         },
         {
             label: '已退款金额',
             name: 'refund',
             type: FieldTypes.Message,
-            value: newsData.totalRefund || '0',
+            value: regFenToYuan(newsData.totalRefund) || '0',
             help: '对账请在充值订单中查看充值状态为“已退款”的退款记录',
         },
         {
             label: '退款冻结金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: newsData.refundBlockedAmonut || '0',
+            value: regFenToYuan(newsData.refundBlockedAmonut) || '0',
             help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
         },
         {
             label: '账户余额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: newsData.realBalance || '0',
+            value: regFenToYuan(newsData.realBalance) || '0',
             help: '对账户余额=总充值金额-已消费金额-已退款额-退款冻结额',
         },
     ]
@@ -110,7 +111,7 @@ function header(props) {
                             <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
                                 <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
                             </Button>
-                            <Button >返回</Button>
+                            <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>
                     </div>
                 }

src/pages/fundManagement/AccountManagement.jsx

@@ -11,6 +11,7 @@ import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Recharge from './components/Recharge'
 import Refund from './components/Refund'
+import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -75,24 +76,28 @@ function header(props) {
             dataIndex: 'totalRechargeAmount',
             key: 'totalRechargeAmount',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
             title: '已消费金额',
             dataIndex: 'purchaseAmount',
             key: 'purchaseAmount',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
             title: '已退款金额',
             dataIndex: 'totalRefund',
             key: 'totalRefund',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
             title: '余额',
             dataIndex: 'realBalance',
             key: 'realBalance',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
             title: '操作',
@@ -102,9 +107,9 @@ function header(props) {
             width: '120px',
             render: (x, row) => (
                 <>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge  onClick={() => getList({ pageNum: 1, pageSize: 10 })} orgId={row.orgId} accountId={row.accountId} /></span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge onClick={handleReset} orgId={row.orgId} accountId={row.accountId} /></span>
                     <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
-                        <Refund orgId={row.orgId} accountId={row.accountId} onClick={() => getList({ pageNum: 1, pageSize: 10 })}  realBalance={row.realBalance || '0'} />
+                        <Refund orgId={row.orgId} accountId={row.accountId} onClick={handleReset} realBalance={row.realBalance || '0'} />
                     </span>
                 </>
             ),

src/pages/fundManagement/ConsumeOrder.jsx

@@ -9,6 +9,7 @@ import styles from './style.less';
 import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -87,6 +88,7 @@ function header(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
 
         },
         {
@@ -146,7 +148,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.consumeOrderExport, params: { itemType: 'redPacket', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RechargeOrder.jsx

@@ -9,6 +9,7 @@ import styles from './style.less';
 import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -86,6 +87,7 @@ function header(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
 
         },
         {
@@ -139,7 +141,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.rechargeOrderExport, params: { itemType: 'recharge', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.rechargeOrderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RefundOrder.jsx

@@ -10,6 +10,7 @@ import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Swiper from './components/Swiper';
+import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -102,6 +103,7 @@ function header(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
             title: '退款创建时间',
@@ -122,7 +124,7 @@ function header(props) {
             dataIndex: 'auditResult',
             key: 'auditResult',
             align: 'center',
-            render: (x, row) => <>{row.tradingStatus == '2' && <span>{row.auditResult}</span>}</>
+            render: (x, row) => <>{row.tradingStatus == 'fail' && <span>{row.auditResult}</span>}</>
         },
         {
             title: '退款凭证',
@@ -242,7 +244,7 @@ function header(props) {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.refundOrderExport, params: { itemType: 'refund', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.refundOrderExport, params: { orderType: 'refund', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/components/Recharge.jsx

@@ -34,6 +34,7 @@ const SelectContact = props => {
     const handleOk = (e) => {
         props.form.validateFieldsAndScroll((err, values) => {
             console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
+
             if (!err) {
                 request({ ...apis.fund.recharge, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
                     message.info("操作成功")
@@ -47,6 +48,7 @@ const SelectContact = props => {
     }
 
     const { getFieldDecorator } = props.form;
+    const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
         <div>
             <span onClick={() => setVisible(true)}>{group.groupName}</span>
@@ -67,9 +69,15 @@ const SelectContact = props => {
 
                         <Form.Item label="充值金额" >
                             {getFieldDecorator('rechargeAmount', {
-                                rules: [{ required: true, message: '充值金额不能为空' },
-                                { max: 20 }],
-                            })(<Input type='number' placeholder="支持2位小数" />)}
+                                rules: [
+                                    { required: true, message: '充值金额不能为空' },
+                                    {
+                                        validator: (rule, value, callback) => {
+                                            callback(value < 0.01 || value > 99999.99 ? '金额最多5位整数 2位小数' : !regMoney.test(value) ? '金额最多两位小数' : undefined)
+                                        }
+                                    }
+                                ],
+                            })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
 
                         <Form.Item label="充值凭证" help="可上传银行转账截图等作为查账线索">

src/pages/fundManagement/components/Refund.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Modal, Button, Table, message, Input, Icon, Pagination } from 'antd';
+import { Form, Modal, Button, Table, message, Input, InputNumber, Icon, Pagination } from 'antd';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import router from 'umi/router';
 import Upload from '../../../components/uploadImage/Upload'
+import { regFenToYuan } from '@/utils/money';
 
 const { Column, ColumnGroup } = Table;
 
@@ -46,6 +47,8 @@ const SelectContact = props => {
     }
 
     const { getFieldDecorator } = props.form;
+    const balance = regFenToYuan(props.realBalance)
+    const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
         <div>
             <span onClick={() => setVisible(true)}>{group.groupName}</span>
@@ -64,13 +67,20 @@ const SelectContact = props => {
                     <p style={{ color: 'red' }}>请先进行线下实际退款操作后再执行线上退款存档</p>
                     <Form {...formItemLayout} >
 
-                        <Form.Item label="充值金额" >
+                        <Form.Item label="退款金额" >
                             {getFieldDecorator('refundAmount', {
                                 rules: [{ required: true, message: '退款金额不能为空' },
-                                { max: 20 }],
+                                {
+                                    validator: (rule, value, callback) => {
+
+                                        callback(!regMoney.test(value) ? '金额最多两位小数' : value > balance.toString() ? '退款金额不能大于余额' : value < 0.01 ? '金额不得小于0.01' : undefined)
+
+                                    }
+                                }
+                                ],
                             })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
-                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{props.realBalance}元</div>
+                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{balance}元</div>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
                                 rules: [{ required: false }],

src/pages/fundManagement/components/Swiper.jsx

@@ -1,42 +1,42 @@
 import React, { useEffect } from "react";
-import Swiper from 'swiper';
+// import Swiper from 'swiper';
 import styles from './style.less'
 import classNames from 'classnames';
 import closeImg from '../../../assets/close.png';
-import 'swiper/css/swiper.min.css';
-
+// import 'swiper/css/swiper.min.css';
+import { Carousel } from 'antd';
 
 const swiper = ({ list, onClose }) => {
 
     useEffect(() => {
-        if (list.length > 0) {
-            //swiper初始化
-            if (list.length > 1) {
-                this.swiper = new Swiper('.swiper-container', {
-                    slidesPerView: 1,
-                    loop: true,
-                    autoplay: {
-                        disableOnInteraction: false,
-                    },
-                    touchRatio: 1.5,
-                    pagination: {
-                        el: '.swiper-pagination',
-                        bulletElement: 'li',
-                        clickable: true,
-                        bulletActiveClass: 'antd-pro-pages-swiper-style-active',
-                    },
-                    observer: true,//修改swiper自己或子元素时，自动初始化swiper
-                    observeParents: true,//修改swiper的父元素时，自动初始化swiper
-                })
-            } else {
-                this.swiper = new Swiper('.swiper-container', {
-                    loop: false,
-                    observer: true,//修改swiper自己或子元素时，自动初始化swiper
-                    observeParents: true,//修改swiper的父元素时，自动初始化swiper
-                })
-            }
+        // if (list.length > 0) {
+        //     //swiper初始化
+        //     if (list.length > 1) {
+        //         this.swiper = new Swiper('.swiper-container', {
+        //             slidesPerView: 1,
+        //             loop: true,
+        //             autoplay: {
+        //                 disableOnInteraction: false,
+        //             },
+        //             touchRatio: 1.5,
+        //             pagination: {
+        //                 el: '.swiper-pagination',
+        //                 bulletElement: 'li',
+        //                 clickable: true,
+        //                 bulletActiveClass: 'antd-pro-pages-swiper-style-active',
+        //             },
+        //             observer: true,//修改swiper自己或子元素时，自动初始化swiper
+        //             observeParents: true,//修改swiper的父元素时，自动初始化swiper
+        //         })
+        //     } else {
+        //         this.swiper = new Swiper('.swiper-container', {
+        //             loop: false,
+        //             observer: true,//修改swiper自己或子元素时，自动初始化swiper
+        //             observeParents: true,//修改swiper的父元素时，自动初始化swiper
+        //         })
+        //     }
 
-        }
+        // }
     }, [])
 
     return (
@@ -44,7 +44,12 @@ const swiper = ({ list, onClose }) => {
             {list.length > 0 && <div className={styles.mask}>
                 <div className={styles.content}>
                     <img src={closeImg} alt="" className={styles.close} onClick={onClose} />
-                    <div className={classNames(['swiper-container', styles.carousel])}  >
+                    <Carousel autoplay>
+                        {list.map((item, index) =>
+                            <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item} alt="" />
+                        )}
+                    </Carousel>
+                    {/* <div className={classNames(['swiper-container', styles.carousel])}  >
                         <div className={classNames(['swiper-wrapper', styles.carousel])} >
                             {list.map((item, index) =>
                                 <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
@@ -53,7 +58,7 @@ const swiper = ({ list, onClose }) => {
                             )}
                         </div>
                         <div className={classNames(['swiper-pagination', styles.dots])}  ></div>
-                    </div>
+                    </div> */}
                 </div>
             </div>}
         </>

src/utils/money.js

@@ -0,0 +1,32 @@
+
+const 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;
+}
+export const 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
+}
+
+export const regYuanToFen = (yuan) => {
+
+    return yuan * 100
+}