commit

src/pages/fundManagement/AccountDetail.jsx

@@ -79,7 +79,7 @@ function header(props) {
             label: '退款冻结金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: regFenToYuan(newsData.refundBlockedAmonut) || '0',
+            value: regFenToYuan(newsData.refundBlockedAmount) || '0',
             help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
         },
         {

src/pages/sample/h5/components/H5Sample.jsx

@@ -20,7 +20,7 @@ const SelectContact = props => {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.contact.list, params: { ...params } }).then((data) => {
+        request({ ...apis.sample.h5Template, params: { ...params } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -36,9 +36,9 @@ const SelectContact = props => {
     }
 
     const selectData = val => {
-        const list = selectedData.filter(x => x.contactId !== val.contactId).concat(val)
+        const list = selectedData.filter(x => x.h5TemplateId !== val.h5TemplateId).concat(val)
         setSelectedData(list)
-        props.onSelected(list)
+        props.onChoosed(list)
         setVisible(false)
     }
 
@@ -64,28 +64,27 @@ const SelectContact = props => {
     }
 
     const removeSelected = (val) => {
-        const list = selectedData.filter(x => x.contactId !== val.contactId)
+        const list = selectedData.filter(x => x.h5TemplateId !== val.h5TemplateId)
         setSelectedData(list)
-        props.onSelected(list)
+        props.onChoosed(list)
     }
 
     const columns = [
         {
             title: '模板编号',
-            dataIndex: 'contactName',
-            key: 'drainageId',
+            dataIndex: 'h5TemplateId',
+            key: 'h5TemplateId',
             align: 'center',
             ellipsis: true,
             width: '20%',
         },
         {
             title: '模板名称',
-            dataIndex: 'sex',
-            key: 'drainageId',
+            dataIndex: 'name',
+            key: 'name',
             align: 'center',
             ellipsis: true,
             width: '60%',
-            render: text => <span>{text == 1 ? '男' : text == 2 ? '女' : ''}</span>,
         },
         {
             title: '操作',
@@ -107,7 +106,7 @@ const SelectContact = props => {
                 <Col span={2}><div onClick={() => setVisible(true)}><a>{group.groupName}</a></div></Col>
                 <Col span={16}><div>
                     {selectedData.map(x => {
-                        return <Tag size="large" key={x.contactId} closable onClose={() => removeSelected(x)}>{x.contactName}</Tag>
+                        return <Tag size="large" key={x.h5TemplateId} closable onClose={() => removeSelected(x)}>{x.name}</Tag>
                     })}
                 </div></Col>
             </Row>
@@ -122,7 +121,7 @@ const SelectContact = props => {
 
                 <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{marginBottom:'16px'}}>
                     <Form.Item>
-                        {getFieldDecorator('telephone')(
+                        {getFieldDecorator('h5TemplateId')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="模板编号"
@@ -130,7 +129,7 @@ const SelectContact = props => {
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('contactName')(
+                        {getFieldDecorator('name')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="模板名称"

src/pages/sample/h5/edit.jsx

@@ -99,8 +99,8 @@ const header = props => {
             })(<Input placeholder="若样例暂未发布到小程序，可直接粘贴网页链接"/>)}
           </Form.Item>
           <Form.Item label="H5模板" >
-            {getFieldDecorator('taContactList',{
-              trigger: 'onSelected'
+            {getFieldDecorator('H5sample',{
+              trigger: 'onChoosed'
             })(<H5Sample />)}
           </Form.Item>
           <Form.Item label="样例体验二维码/小程序码" >