张延森 4 anni fa
parent
commit
b915273192

+ 1
- 1
src/components/Prompt/index.jsx Vedi File

30
       onOk={handleOk}
30
       onOk={handleOk}
31
       onCancel={handleCancel}
31
       onCancel={handleCancel}
32
     >
32
     >
33
-      <Input value={value} onChange={handleValue} />
33
+      <Input value={value} onChange={handleValue} placeholder={props.placeholder} />
34
     </Modal>
34
     </Modal>
35
   )
35
   )
36
 }
36
 }

+ 1
- 1
src/pages/activity/detailActivity.jsx Vedi File

350
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
350
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
351
       <div>
351
       <div>
352
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
352
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
353
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
353
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
354
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
354
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
355
       </div>
355
       </div>
356
     </div>
356
     </div>

+ 5
- 5
src/pages/activity/editActivity.jsx Vedi File

177
             ],
177
             ],
178
           })(<ActivityType disabled={disable} />)}
178
           })(<ActivityType disabled={disable} />)}
179
         </Form.Item>
179
         </Form.Item>
180
-        <Form.Item label="活动封面图1" help="建议图片尺寸:750px*420px,比例16:9,格式:jpg,用于:首页推荐/活动列表">
180
+        <Form.Item label="活动封面图" help="建议图片尺寸:690px*388px,比例16:9,格式:jpg,用于:首页推荐/活动列表">
181
           {getFieldDecorator('listImgUrl', {
181
           {getFieldDecorator('listImgUrl', {
182
             rules: [
182
             rules: [
183
               {
183
               {
187
             ],
187
             ],
188
           })(<ImageUploader />)}
188
           })(<ImageUploader />)}
189
         </Form.Item>
189
         </Form.Item>
190
-        <Form.Item label="活动封面图2" help="建议图片尺寸:750*250,比例3:1,格式:jpg,用于:项目详情页">
190
+        {/* <Form.Item label="活动封面图2" help="建议图片尺寸:750*250,比例3:1,格式:jpg,用于:项目详情页">
191
           {getFieldDecorator('bannerListImg', {
191
           {getFieldDecorator('bannerListImg', {
192
             rules: [
192
             rules: [
193
               {
193
               {
196
               },
196
               },
197
             ],
197
             ],
198
           })(<ImageUploader />)}
198
           })(<ImageUploader />)}
199
-        </Form.Item>
200
-        <Form.Item label="活动详情主图" help="建议图片尺寸:750*600px,比例5:4,格式:jpg,用于:普通活动详情">
199
+        </Form.Item> */}
200
+        <Form.Item label="活动详情主图" help="建议图片尺寸:750*564px,比例4:3,格式:jpg,用于:普通活动详情">
201
           {getFieldDecorator('imgUrl', {
201
           {getFieldDecorator('imgUrl', {
202
             rules: [
202
             rules: [
203
               {
203
               {
475
       <div>
475
       <div>
476
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
476
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
477
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>南京云致</p> */}
477
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>南京云致</p> */}
478
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '精准获客平台'}</p>
478
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || ''}</p>
479
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
479
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
480
       </div>
480
       </div>
481
     </div>
481
     </div>

+ 1
- 1
src/pages/activity/groupActivity/detailActivity.jsx Vedi File

317
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
317
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
318
       <div>
318
       <div>
319
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
319
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
320
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
320
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
321
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
321
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
322
       </div>
322
       </div>
323
     </div>
323
     </div>

+ 1
- 1
src/pages/activity/groupActivity/editGroupActivity.jsx Vedi File

349
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
349
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
350
       <div>
350
       <div>
351
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
351
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
352
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '精准获客平台'}</p>
352
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || ''}</p>
353
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
353
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
354
       </div>
354
       </div>
355
     </div>
355
     </div>

+ 1
- 1
src/pages/activity/helpActivity/detailActivity.jsx Vedi File

317
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
317
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
318
       <div>
318
       <div>
319
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
319
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
320
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
320
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
321
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
321
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
322
       </div>
322
       </div>
323
     </div>
323
     </div>

+ 1
- 1
src/pages/activity/helpActivity/edithelpActivity.jsx Vedi File

477
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
477
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
478
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />南京云致
478
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt="" />南京云致
479
         </p> */}
479
         </p> */}
480
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '精准获客平台'}</p>
480
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || ''}</p>
481
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
481
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
482
       </div>
482
       </div>
483
     </div>
483
     </div>

+ 1
- 1
src/pages/activity/liveActivity/edit/components/share.jsx Vedi File

97
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
97
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
98
             {miniappName}
98
             {miniappName}
99
         </p>
99
         </p>
100
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : '精准获客平台'}</p>
100
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : ''}</p>
101
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
101
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
102
       </div>
102
       </div>
103
     </div>
103
     </div>

+ 1
- 1
src/pages/building/list/add/components/share.jsx Vedi File

75
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
75
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
76
           南京云致
76
           南京云致
77
         </p> */}
77
         </p> */}
