feats

src/pages/carouselFigure/advertisingList.jsx

@@ -225,7 +225,7 @@ const header = (props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('cityId')(
             <SelectCity />,
           )}
@@ -234,30 +234,32 @@ const header = (props) => {
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
-              <Option value="project">项目</Option>
+              <Option value="notice">公告</Option>
+              <Option value="tpNews">服务</Option>
+              {/* <Option value="project">项目</Option> */}
               <Option value="news">资讯</Option>
-              <Option value="activity">报名活动</Option>
-              <Option value="help">助力活动</Option>
+              <Option value="activity">活动</Option>
+              {/* <Option value="help">助力活动</Option>
               <Option value="group">拼团活动</Option>
               <Option value="h5">H5活动</Option>
               <Option value="live">直播活动</Option>
-              <Option value="salesBatch">在线选房</Option>
+              <Option value="salesBatch">在线选房</Option> */}
               <Option value="nothing">无</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
               <Option value="index">首页</Option>
               <Option value="building">项目</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">

src/pages/carouselFigure/carouselFigureList.jsx

@@ -15,6 +15,19 @@ import styles from '../style/GoodsList.less';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
+const ContentTypeDict = {
+  'notice': '公告',
+  'tpNews': '服务',
+  'activity': '活动',
+  'news': '资讯',
+}
+
+const PositionDict = {
+  'index': '首页',
+  'mall': '商城',
+  'property': '物业'
+}
+
 const header = (props) => {
   const [data, setData] = useState({})
   //   const [page, changePage] = useState({})
@@ -48,7 +61,7 @@ const header = (props) => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} /></Navigate>,
+      render: (x, row) => <Navigate onClick={toEditCarouse(row.contentId)} ><img src={row.image} style={{width: '128px', height: '64px'}} /></Navigate>,
     },
     // {
     //   title: '发布城市',
