直播修改

admin/config/router.config.js

@@ -604,7 +604,38 @@ export default [
           },
         ],
       },
-      
+      // 直播
+      {
+        path: '/bussset_live',
+        icon: 'pay-circle',
+        name: 'live',
+        routes: [
+          //直播设置
+          {
+            path: '/bussset_live/setting',
+            name: 'setting',
+            component: './bussset/live/setting',
+          },
+          //标签管理
+          {
+            path: '/bussset_live/live_label',
+            name: 'label',
+            component: './bussset/live/setting',
+          },
+          //主播管理
+          {
+            path: '/bussset_live/author_lists',
+            name: 'author_lists',
+            component: './bussset/live/setting',
+          },
+          //直播管理
+          {
+            path: '/bussset_live/live_manage',
+            name: 'live_manage',
+            component: './bussset/live/setting',
+          },
+        ],
+      },
       
 
       // 积分商城

admin/src/components/MDiyItemEdit/index.js

@@ -363,7 +363,7 @@ export default class MDiyItem extends Component {
         {...formItemLayoutModal}
         label={''}
       >
-        <Input maxLength={250} style={{ width: 300 }} value={data.info.live_name} disabled={true}/>
+        <Input maxLength={250} style={{ width: 300 }} value={data.info.name} disabled={true}/>
       </FormItem>
       </div>;
     } else if (data.url_type == 'svideo') {
@@ -417,7 +417,7 @@ export default class MDiyItem extends Component {
                           value={data.info.red_title} disabled={true}/>;
     } else if (data.url_type == 'live') {
       render_con = <Input key={`${select_data.type}_${select_data.id}_live${index}`} className={styles.more_link_input}
-                          value={data.info.live_name} disabled={true}/>;
+                          value={data.info.name} disabled={true}/>;
     } else if (data.url_type == 'svideo') {
       render_con = <Input key={`${select_data.type}_${select_data.id}_svideo${index}`} className={styles.more_link_input}
                           value={data.info.videoName} disabled={true}/>;
@@ -536,7 +536,8 @@ export default class MDiyItem extends Component {
       data.url = val.id;
       data.info = val;
     } else if (data.url_type == 'live') {
-      data.url = val.liveId;
+      // data.url = val.liveId;
+      data.url = val.roomId;
       data.info = val;
     } else if (data.url_type == 'svideo') {
       data.url = val.videoId;

admin/src/components/SldDiyMoreImgModal/SldDiyMoreImgModal.js

@@ -516,15 +516,15 @@ export default class SldDiyMoreImgModal extends Component {
 				item.info = val;
 			} else if (item.type == 'topic') {
 			  if(this.props.client!=undefined&&this.props.client=='mobile'){
-          item.value = val.name;
-			  }else{
-          item.value = val.decoName;
-        }
+					item.value = val.name;
+				}else{
+					item.value = val.decoName;
+				}
 				item.info = val;
 			} else if (item.type == 'seckill') {
-        item.value = val.seckillName;
-        item.info = val;
-      }
+				item.value = val.seckillName;
+				item.info = val;
+			}
 		});
 		this.setState({ data, link_type: '' });
 	};

admin/src/components/SldSelGoodsSingleDiy/index.js

@@ -137,6 +137,26 @@ export default class SldSelGoodsSingleDiy extends Component {
     },
   ];
 
