feats

src/components/Prompt/index.jsx

@@ -30,7 +30,7 @@ export default props => {
       onOk={handleOk}
       onCancel={handleCancel}
     >
-      <Input value={value} onChange={handleValue} />
+      <Input value={value} onChange={handleValue} placeholder={props.placeholder} />
     </Modal>
   )
 }

src/pages/activity/detailActivity.jsx

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

src/pages/activity/editActivity.jsx

@@ -177,7 +177,7 @@ const BasicForm = props => {
             ],
           })(<ActivityType disabled={disable} />)}
         </Form.Item>
-        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
+        <Form.Item label="活动封面图" help="建议图片尺寸：690px*388px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
           {getFieldDecorator('listImgUrl', {
             rules: [
               {
@@ -187,7 +187,7 @@ const BasicForm = props => {
             ],
           })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
+        {/* <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
             rules: [
               {
@@ -196,8 +196,8 @@ const BasicForm = props => {
               },
             ],
           })(<ImageUploader />)}
-        </Form.Item>
-        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
+        </Form.Item> */}
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*564px，比例4:3,格式：jpg，用于：普通活动详情">
           {getFieldDecorator('imgUrl', {
             rules: [
               {
@@ -475,7 +475,7 @@ const Share = props => {
       <div>
         {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
           <img src={logo} style={{ width: '22px', marginRight: '10px' }} alt=""/>南京云致</p> */}
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || '精准获客平台'}</p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue || ''}</p>
         <img style={{ width: '200px', height: '160px' }} src={imgValue || poster2} alt="" />
       </div>
     </div>

src/pages/activity/groupActivity/detailActivity.jsx

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

src/pages/activity/groupActivity/editGroupActivity.jsx

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

src/pages/activity/helpActivity/detailActivity.jsx

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

src/pages/activity/helpActivity/edithelpActivity.jsx

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

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

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

src/pages/building/list/add/components/share.jsx

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

src/pages/carouselFigure/customImg/edit.jsx

@@ -43,7 +43,7 @@ const header = props => {
     'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
     'imgType':'index',
     'imgDesc':'小程序首页分享配图',
-    'imgDocument': currentUser.orgName+' 精准获客平台'
+    'imgDocument': currentUser.orgName+' '
   } : 
   {
     'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',

src/pages/house/house/edit/components/share.jsx

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

src/pages/integralMall/editGoods.jsx

@@ -44,7 +44,7 @@ const header = props => {
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: goodsData.imgUrl,
-      help: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于商品封面图',
+      help: '建议图片尺寸：335*335px，比例1:1,格式：jpg，用于商品封面图',
       rules: [
         {required: true, message: '请选择商品封面图'},
       ]
@@ -54,7 +54,7 @@ const header = props => {
       name: 'detailImgUrl',
       type: FieldTypes.ImageUploader,
       value: goodsData.detailImgUrl,
-      help: '建议图片尺寸：750*750px，比例1:1,格式：jpg，用于商品主图',
+      help: '建议图片尺寸：750*375px，比例2:1,格式：jpg，用于商品主图',
       rules: [
         {required: true, message: '请选择商品主图'},
       ]

src/pages/news/list/editNewsList.jsx

@@ -67,7 +67,7 @@ const Basic = (props) => {
       name: 'newsImg',
       type: FieldTypes.ImageUploader,
       value: dynamicData.newsImg,
-      help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
+      help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于资讯列表',
       rules: [
         {required: true, message: '请选择资讯列表'},
       ]
@@ -90,39 +90,39 @@ const Basic = (props) => {
         {required: true, message: '请选择资讯类型'},
       ]
     },
+    // {
+    //   label: '资讯详情',
+    //   name: 'newsDetailType',
+    //   render: <Radio.Group> 
+    //           <Radio value={1}>自定义</Radio>
+    //           <Radio value={0}>公众号链接</Radio>
+    //           </Radio.Group>,
+    //   value: dynamicData.newsDetailType - 0,
+    //   rules: [
+    //     {required: true, message: '请选择资讯类型'},
+    //   ]
+    // },
     {
       label: '资讯详情',
-      name: 'newsDetailType',
-      render: <Radio.Group> 
-              <Radio value={1}>自定义</Radio>
-              <Radio value={0}>公众号链接</Radio>
-              </Radio.Group>,
-      value: dynamicData.newsDetailType - 0,
-      rules: [
-        {required: true, message: '请选择资讯类型'},
-      ]
-    },
-    {
-      label: '详情内容',
       name: 'newsDetail',
       render: <Wangedit />,
-      hidden: () => !detailVisible,
+      // hidden: () => !detailVisible,
       value: dynamicData.newsDetail,
       rules: [
         {required: true, message: '请输入详情内容'},
       ]
     },
-    {
-      label: '公众号链接',
-      name: 'newsDetail',
-      type: FieldTypes.Text,
-      hidden: () => !urlVisible,
-      value: dynamicData.newsDetail,
-      help: "只能填写同一主体公众号的文章链接",
-      rules: [
-        {required: true, message: '请输入公众号链接'},
-      ]
-    },
+    // {
+    //   label: '公众号链接',
+    //   name: 'newsDetail',
+    //   type: FieldTypes.Text,
+    //   hidden: () => !urlVisible,
+    //   value: dynamicData.newsDetail,
+    //   help: "只能填写同一主体公众号的文章链接",
+    //   rules: [
+    //     {required: true, message: '请输入公众号链接'},
+    //   ]
+    // },
   ]
 
   const handleSubmit = val => { 
@@ -349,7 +349,7 @@ const Basic = (props) => {
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
         <div>
           {/* <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />南京云致</p> */}
-          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '精准获客平台'}</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : ''}</p>
           <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
         </div>
       </div>

src/pages/property/ticket/Detail.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react'
-import { PageHeader, Descriptions, List, Steps, Row, Col, Rate  } from 'antd'
+import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
+import Prompt from '@/components/Prompt'
 
 const TicketTypeDict = {
   '0': '投诉',
@@ -28,6 +29,7 @@ const getTicketDetail = fetch(apis.ticket.ticketEdit)
 
 export default props => {
   const [loading, setLoading] = useState(false)
+  const [showPrompt, setShowPrompt] = useState(false)
   const [ticketData, setTicketData] = useState({})
   const [approvalProcessList, setApprovalProcessList] = useState([])
 
@@ -54,15 +56,24 @@ export default props => {
         backIcon={false}
         style={{ borderBottom: '1px solid rgb(235, 237, 240)' }}
       >
-        <Descriptions column={3}>
-          <Descriptions.Item label="工单号">{ticketData.id}</Descriptions.Item>
-          <Descriptions.Item label="工单类型">{ticketType}</Descriptions.Item>
-          <Descriptions.Item label="发起时间">{ticketData.createDate}</Descriptions.Item>
-          <Descriptions.Item label="发起人">{ticketData.createUserNmae}</Descriptions.Item>
-          <Descriptions.Item label="联系方式">{ticketData.loginName}</Descriptions.Item>
-          <Descriptions.Item label="负责人">{ticketData.tpUserNmae || '暂无'}</Descriptions.Item>
-          <Descriptions.Item label="工单内容">{ticketData.ticketContent}</Descriptions.Item>
-        </Descriptions>
+        <div style={{display: 'flex'}}>
+          <div>
+            <Descriptions column={3}>
+              <Descriptions.Item label="工单号">{ticketData.id}</Descriptions.Item>
+              <Descriptions.Item label="工单类型">{ticketType}</Descriptions.Item>
+              <Descriptions.Item label="发起时间">{ticketData.createDate}</Descriptions.Item>
+              <Descriptions.Item label="发起人">{ticketData.createUserNmae}</Descriptions.Item>
+              <Descriptions.Item label="联系方式">{ticketData.loginName}</Descriptions.Item>
+              <Descriptions.Item label="负责人">{ticketData.tpUserNmae || '暂无'}</Descriptions.Item>
+              <Descriptions.Item label="工单内容">{ticketData.ticketContent}</Descriptions.Item>
+            </Descriptions>
+          </div>
+          <div style={{minWidth: '150px'}}>
+            <Statistic title={<b>费用</b>} prefix="￥" value={125.60} precision={2} />
+            <Button onClick={() => setShowPrompt(true)}>设置费用</Button>
+            <Prompt visible={showPrompt} onCancel={() => setShowPrompt(false)} placeholder="请填写金额比如: 100.00"></Prompt>
+          </div>
+        </div>
         {
           ticketData.contentImageUrl && ticketData.contentImageUrl.length && (
             <List dataSource={ticketData.contentImageUrl} grid={imgGrid} renderItem={it => (