新需求

src/pages/activity/ActivityList.jsx

@@ -188,7 +188,9 @@ const header = props => {
 
         <EditIcon type={row.home === 1 ? 'cancel' : 'top'} text={row.home === 1 ? '取消推首页' : '推荐首页'} onClick={homeDynamic(row)} />,
 
-        <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />,
+        <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
+          <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
+        </AuthButton>,
 
         (row.activityStatus === 0 || row.activityStatus === 1) ?
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>

src/pages/activity/drainage/DrainageList.jsx

@@ -237,8 +237,9 @@ const header = (props) => {
           <EditIcon text="数据" type="data" onClick={toEditList(datas.drainageId)} />
         </AuthButton>,
 
-
-        <EditIcon type="record" text="数据记录" onClick={toDataReacord(datas)} />,
+        <AuthButton name="admin.drainageActivity.dataRecord" noRight={null}>
+          <EditIcon type="record" text="数据记录" onClick={toDataReacord(datas)} />
+        </AuthButton>,
 
         <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
           <EditIcon text="下载二维码" type="download" onClick={newQrcode.bind(this, datas)} />

src/pages/activity/groupActivity/list.jsx

@@ -166,7 +166,9 @@ const header = props => {
             <EditIcon type={row.sort ? 'cancel' : 'top'} text={row.sort ? '取消推首页' : '推荐首页'} onClick={recommendGroupActivity(row)} />
           </AuthButton>,
 
-          <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />,
+          <AuthButton name="admin.groupActivity.dataRecord" noRight={null}>
+            <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.groupActivityId)} />
+          </AuthButton>,
 
           (row.activityStatus === 0 || row.activityStatus === 1) ?
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>

src/pages/activity/helpActivity/list.jsx

@@ -152,7 +152,9 @@ const header = props => {
           <EditIcon type={row.isMain ? 'cancel' : 'top'} text={row.isMain ? '取消推首页' : '推荐首页'} onClick={topDynamic(row, 1)} />
         </AuthButton>,
 
-        <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />,
+        <AuthButton name="admin.helpActivity.dataRecord" noRight={null}>
+          <EditIcon type="record" text="数据记录" onClick={() => toDataReacord(row.helpActivityId)} />
+        </AuthButton>,
 
         (row.activityStatus === 1 || row.activityStatus === 0) ?
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>

src/pages/activity/liveActivity/list/index.jsx

@@ -189,8 +189,10 @@ const header = props => {
       title: '操作',
       align: 'center',
       width: 240,
-      render: withActions((text, record) => [     
-        <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />,
+      render: withActions((text, record) => [    
+        <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
+          <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
+        </AuthButton>,
  
         <AuthButton name="admin.live.detail.get" noRight={null}>
           <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />

src/pages/carouselFigure/advertisingList.jsx

@@ -71,13 +71,13 @@ const header = (props) => {
       render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
         contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '销售批次详情' : contentType === 'live' ? '直播活动详情' : '无'}</span>
     },
-    // {
-    //   title: '发布位置',
-    //   dataIndex: 'showPosition',
-    //   key: 'showPosition',
-    //   align: 'center',
-    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
-    // },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+    },
     {
       title: '发布时间',
       dataIndex: 'createDate',
@@ -242,14 +242,14 @@ const header = (props) => {
             </Select>,
           )}
         </Form.Item>
-        {/* <Form.Item>
+        <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
-              <Option value="mall">商城</Option>
               <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/editAdvertising.jsx

@@ -36,6 +36,7 @@ import LiveGroup from './LiveGroup';
   let cityId = ''
   let isHaveActive=false
   let isCanChoose=true
+  let isHavePosition = false
 
   const setExtraData = (data) => {
     if(data.isHaveActive!=undefined){
@@ -46,6 +47,12 @@ import LiveGroup from './LiveGroup';
       }
     }
 
+    if (data.showPosition == 'index'){
+      isHavePosition = true;
+    }else{
+      isHavePosition = false;
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
@@ -123,12 +130,30 @@ import LiveGroup from './LiveGroup';
           { required: true,message: '是否城市活动' },
         ],
       },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        value:isHaveActive,
+        dict: [{
+          label: '首页',
+          value: 'index',
+        },
+        {
+          label: '项目',
+          value: 'building',
+        }],
+        value: data.showPosition,
+        rules: [
+          { required: true, message: '请选择发布位置' },
+        ],
+      },
       {
         label: '所属项目',
         name: 'buildingId',
         render: <BuildSelect />,
         value: data.buildingId,
-        hidden: () => !isHaveActive,
+        hidden: () => !isHaveActive && isHavePosition,
         rules: [
           { required: true, message: '请选择所属项目' },
         ],
@@ -137,7 +162,7 @@ import LiveGroup from './LiveGroup';
         label: '展示城市',
         name: 'cityId',
         render: <CitySelect />,
-        hidden: () => isHaveActive,
+        hidden: () => !isHavePosition || isHaveActive,
         value: data.cityId,
         rules: [
           { required: true, message: '请选择展示城市' },
@@ -159,7 +184,7 @@ import LiveGroup from './LiveGroup';
         type: FieldTypes.Select,
         hidden: () => isHaveActive,
         dict: [{
-          label: 'h5',
+          label: 'H5活动详情',
           value: 'h5',
         },
         {
@@ -187,31 +212,31 @@ import LiveGroup from './LiveGroup';
         hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [{
-          label: '常规活动',
+          label: '报名活动详情',
           value: 'activity'
         },
         {
-          label: '项目',
+          label: '项目详情',
           value: 'project'
         },
         {
-          label: '资讯',
+          label: '资讯详情',
           value: 'news'
         },
         {
-          label: '拼团',
+          label: '拼团活动详情',
           value: 'group'
         },
         {
-          label: '助力',
+          label: '助力活动详情',
           value: 'help'
         },
         {
-          label: 'h5',
+          label: 'H5活动详情',
           value: 'h5',
         },
         {
-          label: '销售批次详情',
+          label: '在线选房详情',
           value: 'salesBatch',
         },
         {