78
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
78
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
79
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
79
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
80
       </div>
80
       </div>
81
     </div>
81
     </div>

+ 1
- 1
src/pages/carouselFigure/customImg/edit.jsx Vedi File

43
     'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
43
     'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
44
     'imgType':'index',
44
     'imgType':'index',
45
     'imgDesc':'小程序首页分享配图',
45
     'imgDesc':'小程序首页分享配图',
46
-    'imgDocument': currentUser.orgName+' 精准获客平台'
46
+    'imgDocument': currentUser.orgName+' '
47
   } : 
47
   } : 
48
   {
48
   {
49
     'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
49
     'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',

+ 1
- 1
src/pages/house/house/edit/components/share.jsx Vedi File

96
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
96
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
97
             {miniappName}
97
             {miniappName}
98
         </p>
98
         </p>
99
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : '精准获客平台'}</p>
99
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : ''}</p>
100
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
100
         <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
101
       </div>
101
       </div>
102
     </div>
102
     </div>

+ 2
- 2
src/pages/integralMall/editGoods.jsx Vedi File

44
       name: 'imgUrl',
44
       name: 'imgUrl',
45
       type: FieldTypes.ImageUploader,
45
       type: FieldTypes.ImageUploader,
46
       value: goodsData.imgUrl,
46
       value: goodsData.imgUrl,
47
-      help: '建议图片尺寸:320*320px,比例1:1,格式:jpg,用于商品封面图',
47
+      help: '建议图片尺寸:335*335px,比例1:1,格式:jpg,用于商品封面图',
48
       rules: [
48
       rules: [
49
         {required: true, message: '请选择商品封面图'},
49
         {required: true, message: '请选择商品封面图'},
50
       ]
50
       ]
54
       name: 'detailImgUrl',
54
       name: 'detailImgUrl',
55
       type: FieldTypes.ImageUploader,
55
       type: FieldTypes.ImageUploader,
56
       value: goodsData.detailImgUrl,
56
       value: goodsData.detailImgUrl,
57
-      help: '建议图片尺寸:750*750px,比例1:1,格式:jpg,用于商品主图',
57
+      help: '建议图片尺寸:750*375px,比例2:1,格式:jpg,用于商品主图',
58
       rules: [
58
       rules: [
59
         {required: true, message: '请选择商品主图'},
59
         {required: true, message: '请选择商品主图'},
60
       ]
60
       ]

+ 26
- 26
src/pages/news/list/editNewsList.jsx Vedi File

67
       name: 'newsImg',
67
       name: 'newsImg',
68
       type: FieldTypes.ImageUploader,
68
       type: FieldTypes.ImageUploader,
69
       value: dynamicData.newsImg,
69
       value: dynamicData.newsImg,
70
-      help: '建议图片尺寸:320*240px,比例5:4,格式:jpg,用于资讯列表',
70
+      help: '建议图片尺寸:220*176px,比例5:4,格式:jpg,用于资讯列表',
71
       rules: [
71
       rules: [
72
         {required: true, message: '请选择资讯列表'},
72
         {required: true, message: '请选择资讯列表'},
73
       ]
73
       ]
90
         {required: true, message: '请选择资讯类型'},
90
         {required: true, message: '请选择资讯类型'},
91
       ]
91
       ]
92
     },
92
     },
93
+    // {
94
+    //   label: '资讯详情',
95
+    //   name: 'newsDetailType',
96
+    //   render: <Radio.Group> 
97
+    //           <Radio value={1}>自定义</Radio>
98
+    //           <Radio value={0}>公众号链接</Radio>
99
+    //           </Radio.Group>,
100
+    //   value: dynamicData.newsDetailType - 0,
101
+    //   rules: [
102
+    //     {required: true, message: '请选择资讯类型'},
103
+    //   ]
104
+    // },
93
     {
105
     {
94
       label: '资讯详情',
106
       label: '资讯详情',
95
-      name: 'newsDetailType',
96
-      render: <Radio.Group> 
97
-              <Radio value={1}>自定义</Radio>
98
-              <Radio value={0}>公众号链接</Radio>
99
-              </Radio.Group>,
100
-      value: dynamicData.newsDetailType - 0,
101
-      rules: [
102
-        {required: true, message: '请选择资讯类型'},
103
-      ]
104
-    },
105
-    {
106
-      label: '详情内容',
107
       name: 'newsDetail',
107
       name: 'newsDetail',
108
       render: <Wangedit />,
108
       render: <Wangedit />,
109
-      hidden: () => !detailVisible,
109
+      // hidden: () => !detailVisible,
110
       value: dynamicData.newsDetail,
110
       value: dynamicData.newsDetail,
111
       rules: [
111
       rules: [
112
         {required: true, message: '请输入详情内容'},
112
         {required: true, message: '请输入详情内容'},
113
       ]
113
       ]
114
     },
114
     },