@@ -68,15 +81,14 @@ const header = (props) => {
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+      render: t => ContentTypeDict[t] || '无'
     },
     {
       title: '发布位置',
       dataIndex: 'showPosition',
       key: 'showPosition',
       align: 'center',
-      render: (showPosition) => <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+      render: t => PositionDict[t] || ''
     },
     {
       title: '发布时间',
@@ -231,12 +243,14 @@ const header = (props) => {
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="notice">公告</Option>
+              <Option value="tpNews">服务</Option>
               <Option value="activity">活动</Option>
-              <Option value="project">项目</Option>
+              {/* <Option value="project">项目</Option> */}
               <Option value="news">资讯</Option>
-              <Option value="help">助力</Option>
+              {/* <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
-              <Option value="h5">H5</Option>
+              <Option value="h5">H5</Option> */}
               <Option value="nothing">无</Option>
               {/* <Option value="other">其他</Option> */}
             </Select>,
@@ -245,8 +259,9 @@ const header = (props) => {
         <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
-              <Option value="mall">积分商城</Option>
               <Option value="index">首页</Option>
+              <Option value="mall">积分商城</Option>
+              <Option value="property">物业</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/carouselFigure/editAdvertising.jsx

@@ -283,6 +283,10 @@ const createEditor = () => {
             label: '资讯',
             value: 'news'
           },
+          {
+            label: '无',
+            value: 'nothing'
+          },
           // {
           //   label: '拼团活动详情',
           //   value: 'group'

src/pages/carouselFigure/editCarousel.jsx

@@ -18,6 +18,8 @@ import SelectNews from './SelectNews';
 import SelectActivity from './SelectActivity';
 import SelectH5 from './SelectH5';
 import SelectMall from './SelectMall';
+import SelectNotice from './SelectNotice';
+import SelectTpNews from './SelectTpNews';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -43,6 +45,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let isHaveActive=false
   let isCanChoose=true
   let mallVisible = false
+  let noticeVisible = false
+  let tpNewsVisible = false
 
   const setExtraData = (data) => {
     console.log(data, 'data');
@@ -63,6 +67,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
     mallVisible = data.contentType === 'mall';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
 
     cityId=data.cityId
     buildingId = data.buildingId
@@ -92,6 +98,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     locationTypeNews = data.showPosition === 'news';
     h5Visible = data.contentType === 'h5';
     mallVisible = data.contentType === 'mall';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
     console.log(mallVisible, 'locationType');
   }
 
@@ -176,8 +184,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             value: 'mall',
           },
           {
-            label: '资讯',
-            value: 'news',
+            label: '物业',
+            value: 'property',
           }],
           value: data.showPosition,
           rules: [
@@ -212,99 +220,112 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         //     { required: true, message: '请选择类型' },
         //   ],
         // },
-        {
-          label: '标题',
-          name: 'title',
-          type: FieldTypes.Text,
-          value: data.title,
-          hidden: true,
-          rules: [
-            { required: true, message: '请输入标题' },
-          ],
-        },
-        {
-          label: '类型',
-          name: 'contentType',
-          type: FieldTypes.Select,
-          hidden: () => !locationTypeIndex,
-          dict: [{
-            label: '常规活动',
-            value: 'activity',
-          },
-          // {
-          //   label: '项目',
-          //   value: 'project',
-          // },
-          {
-            label: '资讯',
-            value: 'news',
-          },
-          {
-            label: '积分商城',
-            value: 'mall',
-          },
-          // {
-          //   label: '其他',
-          //   value: 'other',
-          // },
-          // {
-          //   label: '拼团',
-          //   value: 'group',
-          // },
-          // {
-          //   label: '助力',
-          //   value: 'help',
-          // },
-          // {
-          //   label: 'h5',
-          //   value: 'h5',
-          // },
-          // {
-          //   label: '销售批次详情',
-          //   value: 'salesBatch',
-          // },
-          // {
-          //   label: '直播活动详情',
-          //   value: 'live',
-          // }
-        ],
-          value: data.contentType,
-          rules: [
-            { required: true, message: '请选择类型' },
-          ],
-        },
-        {
-          label: '类型',
-          name: 'contentType',
-          type: FieldTypes.Select,
-          hidden: () => !locationType,
-          dict: [
-          {
-            label: '积分商城',
-            value: 'mall',
-          },
-        ],
-          value: data.contentType,
-          rules: [
-            { required: true, message: '请选择类型' },
-          ],
-        },
+        // {
+        //   label: '标题',
+        //   name: 'title',
+        //   type: FieldTypes.Text,
+        //   value: data.title,
+        //   hidden: true,
+        //   rules: [
+        //     { required: true, message: '请输入标题' },
+        //   ],
+        // },
         {
           label: '类型',
           name: 'contentType',
           type: FieldTypes.Select,
-          hidden: () => !locationTypeNews,
+          // hidden: () => !locationTypeIndex,
           dict: [
             {
-              label: '资讯',
-              value: 'news',
+              label: '公告',
+              value: 'notice',
+            },
+            {
+              label: '服务',
+              value: 'tpNews',
             },
-        ],
+            {
+              label: '活动',
+              value: 'activity',
+            },
+            // {
+            //   label: '项目',
+            //   value: 'project',
+            // },
+            // {
+            //   label: '资讯',
+            //   value: 'news',
+            // },
+            {
+              label: '商城',
+              value: 'mall',
+            },
+            {
+              label: '无',
+              value: 'nothing',
+            },
+            // {
+            //   label: '其他',
+            //   value: 'other',
+            // },
+            // {
+            //   label: '拼团',
+            //   value: 'group',
+            // },
+            // {
+            //   label: '助力',
+            //   value: 'help',
+            // },
+            // {
+            //   label: 'h5',
+            //   value: 'h5',
+            // },
+            // {
+            //   label: '销售批次详情',
+            //   value: 'salesBatch',
+            // },
+            // {
+            //   label: '直播活动详情',
+            //   value: 'live',
+            // }
+          ],
           value: data.contentType,
           rules: [
             { required: true, message: '请选择类型' },
           ],
         },
+        // {
+        //   label: '类型',
+        //   name: 'contentType',
+        //   type: FieldTypes.Select,
+        //   hidden: () => !locationType,
+        //   dict: [
+        //   {
+        //     label: '积分商城',
+        //     value: 'mall',
+        //   },
+        // ],
+        //   value: data.contentType,
+        //   rules: [
+        //     { required: true, message: '请选择类型' },
+        //   ],
+        // },
+        // {
+        //   label: '类型',
+        //   name: 'contentType',
+        //   type: FieldTypes.Select,
+        //   hidden: () => !locationTypeNews,
+        //   dict: [
+        //     {
+        //       label: '资讯',
+        //       value: 'news',
+        //     },
+        // ],
+        //   value: data.contentType,
+        //   rules: [
+        //     { required: true, message: '请选择类型' },
+        //   ],
+        // },
         {
           label: '发布活动',
           name: 'targetId',
@@ -326,26 +347,46 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           ],
         },
         {
-          label: '发布资讯',
+          label: '发布公告',
           name: 'targetId',
-          render: <SelectNews buildingId={() => buildingId} />,
-          hidden: () => !newsVisible,
+          render: <SelectNotice buildingId={() => buildingId} />,
+          hidden: () => !noticeVisible,
           value: data.targetId,
           rules: [
-            { required: true, message: '请选择发布资讯' },
+            { required: true, message: '请选择发布公告' },
           ],
         },
         {
-          label: '发布内容',
-          name: 'content',
-          render: <Wangedit />,
-          value: data.content,
-          hidden: () => !contentVisible,
+          label: '发布服务',
+          name: 'targetId',
+          render: <SelectTpNews buildingId={() => buildingId} />,
+          hidden: () => !tpNewsVisible,
+          value: data.targetId,
           rules: [
-            { required: true, message: '请输入发布内容' },
+            { required: true, message: '请选择发布服务' },
           ],
         },
         // {
