张延森 před 4 roky
rodič
revize
a5f94753b2

+ 2
- 0
src/pages/carouselFigure/carouselFigureList.jsx Zobrazit soubor

19
   'notice': '公告',
19
   'notice': '公告',
20
   'tpNews': '服务',
20
   'tpNews': '服务',
21
   'activity': '活动',
21
   'activity': '活动',
22
+  'mall': '积分商城',
22
   'news': '资讯',
23
   'news': '资讯',
24
+  'nothing': '无',
23
 }
25
 }
24
 
26
 
25
 const PositionDict = {
27
 const PositionDict = {

+ 15
- 15
src/pages/carouselFigure/editCarousel.jsx Zobrazit soubor

252
             //   label: '项目',
252
             //   label: '项目',
253
             //   value: 'project',
253
             //   value: 'project',
254
             // },
254
             // },
255
-            // {
256
-            //   label: '资讯',
257
-            //   value: 'news',
258
-            // },
259
             {
255
             {
260
-              label: '商城',
256
+              label: '资讯',
257
+              value: 'news',
258
+            },
259
+            {
260
+              label: '积分商城',
261
               value: 'mall',
261
               value: 'mall',
262
             },
262
             },
263
             {
263
             {
366
             { required: true, message: '请选择发布服务' },
366
             { required: true, message: '请选择发布服务' },
367
           ],
367
           ],
368
         },
368
         },
369
-        // {
370
-        //   label: '发布资讯',
371
-        //   name: 'targetId',
372
-        //   render: <SelectNews buildingId={() => buildingId} />,
373
-        //   hidden: () => !newsVisible,
374
-        //   value: data.targetId,
375
-        //   rules: [
376
-        //     { required: true, message: '请选择发布资讯' },
377
-        //   ],
378
-        // },
369
+        {
370
+          label: '发布资讯',
371
+          name: 'targetId',
372
+          render: <SelectNews buildingId={() => buildingId} />,
373
+          hidden: () => !newsVisible,
374
+          value: data.targetId,
375
+          rules: [
376
+            { required: true, message: '请选择发布资讯' },
377
+          ],
378
+        },
379
         // {
379
         // {
380
         //   label: '发布内容',
380
         //   label: '发布内容',
381
         //   name: 'content',
381
         //   name: 'content',

+ 2
- 2
src/pages/carouselFigure/propagandaList.jsx Zobrazit soubor

82
     //   dataIndex: 'showPosition',
82
     //   dataIndex: 'showPosition',
83
     //   key: 'showPosition',
83
     //   key: 'showPosition',
84
     //   align: 'center',
84
     //   align: 'center',
85
-    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
85
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '积分商城' : '' }</span>
86
     // },
86
     // },
87
     {
87
     {
88
       title: '发布时间',
88
       title: '发布时间',
253
         {/* <Form.Item>
253
         {/* <Form.Item>
254
           {getFieldDecorator('showPosition')(
254
           {getFieldDecorator('showPosition')(
255
             <Select style={{ width: '180px' }} placeholder="发布位置">
255
             <Select style={{ width: '180px' }} placeholder="发布位置">
256
-              <Option value="mall">商城</Option>
256
+              <Option value="mall">积分商城</Option>
257
               <Option value="index">首页</Option>
257
               <Option value="index">首页</Option>
258
             </Select>,
258
             </Select>,
259
           )}
259
           )}