feats

src/pages/carouselFigure/carouselFigureList.jsx

@@ -19,7 +19,9 @@ const ContentTypeDict = {
   'notice': '公告',
   'tpNews': '服务',
   'activity': '活动',
+  'mall': '积分商城',
   'news': '资讯',
+  'nothing': '无',
 }
 
 const PositionDict = {

src/pages/carouselFigure/editCarousel.jsx

@@ -252,12 +252,12 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             //   label: '项目',
             //   value: 'project',
             // },
-            // {
-            //   label: '资讯',
-            //   value: 'news',
-            // },
             {
-              label: '商城',
+              label: '资讯',
+              value: 'news',
+            },
+            {
+              label: '积分商城',
               value: 'mall',
             },
             {
@@ -366,16 +366,16 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             { required: true, message: '请选择发布服务' },
           ],
         },
-        // {
-        //   label: '发布资讯',
-        //   name: 'targetId',
-        //   render: <SelectNews buildingId={() => buildingId} />,
-        //   hidden: () => !newsVisible,
-        //   value: data.targetId,
-        //   rules: [
-        //     { required: true, message: '请选择发布资讯' },
-        //   ],
-        // },
+        {
+          label: '发布资讯',
+          name: 'targetId',
+          render: <SelectNews buildingId={() => buildingId} />,
+          hidden: () => !newsVisible,
+          value: data.targetId,
+          rules: [
+            { required: true, message: '请选择发布资讯' },
+          ],
+        },
         // {
         //   label: '发布内容',
         //   name: 'content',

src/pages/carouselFigure/propagandaList.jsx

@@ -82,7 +82,7 @@ const header = (props) => {
     //   dataIndex: 'showPosition',
     //   key: 'showPosition',
     //   align: 'center',
-    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '积分商城' : '' }</span>
     // },
     {
       title: '发布时间',
@@ -253,7 +253,7 @@ const header = (props) => {
         {/* <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
-              <Option value="mall">商城</Option>
+              <Option value="mall">积分商城</Option>
               <Option value="index">首页</Option>
             </Select>,
           )}