+  live_columns = [
+    {
+      title: ' ',
+      dataIndex: 'roomId',
+      align: 'center',
+      width: 30,
+      render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+    }, {
+      title: `直播名称`,//直播名称
+      align: 'center',
+      dataIndex: 'name',
+      width: 200,
+    },  {
+      title: `主播名称`,//主播名称
+      align: 'center',
+      dataIndex: 'anchorName',
+      width: 200,
+    }, 
+  ];
+
   cat_columns = [
     {
       title: `${sldComLanguage('分类名称')}`,//分类名称
@@ -238,7 +258,7 @@ export default class SldSelGoodsSingleDiy extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     let { columns, modaltitle, search_data, sldpagination } = this.state;
-    if (nextProps.link_type == 'goods' || nextProps.link_type == 'category' || nextProps.link_type == 'topic' || nextProps.link_type == 'seckill' || nextProps.link_type == 'voucher') {
+    if (nextProps.link_type == 'goods' || nextProps.link_type == 'live' || nextProps.link_type == 'category' || nextProps.link_type == 'topic' || nextProps.link_type == 'seckill' || nextProps.link_type == 'voucher') {
       if (nextProps.link_type == 'goods') {
         columns = this.goods_columns;
         modaltitle = `${sldComLanguage('选择商品')}`;//选择商品
@@ -250,7 +270,18 @@ export default class SldSelGoodsSingleDiy extends Component {
         }];//筛选器
         sldpagination = true;
         this.rowKey = 'goodsId';
-      } else if (nextProps.link_type == 'category') {
+      }  else if (nextProps.link_type == 'live') {
+        columns = this.live_columns;
+        modaltitle = `选择直播`;//选择直播
+        search_data = [{
+          type: 'input',
+          label: `直播名称`,//直播名称
+          name: 'name',
+          placeholder: `请输入直播名称`,//请输入直播名称
+        }];//筛选器
+        sldpagination = true;
+        this.rowKey = 'roomId';
+      }  else if (nextProps.link_type == 'category') {
         columns = this.cat_columns;
         modaltitle = `${sldComLanguage('选择分类')}`;//选择分类
         search_data = [];
@@ -356,6 +387,9 @@ export default class SldSelGoodsSingleDiy extends Component {
       //获取商品数据
       dis_type = 'project/get_goods_lists';
       new_params.state = 3;//在售状态
+    } else if (link_type == 'live') {
+      //获取直播数据
+      dis_type = 'project/get_live_lists';
     } else if (link_type == 'category') {
       //获取分类数据
       dis_type = 'project/get_cate_list_by_id';
@@ -387,7 +421,7 @@ export default class SldSelGoodsSingleDiy extends Component {
       callback: (res) => {
         this.setState({ loading: false });
         if (res.state == 200) {
-          if (link_type == 'goods' || link_type == 'topic' || link_type == 'seckill' || link_type == 'voucher') {
+          if (link_type == 'goods' || link_type == 'live' || link_type == 'topic' || link_type == 'seckill' || link_type == 'voucher') {
             data = res.data;
           } else if (link_type == 'category') {
             //id为0直接赋值
@@ -513,6 +547,10 @@ export default class SldSelGoodsSingleDiy extends Component {
       modalTableSeleData.actualSales = record.actualSales;
       modalTableSeleData.mainImgUrl = record.mainImage;
       modalTableSeleData.defaultProductId = record.productId;
+    } else if (link_type == 'live') {
+      modalTableSeleData.roomId = record.roomId;
+      modalTableSeleData.name = record.name;
+      modalTableSeleData.anchorName = record.anchorName;
     } else if (link_type == 'topic') {
       if (this.props.client == 'mobile') {
         modalTableSeleData.decoId = record.decoId;

admin/src/components/point/SldSelGoodsSingleDiy/index.js

@@ -109,6 +109,27 @@ export default class SldSelGoodsSingleDiy extends Component {
     },
   ];
 
+  live_columns = [
+    {
+      title: ' ',
+      dataIndex: 'roomId',
+      align: 'center',
+      width: 30,
+      render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+    }, {
+      title: `直播名称`,//直播名称
+      align: 'center',
+      dataIndex: 'name',
+      width: 200,
+    },  {
+      title: `主播名称`,//主播名称
+      align: 'center',
+      dataIndex: 'anchorName',
+      width: 200,
+    }, 
+  ];
+
+
   topic_columns_mobile = [
     {
       title: ' ',
@@ -201,7 +222,7 @@ export default class SldSelGoodsSingleDiy extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     let { columns, modaltitle, search_data, sldpagination } = this.state;
-    if (nextProps.link_type == 'goods' || nextProps.link_type == 'category' || nextProps.link_type == 'topic'||nextProps.link_type == 'seckill') {
+    if (nextProps.link_type == 'goods' || nextProps.link_type == 'live' || nextProps.link_type == 'category' || nextProps.link_type == 'topic'||nextProps.link_type == 'seckill') {
       if (nextProps.link_type == 'goods') {
         columns = this.goods_columns;
         modaltitle = `${sldComLanguage('选择商品')}`;//选择商品
@@ -265,7 +286,18 @@ export default class SldSelGoodsSingleDiy extends Component {
         modaltitle = `选择秒杀活动`;
         sldpagination = true;
         this.rowKey = 'seckillId';
-      }
+      } else if (nextProps.link_type == 'live') {
+        columns = this.live_columns;
+        modaltitle = `选择直播`;//选择直播
+        search_data = [{
+          type: 'input',
+          label: `直播名称`,//直播名称
+          name: 'name',
+          placeholder: `请输入直播名称`,//请输入直播名称
+        }];//筛选器
+        sldpagination = true;
+        this.rowKey = 'roomId';
+      } 
       this.setState({
         search_data,
         link_type: nextProps.link_type,
@@ -298,6 +330,9 @@ export default class SldSelGoodsSingleDiy extends Component {
       //获取商品数据
       dis_type = 'project/get_point_goods_lists';
       new_params.state = 3;//在售状态
+    } else if (link_type == 'live') {
+      //获取直播数据
+      dis_type = 'project/get_live_lists';
     } else if (link_type == 'category') {
       //获取分类数据
       dis_type = 'project/get_point_label_list';
@@ -309,7 +344,7 @@ export default class SldSelGoodsSingleDiy extends Component {
       callback: (res) => {
         this.setState({ loading: false });
         if (res.state == 200) {
-          if (link_type == 'goods' || link_type == 'topic' || link_type == 'seckill') {
+          if (link_type == 'goods' || link_type == 'live' || link_type == 'topic' || link_type == 'seckill') {
             data = res.data;
           } else if (link_type == 'category') {
             //id为0直接赋值
@@ -436,7 +471,11 @@ export default class SldSelGoodsSingleDiy extends Component {
       modalTableSeleData.actualSales = record.actualSales;
       modalTableSeleData.mainImage = record.mainImage;
       modalTableSeleData.productId = record.productId;
-    }else if (link_type == 'category') {
+    } else if (link_type == 'live') {
+      modalTableSeleData.roomId = record.roomId;
+      modalTableSeleData.name = record.name;
+      modalTableSeleData.anchorName = record.anchorName;
+    } else if (link_type == 'category') {
       modalTableSeleData.labelId = record.labelId;
       modalTableSeleData.labelName = record.labelName;
       modalTableSeleData.grade = record.grade;

admin/src/models/project.js

@@ -31,6 +31,11 @@ export default {
       const response = yield call(sldCommonService, payload, 'get', 'v3/goods/admin/goods/list');
       if (callback) callback(response);
     },
+    //slodon_获取直播列表
+    * get_live_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/live/broad/list');
+      if (callback) callback(response);
+    },
     //slodon_获取移动端装修列表
     * get_diy_page_lists({ payload, callback }, { call }) {
       const response = yield call(sldCommonService, payload, 'get', 'v3/system/admin/mobileDeco/list');
@@ -62,10 +67,10 @@ export default {
       callback && callback(response);
     },
     // slodon_获取直播列表
-    * get_live_lists({ payload, callback }, { call }) {
-      const response = yield call(sldCommonService, payload, 'get', 'v3/video/admin/video/live/list');
-      if (callback) callback(response);
-    },
+    // * get_live_lists({ payload, callback }, { call }) {
+    //   const response = yield call(sldCommonService, payload, 'get', 'v3/video/admin/video/live/list');
+    //   if (callback) callback(response);
+    // },
     // slodon_获取短视频标签列表
     * get_svideo_label_lists({ payload, callback }, { call }) {
       const response = yield call(sldCommonService, payload, 'get', 'v3/video/admin/video/label/list');

admin/src/utils/util_data.js

@@ -726,7 +726,7 @@ export function m_diy_link_type() {
     { key: 'voucher_center', name: `${sldComLanguage('领券中心')}` },
     { key: 'point', name: `${sldComLanguage('积分商城')}` },
     { key: 'svideo_center', name: `${sldComLanguage('短视频中心')}` },
-    { key: 'live_center', name: `${sldComLanguage('直播中心')}` },
+    { key: 'live', name: `${sldComLanguage('直播中心')}` },
     { key: 'sign_center', name: `${sldComLanguage('签到中心')}` },
   ];
 }