+        //   label: '发布资讯',
+        //   name: 'targetId',
+        //   render: <SelectNews buildingId={() => buildingId} />,
+        //   hidden: () => !newsVisible,
+        //   value: data.targetId,
+        //   rules: [
+        //     { required: true, message: '请选择发布资讯' },
+        //   ],
+        // },
+        // {
+        //   label: '发布内容',
+        //   name: 'content',
+        //   render: <Wangedit />,
+        //   value: data.content,
+        //   hidden: () => !contentVisible,
+        //   rules: [
+        //     { required: true, message: '请输入发布内容' },
+        //   ],
+        // },
+        // {
         //   label: '发布助力',
         //   name: 'targetId',
         //   render: <SelectHelp buildingId={() => buildingId} />,
@@ -409,16 +450,16 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       ]
 
       const handleSubmit = val => {
-        console.log(val,"232323")
+        // console.log(val,"232323")
         val.showType = 'banner'
-        if(!isHaveActive&&val.targetId) {
-          if(!val.contentType){
-            val.contentType='h5'
-          }
-        }
-        if(!isHaveActive&&!val.targetId){
-          val.contentType=''
-        }
+        // if(!isHaveActive&&val.targetId) {
+        //   if(!val.contentType){
+        //     val.contentType='h5'
+        //   }
+        // }
+        // if(!isHaveActive&&!val.targetId){
+        //   val.contentType=''
+        // }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()

src/pages/carouselFigure/propaganda.jsx

@@ -16,6 +16,8 @@ import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SelectH5 from './SelectH5';
 import SalesBatchGroup from './SalesBatchGroup';
+import SelectNotice from './SelectNotice';
+import SelectTpNews from './SelectTpNews';
 import LiveGroup from './LiveGroup';
 /**
  *
@@ -32,6 +34,8 @@ import LiveGroup from './LiveGroup';
   let salesBatchVisible = false
   let liveVisible = false
   let h5Visible = false
+  let noticeVisible = false
+  let tpNewsVisible = false
   let buildingId = ''
   let cityId = ''
   let isHaveActive=false
@@ -54,17 +58,19 @@ import LiveGroup from './LiveGroup';
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
     cityId=data.cityId
     buildingId = data.buildingId
   }
 
   const setExtraData1 = (data) => {
-    console.log(data.buildingId,"data.buildingIddata.buildingId3")
-    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
-       isHaveActive=false
-    }else{
-       isHaveActive=true
-    }
+    // console.log(data.buildingId,"data.buildingIddata.buildingId3")
+    // if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
+    //    isHaveActive=false
+    // }else{
+    //    isHaveActive=true
+    // }
 
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
@@ -74,6 +80,8 @@ import LiveGroup from './LiveGroup';
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
     buildingId = data.buildingId
   }
 
@@ -112,111 +120,125 @@ import LiveGroup from './LiveGroup';
     }
 
     const fields = [
-      {
-        label: '是否关联项目',
-        name: 'isHaveActive',
-        type: FieldTypes.Switch,
-        value:isHaveActive,
-        hidden: () => !isCanChoose,
-        rules: [
-          { required: true,message: '是否城市活动' },
-        ],
-      },
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: data.buildingId,
-        hidden: () => !isHaveActive,
-        rules: [
-          { required: true, message: '请选择所属项目' },
-        ],
-      },
-      {
-        label: '所属城市',
-        name: 'cityId',
-        render: <CitySelect />,
-        hidden: () => isHaveActive,
-        value: data.cityId,
-        rules: [
-          { required: true, message: '请选择展示城市' },
-        ],
-      },
+      // {
+      //   label: '是否关联项目',
+      //   name: 'isHaveActive',
+      //   type: FieldTypes.Switch,
+      //   value:isHaveActive,
+      //   hidden: () => !isCanChoose,
+      //   rules: [
+      //     { required: true,message: '是否城市活动' },
+      //   ],
+      // },
+      // {
+      //   label: '所属项目',
+      //   name: 'buildingId',
+      //   render: <BuildSelect />,
+      //   value: data.buildingId,
+      //   hidden: () => !isHaveActive,
+      //   rules: [
+      //     { required: true, message: '请选择所属项目' },
+      //   ],
+      // },
+      // {
+      //   label: '所属城市',
+      //   name: 'cityId',
+      //   render: <CitySelect />,
+      //   hidden: () => isHaveActive,
+      //   value: data.cityId,
+      //   rules: [
+      //     { required: true, message: '请选择展示城市' },
+      //   ],
+      // },
       {
         label: '主图',
         name: 'image',
         type: FieldTypes.ImageUploader,
         value: data.image,
-        help: '建议图片尺寸：750*188px，比例4:1,格式：jpg，用于：首页宣传位',
+        help: '建议图片尺寸：690*230px，比例3:1,格式：jpg，用于：首页宣传位',
         rules: [
           { required: true, message: '请上传图片' },
         ],
       },
+      // {
+      //   label: '类型',
+      //   name: 'contentType',
+      //   type: FieldTypes.Select,
+      //   hidden: () => isHaveActive,
+      //   dict: [{
+      //     label: 'h5',
+      //     value: 'h5',
+      //   },
+      //   {
+      //     label: '直播活动详情',
+      //     value: 'live',
+      //   }],
+      //   value: data.contentType,
+      //   rules: [
+      //     { required: true, message: '请选择类型' },
+      //   ],
+      // },
+      // {
+      //   label: '标题',
+      //   name: 'title',
+      //   type: FieldTypes.Text,
+      //   hidden: true,
+      //   value: data.title,
+      //   rules: [
+      //     { required: true, message: '请输入标题' },
+      //   ],
+      // },
       {
         label: '类型',
         name: 'contentType',
+        // hidden: () => !isHaveActive,
         type: FieldTypes.Select,
-        hidden: () => isHaveActive,
-        dict: [{
-          label: 'h5',
-          value: 'h5',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        }],
-        value: data.contentType,
-        rules: [
-          { required: true, message: '请选择类型' },
-        ],
-      },
-      {
-        label: '标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        hidden: true,
-        value: data.title,
-        rules: [
-          { required: true, message: '请输入标题' },
+        dict: [
+          {
+            label: '公告',
+            value: 'notice'
+          },
+          {
+            label: '服务',
+            value: 'tpNews'
+          },
+          {
+            label: '活动',
+            value: 'activity'
+          },
+          // {
+          //   label: '项目',
+          //   value: 'project'
+          // },
+          {
+            label: '资讯',
+            value: 'news'
+          },
+          {
+            label: '无',
+            value: 'nothing'
+          },
+          // {
+          //   label: '拼团',
+          //   value: 'group'
+          // },
+          // {
+          //   label: '助力',
+          //   value: 'help'
+          // },
+          // {
+          //   label: 'h5',
+          //   value: 'h5',
+          // },
+          // {
+          //   label: '销售批次详情',
+          //   value: 'salesBatch',
+          // },
+          // {
+          //   label: '直播活动详情',
+          //   value: 'live',
+          // }
         ],
-      },
-      {
-        label: '类型',
-        name: 'contentType',
-        hidden: () => !isHaveActive,
-        type: FieldTypes.Select,
-        dict: [{
-          label: '常规活动',
-          value: 'activity'
-        },
-        {
-          label: '项目',
-          value: 'project'
-        },
-        {
-          label: '资讯',
-          value: 'news'
-        },
-        {
-          label: '拼团',
-          value: 'group'
-        },
-        {
-          label: '助力',
-          value: 'help'
-        },
-        {
-          label: 'h5',
-          value: 'h5',
-        },
-        {
-          label: '销售批次详情',
-          value: 'salesBatch',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        }],
         value: data.contentType,
         rules: [
           { required: true, message: '请选择类型' },
@@ -243,65 +265,85 @@ import LiveGroup from './LiveGroup';
         ],
       },
       {
-        label: '发布内容',
-        name: 'content',
-        render: <Wangedit />,
-        value: data.content,
-        hidden: () => !contentVisible,
-        rules: [
-          { required: true, message: '请选择发布内容' },
-        ],
-      },
-      {
-        label: '发布助力',
-        name: 'targetId',
-        render: <SelectHelp buildingId={() => buildingId} />,
-        hidden: () => !helpVisible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布助力' },
-        ],
-      },
-      {
-        label: '是否发布H5',
-        name: 'targetId',
-        render: <SelectH5 buildingId={() => buildingId}/>,
-        hidden: () => !h5Visible,
-        value: data.targetId,
-        rules: [
-          { required: false, message: '请选择发布H5' },
-        ],
-      },
-      {
-        label: '发布拼团',
-        name: 'targetId',
-        render: <SelectGroup buildingId={() => buildingId} />,
-        hidden: () => !groupVisible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布拼团' },
-        ],
-      },
-      {
-        label: '发布销售批次',
+        label: '发布公告',
         name: 'targetId',
-        render: <SalesBatchGroup buildingId={() => buildingId} />,
-        hidden: () => !salesBatchVisible,
+        render: <SelectNotice buildingId={() => buildingId} />,
+        hidden: () => !noticeVisible,
         value: data.targetId,
         rules: [
-          { required: true, message: '请选择发布销售批次' },
+          { required: true, message: '请选择发布公告' },
         ],
       },
       {
-        label: '发布直播活动',
+        label: '发布服务',
         name: 'targetId',
-        render: <LiveGroup buildingId={() => buildingId} />,
-        hidden: () => !liveVisible,
+        render: <SelectTpNews buildingId={() => buildingId} />,
+        hidden: () => !tpNewsVisible,
         value: data.targetId,
         rules: [
-          { required: true, message: '请选择发布直播活动' },
+          { required: true, message: '请选择发布服务' },
         ],
       },
+      // {
+      //   label: '发布内容',
+      //   name: 'content',
+      //   render: <Wangedit />,
+      //   value: data.content,
+      //   hidden: () => !contentVisible,
+      //   rules: [
+      //     { required: true, message: '请选择发布内容' },
+      //   ],
+      // },
+      // {
+      //   label: '发布助力',
+      //   name: 'targetId',
+      //   render: <SelectHelp buildingId={() => buildingId} />,
+      //   hidden: () => !helpVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布助力' },
+      //   ],
+      // },
+      // {
+      //   label: '是否发布H5',
+      //   name: 'targetId',
+      //   render: <SelectH5 buildingId={() => buildingId}/>,
+      //   hidden: () => !h5Visible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: false, message: '请选择发布H5' },
+      //   ],
+      // },
+      // {
+      //   label: '发布拼团',
+      //   name: 'targetId',
+      //   render: <SelectGroup buildingId={() => buildingId} />,
+      //   hidden: () => !groupVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布拼团' },
+      //   ],
+      // },
+      // {
+      //   label: '发布销售批次',
+      //   name: 'targetId',
+      //   render: <SalesBatchGroup buildingId={() => buildingId} />,
+      //   hidden: () => !salesBatchVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布销售批次' },
+      //   ],
+      // },
+      // {
+      //   label: '发布直播活动',
+      //   name: 'targetId',
+      //   render: <LiveGroup buildingId={() => buildingId} />,
+      //   hidden: () => !liveVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布直播活动' },
+      //   ],
+      // },
       {
         label: '状态',
         name: 'status',

src/pages/carouselFigure/propagandaList.jsx

@@ -15,6 +15,13 @@ import styles from '../style/GoodsList.less';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
+const ContentTypeDict = {
+  'notice': '公告',
+  'tpNews': '服务',
+  'activity': '活动',
+  'news': '资讯'
+}
+
 const header = (props) => {
   const [data, setData] = useState({})
   //   const [page, changePage] = useState({})
@@ -50,26 +57,25 @@ const header = (props) => {
       align: 'center',
       render: (image,row) => <Navigate onClick={toEdit(row.contentId)} ><img src={image} className={styles.propaganda} /></Navigate>,
     },
-    {
-      title: '发布城市',
-      dataIndex: 'cityName',
-      key: 'cityName',
-      align: 'center',
-    },
-    {
-      title: '关联项目',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
-    },
+    // {
+    //   title: '发布城市',
+    //   dataIndex: 'cityName',
+    //   key: 'cityName',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '关联项目',
+    //   dataIndex: 'buildingName',
+    //   key: 'buildingName',
+    //   align: 'center',
+    //   render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    // },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
+      render: x => ContentTypeDict[x] || '无'
     },
     // {
     //   title: '发布位置',
@@ -219,7 +225,7 @@ const header = (props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('cityId')(
             <SelectCity />,
           )}
@@ -228,16 +234,18 @@ const header = (props) => {
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('contentType')(
             <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="notice">公告</Option>
+              <Option value="tpNews">服务</Option>
               <Option value="activity">活动</Option>
-              <Option value="project">项目</Option>
+              {/* <Option value="project">项目</Option> */}
               <Option value="news">资讯</Option>
