xujing преди 5 години
родител
ревизия
99e3d6d094
променени са 3 файла, в които са добавени 15 реда и са изтрити 16 реда
  1. 1
    1
      src/pages/fundManagement/AccountDetail.jsx
  2. 12
    13
      src/pages/sample/h5/components/H5Sample.jsx
  3. 2
    2
      src/pages/sample/h5/edit.jsx

+ 1
- 1
src/pages/fundManagement/AccountDetail.jsx Целия файл

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

+ 12
- 13
src/pages/sample/h5/components/H5Sample.jsx Целия файл

20
 
20
 
21
     // 查询列表
21
     // 查询列表
22
     const getList = (params) => {
22
     const getList = (params) => {
23
-        request({ ...apis.contact.list, params: { ...params } }).then((data) => {
23
+        request({ ...apis.sample.h5Template, params: { ...params } }).then((data) => {
24
             console.log(data)
24
             console.log(data)
25
             setData(data)
25
             setData(data)
26
         })
26
         })
36
     }
36
     }
37
 
37
 
38
     const selectData = val => {
38
     const selectData = val => {
39
-        const list = selectedData.filter(x => x.contactId !== val.contactId).concat(val)
39
+        const list = selectedData.filter(x => x.h5TemplateId !== val.h5TemplateId).concat(val)
40
         setSelectedData(list)
40
         setSelectedData(list)
41
-        props.onSelected(list)
41
+        props.onChoosed(list)
42
         setVisible(false)
42
         setVisible(false)
43
     }
43
     }
44
 
44
 
64
     }
64
     }
65
 
65
 
66
     const removeSelected = (val) => {
66
     const removeSelected = (val) => {
67
-        const list = selectedData.filter(x => x.contactId !== val.contactId)
67
+        const list = selectedData.filter(x => x.h5TemplateId !== val.h5TemplateId)
68
         setSelectedData(list)
68
         setSelectedData(list)
69
-        props.onSelected(list)
69
+        props.onChoosed(list)
70
     }
70
     }
71
 
71
 
72
     const columns = [
72
     const columns = [
73
         {
73
         {
74
             title: '模板编号',
74
             title: '模板编号',
75
-            dataIndex: 'contactName',
76
-            key: 'drainageId',
75
+            dataIndex: 'h5TemplateId',
76
+            key: 'h5TemplateId',
77
             align: 'center',
77
             align: 'center',
78
             ellipsis: true,
78
             ellipsis: true,
79
             width: '20%',
79
             width: '20%',
80
         },
80
         },
81
         {
81
         {
82
             title: '模板名称',
82
             title: '模板名称',
83
-            dataIndex: 'sex',
84
-            key: 'drainageId',
83
+            dataIndex: 'name',
84
+            key: 'name',
85
             align: 'center',
85
             align: 'center',
86
             ellipsis: true,
86
             ellipsis: true,
87
             width: '60%',
87
             width: '60%',
88
-            render: text => <span>{text == 1 ? '男' : text == 2 ? '女' : ''}</span>,
89
         },
88
         },
90
         {
89
         {
91
             title: '操作',
90
             title: '操作',
107
                 <Col span={2}><div onClick={() => setVisible(true)}><a>{group.groupName}</a></div></Col>
106
                 <Col span={2}><div onClick={() => setVisible(true)}><a>{group.groupName}</a></div></Col>
108
                 <Col span={16}><div>
107
                 <Col span={16}><div>
109
                     {selectedData.map(x => {
108
                     {selectedData.map(x => {
110
-                        return <Tag size="large" key={x.contactId} closable onClose={() => removeSelected(x)}>{x.contactName}</Tag>
109
+                        return <Tag size="large" key={x.h5TemplateId} closable onClose={() => removeSelected(x)}>{x.name}</Tag>
111
                     })}
110
                     })}
112
                 </div></Col>
111
                 </div></Col>
113
             </Row>
112
             </Row>
122
 
121
 
123
                 <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{marginBottom:'16px'}}>
122
                 <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{marginBottom:'16px'}}>
124
                     <Form.Item>
123
                     <Form.Item>
125
-                        {getFieldDecorator('telephone')(
124
+                        {getFieldDecorator('h5TemplateId')(
126
                             <Input
125
                             <Input
127
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
126
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
128
                                 placeholder="模板编号"
127
                                 placeholder="模板编号"
130
                         )}
129
                         )}
131
                     </Form.Item>
130
                     </Form.Item>
132
                     <Form.Item>
131
                     <Form.Item>
133
-                        {getFieldDecorator('contactName')(
132
+                        {getFieldDecorator('name')(
134
                             <Input
133
                             <Input
135
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
134
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
136
                                 placeholder="模板名称"
135
                                 placeholder="模板名称"

+ 2
- 2
src/pages/sample/h5/edit.jsx Целия файл

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