115
-    {
116
-      label: '公众号链接',
117
-      name: 'newsDetail',
118
-      type: FieldTypes.Text,
119
-      hidden: () => !urlVisible,
120
-      value: dynamicData.newsDetail,
121
-      help: "只能填写同一主体公众号的文章链接",
122
-      rules: [
123
-        {required: true, message: '请输入公众号链接'},
124
-      ]
125
-    },
115
+    // {
116
+    //   label: '公众号链接',
117
+    //   name: 'newsDetail',
118
+    //   type: FieldTypes.Text,
119
+    //   hidden: () => !urlVisible,
120
+    //   value: dynamicData.newsDetail,
121
+    //   help: "只能填写同一主体公众号的文章链接",
122
+    //   rules: [
123
+    //     {required: true, message: '请输入公众号链接'},
124
+    //   ]
125
+    // },
126
   ]
126
   ]
127
 
127
 
128
   const handleSubmit = val => { 
128
   const handleSubmit = val => { 
349
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
349
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
350
         <div>
350
         <div>
351
           {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
351
           {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
352
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
352
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
353
           <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
353
           <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
354
         </div>
354
         </div>
355
       </div>
355
       </div>

+ 21
- 10
src/pages/property/ticket/Detail.jsx Vedi File

1
 import React, { useEffect, useState } from 'react'
1
 import React, { useEffect, useState } from 'react'
2
-import { PageHeader, Descriptions, List, Steps, Row, Col, Rate  } from 'antd'
2
+import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic } from 'antd'
3
 import { fetch, fetchList, apis } from '@/utils/request'
3
 import { fetch, fetchList, apis } from '@/utils/request'
4
+import Prompt from '@/components/Prompt'
4
 
5
 
5
 const TicketTypeDict = {
6
 const TicketTypeDict = {
6
   '0': '投诉',
7
   '0': '投诉',
28
 
29
 
29
 export default props => {
30
 export default props => {
30
   const [loading, setLoading] = useState(false)
31
   const [loading, setLoading] = useState(false)
32
+  const [showPrompt, setShowPrompt] = useState(false)
31
   const [ticketData, setTicketData] = useState({})
33
   const [ticketData, setTicketData] = useState({})
32
   const [approvalProcessList, setApprovalProcessList] = useState([])
34
   const [approvalProcessList, setApprovalProcessList] = useState([])
33
 
35
 
54
         backIcon={false}
56
         backIcon={false}
55
         style={{ borderBottom: '1px solid rgb(235, 237, 240)' }}
57
         style={{ borderBottom: '1px solid rgb(235, 237, 240)' }}
56
       >
58
       >
57
-        <Descriptions column={3}>
58
-          <Descriptions.Item label="工单号">{ticketData.id}</Descriptions.Item>
59
-          <Descriptions.Item label="工单类型">{ticketType}</Descriptions.Item>
60
-          <Descriptions.Item label="发起时间">{ticketData.createDate}</Descriptions.Item>
61
-          <Descriptions.Item label="发起人">{ticketData.createUserNmae}</Descriptions.Item>
62
-          <Descriptions.Item label="联系方式">{ticketData.loginName}</Descriptions.Item>
63
-          <Descriptions.Item label="负责人">{ticketData.tpUserNmae || '暂无'}</Descriptions.Item>
64
-          <Descriptions.Item label="工单内容">{ticketData.ticketContent}</Descriptions.Item>
65
-        </Descriptions>
59
+        <div style={{display: 'flex'}}>
60
+          <div>
61
+            <Descriptions column={3}>
62
+              <Descriptions.Item label="工单号">{ticketData.id}</Descriptions.Item>
63
+              <Descriptions.Item label="工单类型">{ticketType}</Descriptions.Item>
64
+              <Descriptions.Item label="发起时间">{ticketData.createDate}</Descriptions.Item>
65
+              <Descriptions.Item label="发起人">{ticketData.createUserNmae}</Descriptions.Item>
66
+              <Descriptions.Item label="联系方式">{ticketData.loginName}</Descriptions.Item>
67
+              <Descriptions.Item label="负责人">{ticketData.tpUserNmae || '暂无'}</Descriptions.Item>
68
+              <Descriptions.Item label="工单内容">{ticketData.ticketContent}</Descriptions.Item>
69
+            </Descriptions>
70
+          </div>
71
+          <div style={{minWidth: '150px'}}>
72
+            <Statistic title={<b>费用</b>} prefix="¥" value={125.60} precision={2} />
73
+            <Button onClick={() => setShowPrompt(true)}>设置费用</Button>
74
+            <Prompt visible={showPrompt} onCancel={() => setShowPrompt(false)} placeholder="请填写金额比如: 100.00"></Prompt>
75
+          </div>
76
+        </div>
66
         {
77
         {
67
           ticketData.contentImageUrl && ticketData.contentImageUrl.length && (
78
           ticketData.contentImageUrl && ticketData.contentImageUrl.length && (
68
             <List dataSource={ticketData.contentImageUrl} grid={imgGrid} renderItem={it => (
79
             <List dataSource={ticketData.contentImageUrl} grid={imgGrid} renderItem={it => (