-              <Option value="help">助力</Option>
+              {/* <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
-              <Option value="h5">H5</Option>
+              <Option value="h5">H5</Option> */}
               <Option value="nothing">无</Option>
             </Select>,
           )}

src/pages/property/ticket/Detail.jsx

@@ -1,10 +1,11 @@
 import React, { useEffect, useState } from 'react'
-import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic, Modal } from 'antd'
+import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic, Modal, Typography, notification } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
 import router from 'umi/router'
 import Prompt from '@/components/Prompt'
 import Title from './components/Title'
 import Dispatch from './components/Dispatch'
+import Price from './components/Price'
 
 const TicketTypeDict = {
   '0': '投诉',
@@ -31,6 +32,7 @@ const imgGrid = {
 const getTicketDetail = fetch(apis.ticket.ticketEdit)
 const addDispatch = fetch(apis.ticket.addRecord)
 const rejectTicket = fetch(apis.ticket.updateTicketStatus)
+const updateTicketPrice = fetch(apis.ticket.updateTicketPrice)
 
 export default props => {
   const [loading, setLoading] = useState(false)
@@ -67,6 +69,21 @@ export default props => {
     })
   }
 
+  const handleChangePrice = vals => {
+    if (!vals.priceExplain || vals.price === undefined) {
+      notification.warn({ message: '请正确填写说明及金额' })
+      return
+    }
+
+    const price = Math.floor(vals.price * 100)
+    updateTicketPrice({data: {id, price, priceExplain: vals.priceExplain}}).then(res => {
+      Modal.success({
+        content: '设置费用成功',
+        onOk: () => window.location.reload()
+      })
+    })
+  }
+
   useEffect(() => {
     getTicketDetail({data: {id}}).then(res => {
       const { recordList } = res || {}
@@ -97,11 +114,15 @@ export default props => {
           </div>
           <div style={{minWidth: '150px'}}>
             {
-              !ticketData.billInvoiceId || !ticketData.isPay ?
+              !ticketData.billInvoiceId ?
                 <Button onClick={() => setShowPrompt(true)}>设置费用</Button> :
-                <Statistic title={<b>费用</b>} prefix="￥" value={ticketData.price || 0} precision={2} />
+                <Statistic
+                  title={<Typography.Text ellipsis>{ticketData.priceExplain || '费用'}</Typography.Text>}
+                  prefix="￥"
+                  value={ticketData.price ? (ticketData.price / 100) : 0}
+                  precision={2}
+                />
             }
-            <Prompt visible={showPrompt} onCancel={() => setShowPrompt(false)} placeholder="请填写金额比如: 100.00"></Prompt>
           </div>
         </div>
         {
@@ -172,6 +193,9 @@ export default props => {
         </Steps>
       </div>
 
+      {/* 设置缴费金额 */}
+      <Price visible={showPrompt} onSubmit={handleChangePrice} onCancel={() => setShowPrompt(false)} />
+
       {/* 工单分配 */}
       <Dispatch visible={showDispatch} userList={ticketData.tpUsersList} onSubmit={handleDispatchTicket} onCancel={() => setShowDispatch(false)} />
       {/* 拒绝原因 */}

src/pages/property/ticket/components/Price.jsx

@@ -0,0 +1,35 @@
+import React, { useEffect, useState } from 'react'
+import { Form, Modal, Button, Input, InputNumber } from 'antd'
+
+export default Form.create()(props => {
+
+  const handleSubmit = e => {
+    e.preventDefault()
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        props.onSubmit(values)
+      }
+    })
+  }
+
+  return (
+    <Modal  footer={null} maskClosable={false} onCancel={props.onCancel} visible={props.visible}>
+      <Form onSubmit={handleSubmit}>
+        <Form.Item label="收费说明" required>
+          {
+            props.form.getFieldDecorator('priceExplain')(<Input placeholder="简要描述即可" />)
+          }
+        </Form.Item>
+        <Form.Item label="收费金额" required>
+          {
+            props.form.getFieldDecorator('price')(<InputNumber prefix="￥" placeholder="请填写金额比如: 100.00" min={0} style={{width: '100%'}} />)
+          }
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">确定</Button>
+          <Button onClick={props.onCancel} style={{ marginLeft: '48px' }}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})

src/services/ticket_api.js

@@ -35,6 +35,12 @@ export default prefix => {
       url: `${prefix}/updateTicket`,
       method: 'post',
       action: 'admin.ticket.update'
-    }
+    },
+
+    updateTicketPrice: {
+      url: `${prefix}/updateTicketPrice`,
+      method: 'post',
+      action: 'admin.ticket.updatePrice'
+    },
   }
 }