修改

seller/config/router.config.js

@@ -438,7 +438,6 @@ export default [
         name: '',
         component: './promotion/presale/add_presale',
       },
-      
       //店铺设置
       {
         path: '/store/setting',
@@ -630,7 +629,35 @@ export default [
         name: '',
         component: './point/bill/detail',
       },
-      
+      //直播装修
+      {
+        path: '/live/decorate_live',
+        icon: 'mobile',
+        name: 'live_decorate_live',
+        component: './live/live_diy/live_diy_lists',
+      },
+      //直播商品
+      {
+        path: '/live/goods_live',
+        icon: 'mobile',
+        name: 'live_goods_live',
+        component: './live/live_goods/live_diy_lists',
+      },
+      //直播商品添加
+      {
+        path: '/live/goods_live_edit',
+        component: './live/live_goods/live_edit_goods_lists',
+      },
+      //直播商品添加列表
+      {
+        path: '/live/room_goods_edit',
+        component: './live/live_diy/live_room_goods_edit',
+      },
+      //直播商品绑定列表
+      {
+        path: '/live/room_goods_relation',
+        component: './live/live_diy/live_room_goods_relation',
+      },
       {
         component: '404',
       },

seller/src/components/SldExpressCom/SldExpressCom.js

@@ -276,8 +276,13 @@ export default class SldExpressCom extends Component {
 
   //地区数据组装，已经选择的地区id数据跟通用地区组装
   combine_area_info = (key, sele_id_array) => {
+    // 使用组装数据让组件中添加全部按钮
+    if(this.com_area_data[0].regionCode != 'CNXXX'){
+      this.com_area_data.unshift({"regionCode": "CNXXX","children": [],"regionName":"全部"});
+    }
     let tmp_data = this.com_area_data;
     let init_com_data = [];
+    let bool = true; // 判断是否全部选中 false的话修改参数
     for (let i in tmp_data) {
       let tmp_info = {};
       tmp_info.key = i;
@@ -292,6 +297,7 @@ export default class SldExpressCom extends Component {
         let cur_data = tmp_data[i].children[j];
         if (sele_id_array.length == 0) {
           tmp_info.checkAll = false;//是否全部选中
+          bool = false;
         } else {
           if (sele_id_array.indexOf(cur_data.regionCode) == -1) {
             tmp_info.checkAll = false;
@@ -306,6 +312,9 @@ export default class SldExpressCom extends Component {
       }
       init_com_data.push(tmp_info);
     }
+    if(!bool){
+      init_com_data[0].checkAll=false;
+    }
     this.setState({
       cur_key: key,
       permissionList: init_com_data,
@@ -368,16 +377,34 @@ export default class SldExpressCom extends Component {
   sldHandleCheckAll = (e, index) => {
     let { permissionList } = this.state;
     permissionList[index]['checkAll'] = e.target.checked;
-    if (e.target.checked) {
-      let sldchild = permissionList[index]['sldchild'];
-      if (sldchild.length > 0) {
-        for (let i = 0; i < sldchild.length; i++) {
-          permissionList[index]['checkList'].push(sldchild[i]['value']);
+    if(index == 0){
+      for(let j = 0;j<permissionList.length;j++){
+        if (e.target.checked) {
+            let sldchild = permissionList[j]['sldchild'];
+            permissionList[j].checkAll=true;
+            if (sldchild.length > 0) {
+              for (let i = 0; i < sldchild.length; i++) {
+                permissionList[j]['checkList'].push(sldchild[i]['value']);
+              }
+            }
+        } else {
+          permissionList[j].checkAll=false;
+          permissionList[j]['checkList'] = [];
         }
       }
-    } else {
-      permissionList[index]['checkList'] = [];
+    }else{
+      if (e.target.checked) {
+        let sldchild = permissionList[index]['sldchild'];
+        if (sldchild.length > 0) {
+          for (let i = 0; i < sldchild.length; i++) {
+            permissionList[index]['checkList'].push(sldchild[i]['value']);
+          }
+        }
+      } else {
+        permissionList[index]['checkList'] = [];
+      }
     }
+    
     permissionList[index]['indeterminate'] = false;
     this.setState({
       permissionList: permissionList,

seller/src/components/SldTableRowTwo/index.js

@@ -619,7 +619,7 @@ export default class SldTableRowTwo extends PureComponent {
 	            height: val.item_height!=undefined?val.item_height+2:cur_height + 2,
               borderTopWidth:val.lTopWidth!=undefined?val.lTopWidth:1
             }}>
-              {val.required != undefined && val.required && <span style={{ color: 'red' }}>*</span>}
+              {val.required != undefined && val.required && <span style={{ color: 'red',fontSize:'40px' }}>*</span>}
 	            <span className={styles.sld_det_r_text} style={{ fontWeight: this.props.l_fontw!=undefined?this.props.l_fontw:'600',color:this.props.l_color!=undefined?this.props.l_color:'#333'}}>{val.label}</span>
             </span>
 							<span className={styles.sld_det_r_item} style={{

seller/src/locales/zh-CN/menu.js

@@ -51,4 +51,6 @@ export default {
   'menu.point_bill_list': '结算管理',
   'menu.spreader_goods_list': '推手商品',
   'menu.spreader_order_list': '推手订单',
+  'menu.live_decorate_live': '直播管理',
+  'menu.live_goods_live': '直播商品管理',
 };

seller/src/models/login.js

@@ -90,6 +90,9 @@ export default {
               } else if (target == 'point') {
                 target_data.name = '积分商城';
                 target_data.left_icon = require('../assets/nav/point.png');
+              } else if (target == 'live') {
+                target_data.name = '直播';
+                target_data.left_icon = require('../assets/nav/point.png');
               } else {
                 continue;
               }
@@ -140,6 +143,7 @@ export default {
           return;
         }
         //如果redirect在用户拥有的路由内，则跳转，否则跳转第一个页面
+        console.log(redirect);
         let contain_redirect_flag = false;
         for(let i= 0;i<all_routes.length;i++){
           if(redirect.indexOf(all_routes[i])>-1){

seller/src/pages/CheckLogin.js

@@ -8,7 +8,7 @@ export default ({ children }) => {
   if (typeof start_time == 'undefined' || start_time == null) {
     return <Redirect to="/user/login"/>;
   } else {
-    if (cur_time - start_time > 58*60*1000) {
+    if (cur_time - start_time > 58*60*1000 ) {
       //用户token过期之后重新根据refresh_token获取token(58分钟，token的有效期是60分钟)
       let param = new FormData();
       param.append('grant_type', 'refresh_token');
@@ -45,7 +45,7 @@ export default ({ children }) => {
     let all_routes = JSON.parse(localStorage.sld_all_routes);
     let contain_redirect_flag = false;
     for(let i= 0;i<all_routes.length;i++){
-      if(children.props.location.pathname.indexOf(all_routes[i])>-1){
+      if(children.props.location.pathname.indexOf("/live/") >-1 ||children.props.location.pathname.indexOf(all_routes[i])>-1){
         contain_redirect_flag = true;
         break;
       }

seller/src/pages/diy/pc_diy/pcdecorate.less

@@ -143,6 +143,7 @@ a {
 
 .table_left_require {
   color: red;
+  font-size: 30px;
 }
 
 .adv_02_part {

seller/src/pages/goods/add_goods.js

@@ -88,29 +88,29 @@ export default class AddGoods extends Component {
             return index + 1;
           },
         },
-        {
-          title: '市场价',
-          dataIndex: 'marketPrice',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`marketPrice${record.key}`, {
-                initialValue: text,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={9999999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChange(e, 'marketPrice', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
+        // {
+        //   title: '市场价',
+        //   dataIndex: 'marketPrice',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`marketPrice${record.key}`, {
+        //         initialValue: text,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={9999999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChange(e, 'marketPrice', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
         {
           title: '价格',
           dataIndex: 'productPrice',
@@ -190,75 +190,75 @@ export default class AddGoods extends Component {
             </FormItem>
           ),
         },
-        {
-          title: `${sldComLanguage('长(CM)')}`,
-          dataIndex: 'length',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`length${record.key}`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChange(e, 'length', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
-        {
-          title: `${sldComLanguage('宽(CM)')}`,
-          dataIndex: 'width',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`width${record.key}`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChange(e, 'width', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
-        {
-          title: `${sldComLanguage('高(CM)')}`,
-          dataIndex: 'height',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`height${record.key}`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChange(e, 'height', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
+        // {
+        //   title: `${sldComLanguage('长(CM)')}`,
+        //   dataIndex: 'length',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`length${record.key}`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChange(e, 'length', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
+        // {
+        //   title: `${sldComLanguage('宽(CM)')}`,
+        //   dataIndex: 'width',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`width${record.key}`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChange(e, 'width', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
+        // {
+        //   title: `${sldComLanguage('高(CM)')}`,
+        //   dataIndex: 'height',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`height${record.key}`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChange(e, 'height', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
         {
           title: `${sldComLanguage('预警值')}`,
           dataIndex: 'productStockWarning',
@@ -379,29 +379,29 @@ export default class AddGoods extends Component {
             return index + 1;
           },
         },
-        {
-          title: `${sldComLanguage('市场价')}`,
-          dataIndex: 'marketPrice',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`marketPrice`, {
-                initialValue: text,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={9999999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChangeSpu(e, 'marketPrice', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
+        // {
+        //   title: `${sldComLanguage('市场价')}`,
+        //   dataIndex: 'marketPrice',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`marketPrice`, {
+        //         initialValue: text,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={9999999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChangeSpu(e, 'marketPrice', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
         {
           title: '价格',
           dataIndex: 'goodsPrice',
@@ -481,75 +481,75 @@ export default class AddGoods extends Component {
             </FormItem>
           ),
         },
-        {
-          title: `${sldComLanguage('长(CM)')}`,
-          dataIndex: 'length',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`length`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChangeSpu(e, 'length', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
-        {
-          title: `${sldComLanguage('宽(CM)')}`,
-          dataIndex: 'width',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`width`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChangeSpu(e, 'width', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
-        {
-          title: `${sldComLanguage('高(CM)')}`,
-          dataIndex: 'height',
-          align: 'center',
-          width: 100,
-          render: (text, record) => (
-            <FormItem
-              style={{ width: '100%' }}
-            >
-              {getFieldDecorator(`height`, {
-                initialValue: text ? text : 1,
-              })(
-                <InputNumber
-                  min={0.01}
-                  max={999}
-                  precision={2}
-                  style={{ width: '100%' }}
-                  onChange={e => this.handleFieldChangeSpu(e, 'height', record.key)}
-                />,
-              )}
-            </FormItem>
-          ),
-        },
+        // {
+        //   title: `${sldComLanguage('长(CM)')}`,
+        //   dataIndex: 'length',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`length`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChangeSpu(e, 'length', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
+        // {
+        //   title: `${sldComLanguage('宽(CM)')}`,
+        //   dataIndex: 'width',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`width`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChangeSpu(e, 'width', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
+        // {
+        //   title: `${sldComLanguage('高(CM)')}`,
+        //   dataIndex: 'height',
+        //   align: 'center',
+        //   width: 100,
+        //   render: (text, record) => (
+        //     <FormItem
+        //       style={{ width: '100%' }}
+        //     >
+        //       {getFieldDecorator(`height`, {
+        //         initialValue: text ? text : 1,
+        //       })(
+        //         <InputNumber
+        //           min={0.01}
+        //           max={999}
+        //           precision={2}
+        //           style={{ width: '100%' }}
+        //           onChange={e => this.handleFieldChangeSpu(e, 'height', record.key)}
+        //         />,
+        //       )}
+        //     </FormItem>
+        //   ),
+        // },
         {
           title: `${sldComLanguage('预警值')}`,
           dataIndex: 'stockWarning',
@@ -1741,13 +1741,13 @@ export default class AddGoods extends Component {
             //初始化spu_data_table数据
             let tmp_spu_data = spu_data_table.list[0];
             let tar_data = result.productList[0];
-            tmp_spu_data.marketPrice = tar_data.marketPrice;
+            tmp_spu_data.marketPrice = '';
             tmp_spu_data.goodsPrice = tar_data.productPrice;
             tmp_spu_data.goodsStock = tar_data.productStock;
             tmp_spu_data.weight = tar_data.weight;
-            tmp_spu_data.length = tar_data.length;
-            tmp_spu_data.width = tar_data.width;
-            tmp_spu_data.height = tar_data.height;
+            tmp_spu_data.length = '1.00';
+            tmp_spu_data.width = '1.00';
+            tmp_spu_data.height = '1.00';
             tmp_spu_data.stockWarning = tar_data.productStockWarning;
             tmp_spu_data.productCode = tar_data.productCode;
             tmp_spu_data.barCode = tar_data.barCode;
@@ -1952,7 +1952,8 @@ export default class AddGoods extends Component {
       sele_spec_num++;
       //更新表头
       for (let s in columns_spec) {
-        if (columns_spec[s].dataIndex == 'marketPrice') {
+        // if (columns_spec[s].dataIndex == 'marketPrice') {
+        if (columns_spec[s].dataIndex == 'productPrice') {
           columns_spec.splice(s, 0, {
             title: sle_data_new[i].specName,
             dataIndex: 'spec_info[' + i + ']',

seller/src/pages/live/live_diy/live_diy_lists.js

@@ -0,0 +1,678 @@
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, Spin, Switch } from 'antd';
+import {
+  sldIconBtn,
+  failTip,
+  sucTip,
+  sldLlineRtextAddGoods,
+  sldHandlePaginationData,
+  list_com_page_size_10,
+  getSldEmptyH, 
+  dragSldTableColumn,
+  validatorVendorPhone,
+  sldLlineRtextAddGoodsAddMargin,
+  formItemLayoutModal,
+  dateTimeFormat,
+  sldComLanguage,
+  sldtbaleOpeBtnText,
+  sldPopConfirmDiy,
+  getSldCopyData,
+  sldSearchValClear,
+} from '@/utils/utils';
+import Link from 'umi/link';
+import { apiUrl } from '@/utils/sldconfig.js';
+import global from '@/global.less';
+import StandardTable from '@/components/StandardTable';
+import SldModal from '@/components/SldModal/SldModal';
+import SldTableEdit from '@/components/SldTableEdit/SldTableEdit';
+import moment from 'moment';
+
+let comm_cur_page = 1;//当前页数
+let pageSize = list_com_page_size_10;
+@connect(({ article }) => ({
+  article,
+}))
+@Form.create()
+export default class M_diy_lists extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: {},
+      submiting: false,//按钮loading
+      loading: false,//按钮loading
+      selectedRows: [],
+      selectedRowKeys: [],//selectedRows的key
+      modalVisible: false,
+      title: '',
+      search_con: '',
+      type: 'add',//'add'新增  'edit'编辑
+      params: { pageSize: pageSize },//搜索条件
+      curData: {},//编辑的数据
+      addData: [
+          {
+              type: 'input',
+              label: `${
+                  sldComLanguage('直播间名字')
+              }`,
+              name: 'name',
+              placeholder: `${
+                  sldComLanguage('请输入直播间名字')
+              }`,
+              extra: `${
+                  sldComLanguage('最短3个汉字，最长17个汉字')
+              }`,
+              initialValue: '',
+              minLength: 3,
+              maxLength: 17,
+              rules: [
+                  {
+                      required: true,
+                      whitespace: true,
+                      message: `${
+                          sldComLanguage('请输入直播间名字')
+                      }`,
+                      
+                  }
+              ],
+              
+          },
+          {
+              type: 'rangepicker',
+              label: `${sldComLanguage('开播时间')}`,
+              name: 'search_create_time',
+              placeholder1: `${sldComLanguage('开始时间')}`,
+              placeholder2: `${sldComLanguage('结束时间')}`,
+              show_time: true,
+              extra: `${
+                  sldComLanguage('开播时间需要在当前时间的10分钟后,开播时间和结束时间间隔不得短于30分钟，不得超过24小时')
+              }`,
+              rules: [
+                {
+                    required: true,
+                    message: `${
+                      sldComLanguage('请输入时间')
+                    }`,
+                }
+            ],
+          },
+          {
+              type: 'input',
+              label: `${
+                  sldComLanguage('主播昵称')
+              }`,
+              name: 'anchorName',
+              placeholder: `${
+                  sldComLanguage('请输入主播昵称')
+              }`,
+              extra: `${
+                  sldComLanguage('最短2个汉字，最长15个汉字')
+              }`,
+              initialValue: '',
+              minLength: 2,
+              maxLength: 15,
+              rules: [
+                  {
+                      required: true,
+                      whitespace: true,
+                      message: `${
+                          sldComLanguage('请输入主播昵称')
+                      }`,
+                      
+                  }
+              ],
+              
+          },
+          {
+            type: 'input',
+            label: `${
+                sldComLanguage('主播微信号')
+            }`,
+            name: 'anchorWechat',
+            placeholder: `${
+                sldComLanguage('请输入主播微信号')
+            }`,
+            extra: `${
+                sldComLanguage('如果未实名认证，需要进行实名验证')
+            }`,
+            initialValue: '',
+            minLength: 2,
+            maxLength: 15,
+            rules: [
+                {
+                    required: true,
+                    whitespace: true,
+                    message: `${
+                        sldComLanguage('请输入主播微信号')
+                    }`,
+                    
+                }
+            ],
+        },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('背景图')}`,//背景图
+              name: 'coverImg',
+              extra: `${sldComLanguage('建议像素1080*1920，大小不超过2M')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'coverImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required: true,
+          },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('分享图')}`,//分享图
+              name: 'shareImg',
+              extra: `${sldComLanguage('建议像素800*640，大小不超过1M')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'shareImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required: true,
+          },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('购物直播频道封面图')}`,//购物直播频道封面图
+              name: 'feedsImg',
+              extra: `${sldComLanguage('建议像素800*800，大小不超过100KB')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'feedsImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required : true,
+          },
+          // {
+          //     type: 'switch',
+          //     label: `${sldComLanguage('直播间类型')}`,
+          //     name: 'type',
+          //     placeholder: ``,
+          //     initialValue: 1,
+          // },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭点赞')}`,
+              name: 'closeLike',
+              placeholder: ``,
+              checked:0,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭货架')}`,
+              name: 'closeGoods',
+              placeholder: ``,
+              checked:1,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭评论')}`,
+              name: 'closeComment',
+              placeholder: ``,
+              checked:true,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('开启官方收录')}`,
+              name: 'isFeedsPublic',
+              placeholder: ``,
+              checked:false,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭回放')}`,
+              name: 'closeReplay',
+              placeholder: ``,
+              checked:true,
+              initialValue: true,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭分享')}`,
+              name: 'closeShare',
+              placeholder: ``,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭客服')}`,
+              name: 'closeKf',
+              placeholder: ``,
+              initialValue: 1,
+          },
+          
+      ],//modal框的数据
+      columns: [
+        {
+          title: ' ',
+          dataIndex: 'roomId',
+          align: 'center',
+          width: 55,
+          render: (text, record, index) => {
+            return (comm_cur_page - 1) * pageSize + index + 1;
+          },
+        },
+        {
+          title: `${sldComLanguage('直播名称')}`,
+          align: 'center',
+          dataIndex: 'name',
+          width: 100,
+        },
+        {
+          title: `${sldComLanguage('创建时间')}`,
+          dataIndex: 'startTimeStr',
+          align: 'center',
+          width: 150,
+        },
+        {
+          title: `${sldComLanguage('状态')}`,
+          dataIndex: 'liveStatusName',
+          align: 'center',
+          width: 150,
+        },
+        {
+          title: `${sldComLanguage('操作')}`,
+          align: 'center',
+          width: 100,
+          render: (text, record) => (
+            <Fragment>
+              <span className={global.splitLine}></span>
+              {sldtbaleOpeBtnText(`${sldComLanguage('编辑')}`, () => this.editMDiyPage(record))}
+              <Link to={{
+                pathname: '/live/room_goods_edit',
+                query: {
+                  id: record.roomId,
+                }
+              }}>
+                {sldtbaleOpeBtnText(`${sldComLanguage('导入商品')}`, () => null )}
+              </Link>
+              <Link to={{
+                pathname: '/live/room_goods_relation',
+                query: {
+                  id: record.roomId,
+                }
+              }}>
+                {sldtbaleOpeBtnText(`${sldComLanguage('查看导入商品')}`, () => null)}
+              </Link>
+              <span className={global.splitLine}></span>
+              {sldPopConfirmDiy('leftBottom', `${sldComLanguage('删除后不可恢复，是否确定删除')}`, () => this.operateMDiyPage(record.roomId, 'del'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`,
+                sldtbaleOpeBtnText(`${sldComLanguage('删除')}`, () => null))//删除后不可恢复，是否确定删除？
+              }
+            </Fragment>
+          ),
+        },
+      ],
+      modalTitle: '',
+    };
+  }
+
+
+
+  componentDidMount() {
+    this.get_list({ pageSize: pageSize });
+  }
+
+  componentWillUnmount() {
+
+  }
+
+  //预览图片
+  uploadImgPre = (info) => {
+    this.viewImg(true, info.name);
+  };
+
+  //上传图片 dataType:用于区分更改那个数据
+  uploadImg = (info, dataType) => {
+    let { addData } = this.state;
+    console.log(info)
+    for (let i in addData) {
+      if (addData[i].name == dataType) {
+        addData[i].fileList = info.fileList;
+        addData[i].img_succ_info = (info.file.response != undefined && info.fileList.length > 0 && info.file.response.data != undefined) ? info.file.response.data : [];
+      }
+    }
+    this.setState({ addData });
+  };
+
+  //获取数据列表
+  get_list = (params) => {
+    const { dispatch } = this.props;
+    dispatch({
+      type: 'mlive/get_live_page_lists',
+      payload: { ...params, type: 'home' },
+      callback: (res) => {
+        this.setState({ loading: false });
+        if (res.state == 200) {
+          if (res.data.list.length == 0 && this.state.params.current > 1) {
+            params.current = params.current - 1;
+            this.get_list(params);
+          } else {
+            this.setState({
+              data: res.data,
+              isReset: false,
+            });
+          }
+        }
+      },
+    });
+  };
+
+  handleSelectRows = (rows, rowkeys) => {
+    this.setState({
+      selectedRows: rows,
+      selectedRowKeys: rowkeys,
+    });
+  };
+
+  handleTablePagination = (pagination, filtersArg, sorter, type = 'main') => {
+    const { formValues } = this.state;
+    if (type == 'main') {
+      const params = sldHandlePaginationData(pagination, filtersArg, sorter, formValues);
+      pageSize = params.pageSize;
+      this.setState({ params });
+      this.get_list(params);
+    }
+  };
+
+  //装修直播操作，edit 编辑，del 删除
+  operateMDiyPage = (id, type) => {
+    const { dispatch } = this.props;
+    let dis_type = '';
+    let params = { roomId: id };
+    if (type == 'edit') {
+      dis_type = 'mlive/edit_m_live_page';
+      params = id;
+    } else if (type == 'del') {
+      dis_type = 'mlive/del_m_live_page';
+    }
+    dispatch({
+      type: dis_type,
+      payload: params,
+      callback: (res) => {
+        if (res.state == 200) {
+          sucTip(res.msg);
+          this.get_list(this.state.params);
+          this.setState({
+            modalVisible: false,
+          });
+        } else {
+          failTip(res.msg);
+        }
+        this.setState({ submiting: false });
+      },
+    });
+  };
+
+  sldHandleConfirm = (val) => {
+    this.setState({ submiting: true });
+    const { addData, curData, type } = this.state;
+    const { dispatch } = this.props;
+    console.log(val)
+    if (val.search_create_time) {
+      val.startTimeStr = val.search_create_time[0] ? val.search_create_time[0].format(dateTimeFormat) : '';
+      val.endTimeStr = val.search_create_time[1] ? val.search_create_time[1].format(dateTimeFormat) : '';
+      var nowTime = new Date().getTime();
+      var startTime = new Date(val.startTimeStr).getTime();
+      var endTime = new Date(val.endTimeStr).getTime();
+      console.log("nowTime: "+nowTime+" startTime: "+startTime+" endTime: "+endTime)
+      if(startTime-nowTime<600000){
+        failTip("开始时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后");
+        this.setState({ submiting: false });
+        return;
+      }
+      if(endTime-startTime<1800000 || endTime-startTime>86400000 ){
+        failTip("开播时间和结束时间间隔不得短于30分钟，不得超过24小时");
+        this.setState({ submiting: false });
+        return;
+      }
+      delete val.search_create_time;
+    }
+    for (let i in addData) {
+      if (addData[i].name == 'coverImg') {
+        val.coverImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.coverImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      } else if (addData[i].name == 'shareImg') {
+        val.shareImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.shareImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      } else if (addData[i].name == 'feedsImg') {
+        val.feedsImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.feedsImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      }
+    }
+    if(val.name.length<3){
+      failTip("直播间名字，最短3个汉字");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.anchorName.length<2){
+      failTip("主播昵称，最短2个汉字");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.coverImg == ''){
+      failTip("背景图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.shareImg == ''){
+      failTip("分享图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.feedsImg == ''){
+      failTip("购物直播频道封面图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    // val.type = val.type ? 1:0;
+    val.closeLike = val.closeLike ? 1:0;
+    val.closeGoods = val.closeGoods ? 1:0;
+    val.closeComment = val.closeComment ? 1:0;
+    val.isFeedsPublic = val.isFeedsPublic ? 1:0;
+    val.closeReplay = val.closeReplay ? 1:0;
+    val.closeShare = val.closeShare ? 1:0;
+    val.closeKf = val.closeKf ? 1:0;
+    console.log(val);
+    let dis_type = '';
+    if (type == 'edit') {
+      val.roomId = curData.roomId;
+      dis_type = 'mlive/edit_m_live_page';
+    }else{
+      dis_type = 'mlive/add_m_live_page';
+    }
+    dispatch({
+      type: dis_type,
+      payload: val,
+      callback: (res) => {
+        if (res.state == 200) {
+          sucTip(res.msg);
+          this.get_list({ pageSize: pageSize });
+          this.setState({
+            modalVisible: false,
+            params: { pageSize: pageSize },
+          });
+        } else {
+          if("qrcode_url" == res.msg){
+            failTip("主播微信号，未实名认证");
+            window.open("https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh", "_blank");
+          }else{
+            failTip(res.msg);  
+          }
+        }
+        this.setState({ submiting: false });
+      },
+    });
+  };
+
+  sldHandleCancle = () => {
+    this.setState({ modalVisible: false, modalVisibleAdv: false });
+  };
+
+  //表格拖动
+  resizeTable = (index, size, type, data) => {
+    let datas = dragSldTableColumn(index, size, data);
+    this.setState({ [type]: datas });
+  };
+
+  //新增功能
+  addMDiyPage = () => {
+    let { addData } = this.state;
+    for (let i in addData) {
+      addData[i].initialValue = '';
+      if(addData[i].name.indexOf("Img")){
+        addData[i].fileList = '';
+        addData[i].img_succ_info = '';
+      }
+    }
+    this.setState({
+      modalVisible: true,
+      type: 'add',
+      title: `${sldComLanguage('添加直播')}`,
+      addData: addData,
+    });//添加直播
+  };
+  editGoods=(record)=>{
+    if(record['liveStatus'] != 102){
+      failTip("直播间状态为："+record['liveStatusName']+",不允许导入");  
+      return;
+    }
+  }
+  //编辑功能
+  editMDiyPage = (record) => {
+    let { addData } = this.state;
+    if(record['liveStatus'] != 102){
+      failTip("直播间状态为："+record['liveStatusName']+",不允许修改");  
+      return;
+    }
+    for (let i in addData) {
+      if (addData[i].name == 'coverImg') {
+        let fileList = [];
+        if (record['coverImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['coverImg'];
+          tmp_data.mediaId = record['coverImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['coverImgPath'];
+          tmp_data.url = record['coverImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['coverImg'],path: record['coverImgPath'] };
+      } else if (addData[i].name == 'shareImg') {
+        let fileList = [];
+        if (record['shareImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['shareImg'];
+          tmp_data.mediaId = record['shareImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['shareImgPath'];
+          tmp_data.url = record['shareImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['shareImg'],path: record['shareImgPath'] };
+      } else if (addData[i].name == 'feedsImg') {
+        let fileList = [];
+        if (record['feedsImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['feedsImg'];
+          tmp_data.mediaId = record['feedsImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['feedsImgPath'];
+          tmp_data.url = record['feedsImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['feedsImg'],path: record['feedsImgPath'] };
+      } else{
+        addData[i].initialValue = record[addData[i].name];
+      }
+    }
+    addData[1].initialValue=[moment(record["startTimeStr"]),moment(record["endTimeStr"])]
+    this.setState({
+      modalVisible: true,
+      type: 'edit',
+      title: `${sldComLanguage('编辑直播')}`,
+      addData: addData,
+      curData: record,
+    });//编辑直播
+  };
+
+  //搜索
+  sldSearch = (val) => {
+    this.setState({
+      formValues: { name: val,params: { pageSize: pageSize } },
+    });
+    this.get_list({ pageSize: pageSize, name: val });
+  };
+
+  //搜索框内容的变化
+  sldSearChange = (val) => {
+    this.setState({
+      search_con: val.target.value,
+    });
+  };
+
+  //清空搜索内容
+  sldSearClear = () => {
+    this.setState({
+      search_con: '',
+    });
+    this.sldSearch('');
+  };
+
+  render() {
+    const { selectedRows, modalVisible, title, addData, columns, submiting, data, loading, search_con, modalTitle, modalVisibleAdv, screen_data } = this.state;
+    return (
+      <div className={global.common_page}>
+        {sldLlineRtextAddGoodsAddMargin('#69A2F2', `${sldComLanguage('直播页面')}`, 0, 0, 10)}
+        <Spin spinning={loading}>
+          { /*公共功能条-start*/}
+          <div className={global.operate_bg}>
+            {sldIconBtn(() => this.addMDiyPage(), `${sldComLanguage('新建直播')}`, 7, 7)}
+            {sldSearchValClear(`${sldComLanguage('请输入直播名称')}`, 291, this.sldSearch, `${sldComLanguage('搜索')}`, search_con, this.sldSearChange, this.sldSearClear, 65)}
+          </div>
+          { /*公共功能条-end*/}
+          { /*标准表格-start*/}
+          <StandardTable
+            totalHeight={document.body.clientHeight - 160}
+            selectedRows={selectedRows}
+            data={data}
+            rowKey={'roomId'}
+            isCheck={false}
+            columns={columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'main')}
+            resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
+            isColumnResize={true}
+          />
+          { /*标准表格-end*/}
+          { /*新增/编辑对话框-start*/}
+          <SldModal
+            title={title}
+            width={600}
+            submiting={submiting}
+            modalVisible={modalVisible}
+            sldHandleConfirm={(val) => this.sldHandleConfirm(val)}
+            sldHandleCancle={this.sldHandleCancle}
+            formItemLayoutModal={formItemLayoutModal}
+            content={addData}
+          />
+          { /*新增/编辑对话框-end*/}
+        </Spin>
+      </div>
+    );
+  }
+}

seller/src/pages/live/live_diy/live_room_goods_edit.js

@@ -0,0 +1,338 @@
+/*
+* 商品管理——在售商品
+* */
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, Spin, Tooltip } from 'antd';
+import Link from 'umi/link';
+import router from 'umi/router';
+import {
+  failTip,
+  sucTip,
+  list_com_page_size_5,
+  dragSldTableColumn,
+  getTableNum,
+  sldComLanguage,
+  sldPopConfirm,
+  dateFormat,
+  sldHandlePaginationData,
+  sldtbaleOpeBtnText,
+  sldIconBtn,
+  formItemLayoutModal,
+  getSldListGoodsImg80,
+  list_com_page_more,
+} from '@/utils/utils';
+import global from '@/global.less';
+import StandardTable from '@/components/StandardTable';
+import Search from '@/components/Search/Search';
+import SldModal from '@/components/SldModal/SldModal';
+
+let pageSize = list_com_page_size_5;
+@connect(({ product }) => ({
+  product,
+}))
+@Form.create()
+export default class GoodsOnlineLists extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      search_height: 0,
+      modal_width: 700,
+      modalVisibleDetail: false,
+      initLoading: false,
+      submiting: false,
+      show_foot: false,
+      modalVisible: false,//是否显示规格弹框
+      data: {},//列表数据
+      selectedRows: [],
+      selectedRowKeys: [],//selectedRows的key
+      title: `${sldComLanguage('商品规格')}`,
+      type: 'add',//'add'新增  'edit'编辑
+      params: { pageSize: pageSize },//搜索条件
+      search_data: [{
+        type: 'input',
+        label: `${sldComLanguage('商品名称')}`,
+        name: 'goodsName',
+        placeholder: `${sldComLanguage('请输入商品名称')}`,
+      },],
+      roomId: props.location.query.id,
+      formValues: {},//搜索条件
+      addData: [{
+        type: 'select',
+        label: `${sldComLanguage('顶部版式')}`,
+        name: 'topTemplateId',
+        placeholder: `${sldComLanguage('请选择顶部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }, {
+        type: 'select',
+        label: `${sldComLanguage('底部版式')}`,
+        name: 'bottomTemplateId',
+        placeholder: `${sldComLanguage('请选择底部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }],//设置关联版式的数据
+      operateData: [],
+      columns: [
+        {
+          title: ' ',
+          align: 'center',
+          width: 30,
+          render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+        },
+        {
+          title: `${sldComLanguage('商品名称')}`,
+          dataIndex: 'name',
+          align: 'center',
+          width: 100,
+        },
+        {
+          title: `${sldComLanguage('价格')}`,
+          dataIndex: 'price',
+          align: 'center',
+          width: 150,
+        },
+      ],
+    };
+  }
+
+
+  componentDidMount() {
+    this.get_list({ pageSize: pageSize });
+    this.getTemplateList();
+    this.resize();
+    window.addEventListener('resize', this.resize);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('resize', this.resize);
+  }
+
+  resize = () => {
+    const { search_height } = this.state;
+    if (this.refs.search_part != undefined) {
+      if (this.refs.search_part.clientHeight != search_height) {
+        this.setState({ search_height: this.refs.search_part.clientHeight })
+      }
+    }
+  }
+
+
+  sldHandleConfirm = (val) => {
+    const { selectedRowKeys } = this.state;
+    val.goodsIds = selectedRowKeys.join(',');
+    if (val.topTemplateId == undefined && val.bottomTemplateId == undefined) {
+      failTip(`${sldComLanguage('请至少选择一个模版')}`);
+      return false;
+    }
+    this.operateGoods(val, 'template');
+  };
+
+
+  //商品操作
+  operateGoods = (id, type) => {
+    this.setState({ submiting: true });
+    const { params } = this.state;
+    const { dispatch } = this.props;
+    let param_data = {};
+    let dis_type = '';
+    if (type == 'add') {
+      dis_type = 'mlive/add_live_goods';
+      var roomId = this.props.location.query.id;
+      var ids = id.ids;
+      param_data = { ids, roomId };
+    }
+    dispatch({
+      type: dis_type,
+      payload: param_data,
+      callback: (res) => {
+        this.setState({ submiting: false });
+        if (res.state == 200) {
+          sucTip(res.msg);
+        } else {
+          failTip(res.msg);
+        }
+      },
+    });
+  };
+
+  //获取数据列表
+  get_list = (params) => {
+    this.setState({ initLoading: true });
+    const { dispatch } = this.props;
+    // 审核成功的商品才能展示 auditStatus = 2
+    params.auditStatus = 2
+    dispatch({
+      type: 'mgoods/get_live_page_lists',
+      payload: { ...params, type: 'home' },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          if (res.data.length == 0 && this.state.params.current > 1) {
+            params.current = params.current - 1;
+            this.get_list(params);
+          } else {
+            res.data.list.map(item => {
+              item.disabled = item.isLock == 1 ? true : false;
+            })
+            this.setState({
+              data: res.data,
+            });
+          }
+        }
+      },
+    });
+  };
+
+  //获取关联版式列表
+  getTemplateList = () => {
+    const { dispatch } = this.props;
+    let { addData } = this.state;
+    dispatch({
+      type: 'product/get_related_template_lists',
+      payload: { pageSize: list_com_page_more },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          let topData = res.data.list.filter(item => item.templatePosition == 1);
+          let bottomData = res.data.list.filter(item => item.templatePosition == 2);
+          for (let i in addData) {
+            if (addData[i].name == 'topTemplateId') {
+              addData[i].sel_data = topData;
+            } else {
+              addData[i].sel_data = bottomData;
+            }
+          }
+          this.setState({ addData });
+        }
+      },
+    });
+  };
+
+  handleSelectRows = (rows, rowkeys) => {
+    this.setState({
+      selectedRows: rows,
+      selectedRowKeys: rowkeys,
+    });
+  };
+
+  handleTablePagination = (pagination, filtersArg, sorter, type = 'main') => {
+    const { formValues } = this.state;
+    if (type == 'main') {
+      const params = sldHandlePaginationData(pagination, filtersArg, sorter, formValues);
+      pageSize = params.pageSize;
+      this.setState({ params });
+      this.get_list(params);
+    }
+  };
+
+  //表格拖动
+  resizeTable = (index, size, type, data) => {
+    let datas = dragSldTableColumn(index, size, data);
+    this.setState({ [type]: datas });
+  };
+
+  //搜索事件
+  search = (data) => {
+    const values = { ...data };
+
+    for (let i in values) {
+      if (values[i] == '') {
+        delete values[i];
+      }
+    }
+    this.setState({
+      formValues: values,
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize, ...values });
+  };
+  //搜索重置事件
+  seaReset = () => {
+    //搜索条件置为空
+    this.setState({
+      formValues: {},
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize });
+  };
+
+  sldHandleCancle = () => {
+    this.setState({ modalVisible: false });
+  };
+
+
+  //搜索点击
+  moreSearchToggle = () => {
+    const { search_height } = this.state;
+    if (this.refs.search_part != undefined) {
+      if (this.refs.search_part.clientHeight != search_height) {
+        this.setState({ search_height: this.refs.search_part.clientHeight })
+      }
+    }
+  }
+
+  render() {
+    const { selectedRows, selectedRowKeys, search_data, columns, initLoading, data, modalVisible, operateData, title, modal_width, show_foot, submiting, search_height } = this.state;
+    return (
+      <div className={global.common_page} >
+        <div style={{width:'94.8%'}} className={global.tableListForm} ref={'search_part'}>
+          <Search search_data={search_data} moreSearchToggle={() => this.moreSearchToggle()}
+            seaSubmit={(data) => this.search(data)} seaReset={() => this.seaReset()}
+          />
+        </div>
+        <div style={{float:'right',marginTop:'-40px',height:"29px",width:"69px"}} onClick={() => this.props.history.goBack()} className={global.add_goods_bottom_btn}>
+          {sldComLanguage('返回')}
+        </div>
+        {/*公共功能条-start*/}
+        <div className={global.operate_bg}>
+          <div>
+            {selectedRowKeys.length == 0 ? sldIconBtn(() => {
+              failTip(`${sldComLanguage('请先选中数据')}`);
+              //确认添加选中的商品吗？
+            }, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006') : sldPopConfirm('leftBottom', `${sldComLanguage('确认添加选中的商品吗？')}`, () => this.operateGoods({ ids: selectedRowKeys.join(',') }, 'add'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldIconBtn(null, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006'), 0, 0, '#f9a006')}
+          </div>
+        </div>
+        {/*公共功能条-end*/}
+        <Spin spinning={initLoading}>
+          {/*标准表格-start*/}
+          <StandardTable
+            totalHeight={document.body.clientHeight - 190 - search_height - 15}
+            bordered={false}
+            selectedRows={selectedRows}
+            data={data}
+            rowKey={'goodsId'}
+            isCheck={true}
+            columns={columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'main')}
+            onSldHandleSeleRow={this.onSldHandleSeleRow}
+            resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
+            isColumnResize={true}
+          />
+          {/*标准表格-end*/}
+
+        </Spin>
+
+        { /*新增/编辑对话框-start*/}
+        <SldModal
+          width={modal_width}
+          title={title}
+          submiting={submiting}
+          modalVisible={modalVisible}
+          sldHandleConfirm={(val) => this.sldHandleConfirm(val)}
+          sldHandleCancle={this.sldHandleCancle}
+          formItemLayoutModal={formItemLayoutModal}
+          content={operateData}
+          show_foot={show_foot}
+        />
+        { /*新增/编辑对话框-end*/}
+      </div>
+
+    );
+  }
+}

seller/src/pages/live/live_diy/live_room_goods_relation.js

@@ -0,0 +1,339 @@
+/*
+* 商品管理——在售商品
+* */
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, Spin, Tooltip } from 'antd';
+import Link from 'umi/link';
+import router from 'umi/router';
+import {
+  failTip,
+  sucTip,
+  list_com_page_size_5,
+  dragSldTableColumn,
+  getTableNum,
+  sldComLanguage,
+  sldPopConfirm,
+  dateFormat,
+  sldHandlePaginationData,
+  sldtbaleOpeBtnText,
+  sldIconBtn,
+  formItemLayoutModal,
+  getSldListGoodsImg80,
+  list_com_page_more,
+} from '@/utils/utils';
+import global from '@/global.less';
+import StandardTable from '@/components/StandardTable';
+import Search from '@/components/Search/Search';
+import SldModal from '@/components/SldModal/SldModal';
+
+let pageSize = list_com_page_size_5;
+@connect(({ product }) => ({
+  product,
+}))
+@Form.create()
+export default class GoodsOnlineLists extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      search_height: 0,
+      modal_width: 700,
+      modalVisibleDetail: false,
+      initLoading: false,
+      submiting: false,
+      show_foot: false,
+      modalVisible: false,//是否显示规格弹框
+      data: {},//列表数据
+      selectedRows: [],
+      selectedRowKeys: [],//selectedRows的key
+      title: `${sldComLanguage('商品规格')}`,
+      type: 'add',//'add'新增  'edit'编辑
+      params: { pageSize: pageSize },//搜索条件
+      search_data: [{
+        type: 'input',
+        label: `${sldComLanguage('商品名称')}`,
+        name: 'goodsName',
+        placeholder: `${sldComLanguage('请输入商品名称')}`,
+      },],
+      roomId: props.location.query.id,
+      formValues: {},//搜索条件
+      addData: [{
+        type: 'select',
+        label: `${sldComLanguage('顶部版式')}`,
+        name: 'topTemplateId',
+        placeholder: `${sldComLanguage('请选择顶部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }, {
+        type: 'select',
+        label: `${sldComLanguage('底部版式')}`,
+        name: 'bottomTemplateId',
+        placeholder: `${sldComLanguage('请选择底部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }],//设置关联版式的数据
+      operateData: [],
+      columns: [
+        {
+          title: ' ',
+          align: 'center',
+          width: 30,
+          render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+        },
+        {
+          title: `${sldComLanguage('商品名称')}`,
+          dataIndex: 'name',
+          align: 'center',
+          width: 100,
+        },
+        {
+          title: `${sldComLanguage('价格')}`,
+          dataIndex: 'price',
+          align: 'center',
+          width: 150,
+        },
+      ],
+    };
+  }
+
+
+  componentDidMount() {
+    this.get_list({ pageSize: pageSize });
+    this.getTemplateList();
+    this.resize();
+    window.addEventListener('resize', this.resize);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('resize', this.resize);
+  }
+
+  resize = () => {
+    const { search_height } = this.state;
+    if (this.refs.search_part != undefined) {
+      if (this.refs.search_part.clientHeight != search_height) {
+        this.setState({ search_height: this.refs.search_part.clientHeight })
+      }
+    }
+  }
+
+
+  sldHandleConfirm = (val) => {
+    const { selectedRowKeys } = this.state;
+    val.goodsIds = selectedRowKeys.join(',');
+    if (val.topTemplateId == undefined && val.bottomTemplateId == undefined) {
+      failTip(`${sldComLanguage('请至少选择一个模版')}`);
+      return false;
+    }
+    this.operateGoods(val, 'template');
+  };
+
+
+  //商品操作
+  operateGoods = (id, type) => {
+    this.setState({ submiting: true });
+    const { params } = this.state;
+    const { dispatch } = this.props;
+    let param_data = {};
+    let dis_type = '';
+    if (type == 'add') {
+      dis_type = 'mlive/add_live_goods';
+      var roomId = this.props.location.query.id;
+      var ids = id.ids;
+      param_data = { ids, roomId };
+    }
+    dispatch({
+      type: dis_type,
+      payload: param_data,
+      callback: (res) => {
+        this.setState({ submiting: false });
+        if (res.state == 200) {
+          sucTip(res.msg);
+        } else {
+          failTip(res.msg);
+        }
+      },
+    });
+  };
+
+  //获取数据列表
+  get_list = (params) => {
+    this.setState({ initLoading: true });
+    const { dispatch } = this.props;
+    // 通过传入直播间id查看绑定商品
+    var roomId = this.props.location.query.id;
+    params.roomId = roomId
+    dispatch({
+      type: 'mgoods/get_live_page_lists',
+      payload: { ...params, type: 'home' },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          if (res.data.length == 0 && this.state.params.current > 1) {
+            params.current = params.current - 1;
+            this.get_list(params);
+          } else {
+            res.data.list.map(item => {
+              item.disabled = item.isLock == 1 ? true : false;
+            })
+            this.setState({
+              data: res.data,
+            });
+          }
+        }
+      },
+    });
+  };
+
+  //获取关联版式列表
+  getTemplateList = () => {
+    const { dispatch } = this.props;
+    let { addData } = this.state;
+    dispatch({
+      type: 'product/get_related_template_lists',
+      payload: { pageSize: list_com_page_more },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          let topData = res.data.list.filter(item => item.templatePosition == 1);
+          let bottomData = res.data.list.filter(item => item.templatePosition == 2);
+          for (let i in addData) {
+            if (addData[i].name == 'topTemplateId') {
+              addData[i].sel_data = topData;
+            } else {
+              addData[i].sel_data = bottomData;
+            }
+          }
+          this.setState({ addData });
+        }
+      },
+    });
+  };
+
+  handleSelectRows = (rows, rowkeys) => {
+    this.setState({
+      selectedRows: rows,
+      selectedRowKeys: rowkeys,
+    });
+  };
+
+  handleTablePagination = (pagination, filtersArg, sorter, type = 'main') => {
+    const { formValues } = this.state;
+    if (type == 'main') {
+      const params = sldHandlePaginationData(pagination, filtersArg, sorter, formValues);
+      pageSize = params.pageSize;
+      this.setState({ params });
+      this.get_list(params);
+    }
+  };
+
+  //表格拖动
+  resizeTable = (index, size, type, data) => {
+    let datas = dragSldTableColumn(index, size, data);
+    this.setState({ [type]: datas });
+  };
+
+  //搜索事件
+  search = (data) => {
+    const values = { ...data };
+
+    for (let i in values) {
+      if (values[i] == '') {
+        delete values[i];
+      }
+    }
+    this.setState({
+      formValues: values,
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize, ...values });
+  };
+  //搜索重置事件
+  seaReset = () => {
+    //搜索条件置为空
+    this.setState({
+      formValues: {},
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize });
+  };
+
+  sldHandleCancle = () => {
+    this.setState({ modalVisible: false });
+  };
+
+
+  //搜索点击
+  moreSearchToggle = () => {
+    const { search_height } = this.state;
+    if (this.refs.search_part != undefined) {
+      if (this.refs.search_part.clientHeight != search_height) {
+        this.setState({ search_height: this.refs.search_part.clientHeight })
+      }
+    }
+  }
+
+  render() {
+    const { selectedRows, selectedRowKeys, search_data, columns, initLoading, data, modalVisible, operateData, title, modal_width, show_foot, submiting, search_height } = this.state;
+    return (
+      <div className={global.common_page} >
+        <div style={{width:'94.8%'}} className={global.tableListForm} ref={'search_part'}>
+          <Search search_data={search_data} moreSearchToggle={() => this.moreSearchToggle()}
+            seaSubmit={(data) => this.search(data)} seaReset={() => this.seaReset()}
+          />
+        </div>
+        <div style={{float:'right',marginTop:'-40px',height:"29px",width:"69px"}} onClick={() => this.props.history.goBack()} className={global.add_goods_bottom_btn}>
+          {sldComLanguage('返回')}
+        </div>
+        {/*公共功能条-start*/}
+        <div className={global.operate_bg}>
+          {/* <div>
+            {selectedRowKeys.length == 0 ? sldIconBtn(() => {
+              failTip(`${sldComLanguage('请先选中数据')}`);
+              //确认添加选中的商品吗？
+            }, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006') : sldPopConfirm('leftBottom', `${sldComLanguage('确认添加选中的商品吗？')}`, () => this.operateGoods({ ids: selectedRowKeys.join(',') }, 'add'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldIconBtn(null, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006'), 0, 0, '#f9a006')}
+          </div> */}
+        </div>
+        {/*公共功能条-end*/}
+        <Spin spinning={initLoading}>
+          {/*标准表格-start*/}
+          <StandardTable
+            totalHeight={document.body.clientHeight - 190 - search_height - 15}
+            bordered={false}
+            selectedRows={selectedRows}
+            data={data}
+            rowKey={'goodsId'}
+            isCheck={true}
+            columns={columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'main')}
+            onSldHandleSeleRow={this.onSldHandleSeleRow}
+            resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
+            isColumnResize={true}
+          />
+          {/*标准表格-end*/}
+
+        </Spin>
+
+        { /*新增/编辑对话框-start*/}
+        <SldModal
+          width={modal_width}
+          title={title}
+          submiting={submiting}
+          modalVisible={modalVisible}
+          sldHandleConfirm={(val) => this.sldHandleConfirm(val)}
+          sldHandleCancle={this.sldHandleCancle}
+          formItemLayoutModal={formItemLayoutModal}
+          content={operateData}
+          show_foot={show_foot}
+        />
+        { /*新增/编辑对话框-end*/}
+      </div>
+
+    );
+  }
+}

seller/src/pages/live/live_goods/live_diy_lists.js

@@ -0,0 +1,656 @@
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, Spin, Switch } from 'antd';
+import {
+  sldIconBtn,
+  failTip,
+  sucTip,
+  sldLlineRtextAddGoods,
+  sldHandlePaginationData,
+  list_com_page_size_10,
+  getSldEmptyH, 
+  dragSldTableColumn,
+  validatorVendorPhone,
+  sldLlineRtextAddGoodsAddMargin,
+  formItemLayoutModal,
+  dateTimeFormat,
+  sldComLanguage,
+  sldtbaleOpeBtnText,
+  sldPopConfirmDiy,
+  getSldCopyData,
+  sldSearchValClear,
+} from '@/utils/utils';
+import Link from 'umi/link';
+import { apiUrl } from '@/utils/sldconfig.js';
+import global from '@/global.less';
+import StandardTable from '@/components/StandardTable';
+import SldModal from '@/components/SldModal/SldModal';
+import SldTableEdit from '@/components/SldTableEdit/SldTableEdit';
+import moment from 'moment';
+
+let comm_cur_page = 1;//当前页数
+let pageSize = list_com_page_size_10;
+@connect(({ article }) => ({
+  article,
+}))
+@Form.create()
+export default class live_diy_lists extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      data: {},
+      submiting: false,//按钮loading
+      loading: false,//按钮loading
+      selectedRows: [],
+      selectedRowKeys: [],//selectedRows的key
+      modalVisible: false,
+      title: '',
+      search_con: '',
+      type: 'add',//'add'新增  'edit'编辑
+      params: { pageSize: pageSize },//搜索条件
+      curData: {},//编辑的数据
+      addData: [
+          {
+              type: 'input',
+              label: `${
+                  sldComLanguage('直播商品间名字')
+              }`,
+              name: 'name',
+              placeholder: `${
+                  sldComLanguage('请输入直播商品间名字')
+              }`,
+              extra: `${
+                  sldComLanguage('最短3个汉字，最长17个汉字')
+              }`,
+              initialValue: '',
+              minLength: 3,
+              maxLength: 17,
+              rules: [
+                  {
+                      required: true,
+                      whitespace: true,
+                      message: `${
+                          sldComLanguage('请输入直播商品间名字')
+                      }`,
+                      
+                  }
+              ],
+              
+          },
+          {
+              type: 'rangepicker',
+              label: `${sldComLanguage('开播时间')}`,
+              name: 'search_create_time',
+              placeholder1: `${sldComLanguage('开始时间')}`,
+              placeholder2: `${sldComLanguage('结束时间')}`,
+              show_time: true,
+              extra: `${
+                  sldComLanguage('开播时间需要在当前时间的10分钟后,开播时间和结束时间间隔不得短于30分钟，不得超过24小时')
+              }`,
+              rules: [
+                {
+                    required: true,
+                    message: `${
+                      sldComLanguage('请输入时间')
+                    }`,
+                }
+            ],
+          },
+          {
+              type: 'input',
+              label: `${
+                  sldComLanguage('主播昵称')
+              }`,
+              name: 'anchorName',
+              placeholder: `${
+                  sldComLanguage('请输入主播昵称')
+              }`,
+              extra: `${
+                  sldComLanguage('最短2个汉字，最长15个汉字')
+              }`,
+              initialValue: '',
+              minLength: 2,
+              maxLength: 15,
+              rules: [
+                  {
+                      required: true,
+                      whitespace: true,
+                      message: `${
+                          sldComLanguage('请输入主播昵称')
+                      }`,
+                      
+                  }
+              ],
+              
+          },
+          {
+            type: 'input',
+            label: `${
+                sldComLanguage('主播微信号')
+            }`,
+            name: 'anchorWechat',
+            placeholder: `${
+                sldComLanguage('请输入主播微信号')
+            }`,
+            extra: `${
+                sldComLanguage('如果未实名认证，需要进行实名验证')
+            }`,
+            initialValue: '',
+            minLength: 2,
+            maxLength: 15,
+            rules: [
+                {
+                    required: true,
+                    whitespace: true,
+                    message: `${
+                        sldComLanguage('请输入主播微信号')
+                    }`,
+                    
+                }
+            ],
+        },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('背景图')}`,//背景图
+              name: 'coverImg',
+              extra: `${sldComLanguage('建议像素1080*1920，大小不超过2M')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'coverImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required: true,
+          },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('分享图')}`,//分享图
+              name: 'shareImg',
+              extra: `${sldComLanguage('建议像素800*640，大小不超过1M')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'shareImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required: true,
+          },
+          {
+              type: 'upload_img_upload',
+              label: `${sldComLanguage('购物直播商品频道封面图')}`,//购物直播商品频道封面图
+              name: 'feedsImg',
+              extra: `${sldComLanguage('建议像素800*800，大小不超过100KB')}`,
+              fileList: [],
+              upload_name: 'multipartFile',
+              upload_url: apiUrl + `v3/live/seller/broad/upload`,
+              uploadChange: (info) => this.uploadImg(info, 'feedsImg'),
+              uploadPreview: this.uploadImgPre,
+              initialValue: '',
+              required : true,
+          },
+          // {
+          //     type: 'switch',
+          //     label: `${sldComLanguage('直播商品间类型')}`,
+          //     name: 'type',
+          //     placeholder: ``,
+          //     initialValue: 1,
+          // },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭点赞')}`,
+              name: 'closeLike',
+              placeholder: ``,
+              checked:0,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭货架')}`,
+              name: 'closeGoods',
+              placeholder: ``,
+              checked:1,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭评论')}`,
+              name: 'closeComment',
+              placeholder: ``,
+              checked:true,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('开启官方收录')}`,
+              name: 'isFeedsPublic',
+              placeholder: ``,
+              checked:false,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭回放')}`,
+              name: 'closeReplay',
+              placeholder: ``,
+              checked:true,
+              initialValue: true,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭分享')}`,
+              name: 'closeShare',
+              placeholder: ``,
+              initialValue: 1,
+          },
+          {
+              type: 'switch',
+              label: `${sldComLanguage('是否关闭客服')}`,
+              name: 'closeKf',
+              placeholder: ``,
+              initialValue: 1,
+          },
+          
+      ],//modal框的数据
+      columns: [
+        {
+          title: ' ',
+          dataIndex: 'roomId',
+          align: 'center',
+          width: 55,
+          render: (text, record, index) => {
+            return (comm_cur_page - 1) * pageSize + index + 1;
+          },
+        },
+        {
+          title: `${sldComLanguage('直播商品名称')}`,
+          align: 'center',
+          dataIndex: 'name',
+          width: 200,
+        },
+        {
+          title: `${sldComLanguage('价格')}`,
+          dataIndex: 'price',
+          align: 'center',
+          width: 150,
+        },
+        {
+          title: `${sldComLanguage('状态')}`,
+          dataIndex: 'auditStatusName',
+          align: 'center',
+          width: 150,
+        },
+        {
+          title: `${sldComLanguage('操作')}`,
+          align: 'center',
+          width: 100,
+          render: (text, record) => (
+            <Fragment>
+              {/* <span className={global.splitLine}></span>
+              {sldtbaleOpeBtnText(`${sldComLanguage('编辑')}`, () => this.editMDiyPage(record))} */}
+              <span className={global.splitLine}></span>
+              {sldPopConfirmDiy('leftBottom', `${sldComLanguage('删除后不可恢复，是否确定删除')}`, () => this.operateMDiyPage(record.roomId, 'del'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`,
+                sldtbaleOpeBtnText(`${sldComLanguage('删除')}`, () => null))//删除后不可恢复，是否确定删除？
+              }
+            </Fragment>
+          ),
+        },
+      ],
+      modalTitle: '',
+    };
+  }
+
+  componentDidMount() {
+    this.get_list({ pageSize: pageSize });
+  }
+
+  componentWillUnmount() {
+
+  }
+
+  //预览图片
+  uploadImgPre = (info) => {
+    this.viewImg(true, info.name);
+  };
+
+  //上传图片 dataType:用于区分更改那个数据
+  uploadImg = (info, dataType) => {
+    let { addData } = this.state;
+    console.log(info)
+    for (let i in addData) {
+      if (addData[i].name == dataType) {
+        addData[i].fileList = info.fileList;
+        addData[i].img_succ_info = (info.file.response != undefined && info.fileList.length > 0 && info.file.response.data != undefined) ? info.file.response.data : [];
+      }
+    }
+    this.setState({ addData });
+  };
+
+  //获取数据列表
+  get_list = (params) => {
+    const { dispatch } = this.props;
+    dispatch({
+      type: 'mgoods/get_live_page_lists',
+      payload: { ...params, type: 'home' },
+      callback: (res) => {
+        this.setState({ loading: false });
+        if (res.state == 200) {
+          if (res.data.list.length == 0 && this.state.params.current > 1) {
+            params.current = params.current - 1;
+            this.get_list(params);
+          } else {
+            this.setState({
+              data: res.data,
+              isReset: false,
+            });
+          }
+        }
+      },
+    });
+  };
+
+  handleSelectRows = (rows, rowkeys) => {
+    this.setState({
+      selectedRows: rows,
+      selectedRowKeys: rowkeys,
+    });
+  };
+
+  handleTablePagination = (pagination, filtersArg, sorter, type = 'main') => {
+    const { formValues } = this.state;
+    if (type == 'main') {
+      const params = sldHandlePaginationData(pagination, filtersArg, sorter, formValues);
+      pageSize = params.pageSize;
+      this.setState({ params });
+      this.get_list(params);
+    }
+  };
+
+  //装修直播商品操作，edit 编辑，del 删除
+  operateMDiyPage = (id, type) => {
+    const { dispatch } = this.props;
+    let dis_type = '';
+    let params = { roomId: id };
+    if (type == 'edit') {
+      dis_type = 'mlive/edit_m_live_page';
+      params = id;
+    } else if (type == 'del') {
+      dis_type = 'mlive/del_m_live_page';
+    }
+    dispatch({
+      type: dis_type,
+      payload: params,
+      callback: (res) => {
+        if (res.state == 200) {
+          sucTip(res.msg);
+          this.get_list(this.state.params);
+          this.setState({
+            modalVisible: false,
+          });
+        } else {
+          failTip(res.msg);
+        }
+        this.setState({ submiting: false });
+      },
+    });
+  };
+
+  sldHandleConfirm = (val) => {
+    this.setState({ submiting: true });
+    const { addData, curData, type } = this.state;
+    const { dispatch } = this.props;
+    console.log(val)
+    if (val.search_create_time) {
+      val.startTimeStr = val.search_create_time[0] ? val.search_create_time[0].format(dateTimeFormat) : '';
+      val.endTimeStr = val.search_create_time[1] ? val.search_create_time[1].format(dateTimeFormat) : '';
+      var nowTime = new Date().getTime();
+      var startTime = new Date(val.startTimeStr).getTime();
+      var endTime = new Date(val.endTimeStr).getTime();
+      console.log("nowTime: "+nowTime+" startTime: "+startTime+" endTime: "+endTime)
+      if(startTime-nowTime<600000){
+        failTip("开始时间需要在当前时间的10分钟后 并且 开始时间不能在 6 个月后");
+        this.setState({ submiting: false });
+        return;
+      }
+      if(endTime-startTime<1800000 || endTime-startTime>86400000 ){
+        failTip("开播时间和结束时间间隔不得短于30分钟，不得超过24小时");
+        this.setState({ submiting: false });
+        return;
+      }
+      delete val.search_create_time;
+    }
+    for (let i in addData) {
+      if (addData[i].name == 'coverImg') {
+        val.coverImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.coverImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      } else if (addData[i].name == 'shareImg') {
+        val.shareImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.shareImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      } else if (addData[i].name == 'feedsImg') {
+        val.feedsImg = addData[i].img_succ_info != undefined && addData[i].img_succ_info.mediaId != undefined ? addData[i].img_succ_info.mediaId : '';
+        val.feedsImgPath = addData[i].img_succ_info != undefined && addData[i].img_succ_info.path != undefined ? addData[i].img_succ_info.path : '';
+      }
+    }
+    if(val.name.length<3){
+      failTip("直播商品间名字，最短3个汉字");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.anchorName.length<2){
+      failTip("主播昵称，最短2个汉字");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.coverImg == ''){
+      failTip("背景图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.shareImg == ''){
+      failTip("分享图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    if(val.feedsImg == ''){
+      failTip("购物直播商品频道封面图 不能为空");
+      this.setState({ submiting: false });
+      return;
+    }
+    // val.type = val.type ? 1:0;
+    val.closeLike = val.closeLike ? 1:0;
+    val.closeGoods = val.closeGoods ? 1:0;
+    val.closeComment = val.closeComment ? 1:0;
+    val.isFeedsPublic = val.isFeedsPublic ? 1:0;
+    val.closeReplay = val.closeReplay ? 1:0;
+    val.closeShare = val.closeShare ? 1:0;
+    val.closeKf = val.closeKf ? 1:0;
+    console.log(val);
+    let dis_type = '';
+    if (type == 'edit') {
+      val.roomId = curData.roomId;
+      dis_type = 'mlive/edit_m_live_page';
+    }else{
+      dis_type = 'mlive/add_m_live_page';
+    }
+    dispatch({
+      type: dis_type,
+      payload: val,
+      callback: (res) => {
+        if (res.state == 200) {
+          sucTip(res.msg);
+          this.get_list({ pageSize: pageSize });
+          this.setState({
+            modalVisible: false,
+            params: { pageSize: pageSize },
+          });
+        } else {
+          if("qrcode_url" == res.msg){
+            failTip("主播微信号，未实名认证");
+            window.open("https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh", "_blank");
+          }else{
+            failTip(res.msg);  
+          }
+        }
+        this.setState({ submiting: false });
+      },
+    });
+  };
+
+  sldHandleCancle = () => {
+    this.setState({ modalVisible: false, modalVisibleAdv: false });
+  };
+
+  //表格拖动
+  resizeTable = (index, size, type, data) => {
+    let datas = dragSldTableColumn(index, size, data);
+    this.setState({ [type]: datas });
+  };
+
+  //新增功能
+  addMDiyPage = () => {
+    let { addData } = this.state;
+    for (let i in addData) {
+      addData[i].initialValue = '';
+      if(addData[i].name.indexOf("Img")){
+        addData[i].fileList = '';
+        addData[i].img_succ_info = '';
+      }
+    }
+    this.setState({
+      modalVisible: true,
+      type: 'add',
+      title: `${sldComLanguage('添加直播商品')}`,
+      addData: addData,
+    });//添加直播商品
+  };
+  //编辑功能
+  editMDiyPage = (record) => {
+    let { addData } = this.state;
+    for (let i in addData) {
+      if (addData[i].name == 'coverImg') {
+        let fileList = [];
+        if (record['coverImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['coverImg'];
+          tmp_data.mediaId = record['coverImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['coverImgPath'];
+          tmp_data.url = record['coverImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['coverImg'],path: record['coverImgPath'] };
+      } else if (addData[i].name == 'shareImg') {
+        let fileList = [];
+        if (record['shareImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['shareImg'];
+          tmp_data.mediaId = record['shareImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['shareImgPath'];
+          tmp_data.url = record['shareImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['shareImg'],path: record['shareImgPath'] };
+      } else if (addData[i].name == 'feedsImg') {
+        let fileList = [];
+        if (record['feedsImg']) {
+          let tmp_data = {};
+          tmp_data.uid = new Date();
+          tmp_data.name = record['feedsImg'];
+          tmp_data.mediaId = record['feedsImg'];
+          tmp_data.status = 'done';
+          tmp_data.path = record['feedsImgPath'];
+          tmp_data.url = record['feedsImgUrl'];
+          fileList.push(tmp_data);
+        }
+        addData[i].fileList = fileList;
+        addData[i].img_succ_info = { mediaId: record['feedsImg'],path: record['feedsImgPath'] };
+      } else{
+        addData[i].initialValue = record[addData[i].name];
+      }
+    }
+    addData[1].initialValue=[moment(record["startTimeStr"]),moment(record["endTimeStr"])]
+    this.setState({
+      modalVisible: true,
+      type: 'edit',
+      title: `${sldComLanguage('编辑直播商品')}`,
+      addData: addData,
+      curData: record,
+    });//编辑直播商品
+  };
+
+  //搜索
+  sldSearch = (val) => {
+    this.setState({
+      formValues: { name: val,params: { pageSize: pageSize } },
+    });
+    this.get_list({ pageSize: pageSize, name: val });
+  };
+
+  //搜索框内容的变化
+  sldSearChange = (val) => {
+    this.setState({
+      search_con: val.target.value,
+    });
+  };
+
+  //清空搜索内容
+  sldSearClear = () => {
+    this.setState({
+      search_con: '',
+    });
+    this.sldSearch('');
+  };
+
+  render() {
+    const { selectedRows, modalVisible, title, addData, columns, submiting, data, loading, search_con, modalTitle, modalVisibleAdv, screen_data } = this.state;
+    return (
+      <div className={global.common_page}>
+        {sldLlineRtextAddGoodsAddMargin('#69A2F2', `${sldComLanguage('直播商品页面')}`, 0, 0, 10)}
+        <Spin spinning={loading}>
+          { /*公共功能条-start*/}
+          <div className={global.operate_bg}>
+            <Link to={{
+              pathname: '/live/goods_live_edit'
+              // pathname: '/live/goods_live_edits'
+              // pathname: '/promotion/coupon_list_to_add',
+            }}>
+            {sldIconBtn(() => null, `${sldComLanguage('新建直播商品商品')}`)}
+            </Link>
+            {sldSearchValClear(`${sldComLanguage('请输入直播商品名称')}`, 291, this.sldSearch, `${sldComLanguage('搜索')}`, search_con, this.sldSearChange, this.sldSearClear, 65)}
+          </div>
+          { /*公共功能条-end*/}
+          { /*标准表格-start*/}
+          <StandardTable
+            totalHeight={document.body.clientHeight - 160}
+            selectedRows={selectedRows}
+            data={data}
+            rowKey={'roomId'}
+            isCheck={false}
+            columns={columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'main')}
+            resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
+            isColumnResize={true}
+          />
+          { /*标准表格-end*/}
+          { /*新增/编辑对话框-start*/}
+          <SldModal
+            title={title}
+            width={600}
+            submiting={submiting}
+            modalVisible={modalVisible}
+            sldHandleConfirm={(val) => this.sldHandleConfirm(val)}
+            sldHandleCancle={this.sldHandleCancle}
+            formItemLayoutModal={formItemLayoutModal}
+            content={addData}
+          />
+          { /*新增/编辑对话框-end*/}
+        </Spin>
+      </div>
+    );
+  }
+}

seller/src/pages/live/live_goods/live_edit_goods_lists.js

@@ -0,0 +1,399 @@
+/*
+* 商品管理——在售商品
+* */
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, Spin, Tooltip } from 'antd';
+import Link from 'umi/link';
+import router from 'umi/router';
+import {
+  failTip,
+  sucTip,
+  list_com_page_size_5,
+  dragSldTableColumn,
+  getTableNum,
+  sldComLanguage,
+  sldPopConfirm,
+  dateFormat,
+  sldHandlePaginationData,
+  sldtbaleOpeBtnText,
+  sldIconBtn,
+  formItemLayoutModal,
+  getSldListGoodsImg80,
+  list_com_page_more,
+} from '@/utils/utils';
+import global from '@/global.less';
+import styles from './product.less';
+import StandardTable from '@/components/StandardTable';
+import Search from '@/components/Search/Search';
+import SldModal from '@/components/SldModal/SldModal';
+
+let pageSize = list_com_page_size_5;
+@connect(({ product }) => ({
+  product,
+}))
+@Form.create()
+export default class GoodsOnlineLists extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      search_height:0,
+      modal_width: 700,
+      modalVisibleDetail: false,
+      initLoading: false,
+      submiting: false,
+      show_foot: false,
+      modalVisible: false,//是否显示规格弹框
+      data: {},//列表数据
+      selectedRows: [],
+      selectedRowKeys: [],//selectedRows的key
+      title: `${sldComLanguage('商品规格')}`,
+      type: 'add',//'add'新增  'edit'编辑
+      params: { pageSize: pageSize },//搜索条件
+      search_data: [{
+        type: 'input',
+        label: `${sldComLanguage('商品名称')}`,
+        name: 'goodsName',
+        placeholder: `${sldComLanguage('请输入商品名称')}`,
+      },],
+      formValues: {},//搜索条件
+      addData: [{
+        type: 'select',
+        label: `${sldComLanguage('顶部版式')}`,
+        name: 'topTemplateId',
+        placeholder: `${sldComLanguage('请选择顶部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }, {
+        type: 'select',
+        label: `${sldComLanguage('底部版式')}`,
+        name: 'bottomTemplateId',
+        placeholder: `${sldComLanguage('请选择底部关联版式')}`,
+        sel_data: [],
+        sele_key: 'templateId',
+        sele_name: 'templateName',
+        diy: true,
+      }],//设置关联版式的数据
+      operateData: [],
+      columns: [
+        {
+          title: ' ',
+          align: 'center',
+          width: 30,
+          render: (text, record, index) => getTableNum(this.state.params, pageSize, index),
+        },
+        {
+          title: `${sldComLanguage('商品信息')}`,
+          dataIndex: 'mainImage',
+          align: 'center',
+          width: 250,
+          render: (text, record) => {
+            return <div className={`${styles.goods_info} ${global.com_flex_row_flex_start}`}>
+              <div className={styles.goods_img}>{getSldListGoodsImg80(text)}</div>
+              <div className={`${global.com_flex_column_space_between} ${styles.goods_detail}`}>
+                <span className={styles.goods_name}>
+                  {record.goodsName}
+                </span>
+                <span className={styles.goods_brief}>
+                  {record.categoryPath}
+                </span>
+              </div>
+            </div>;
+          },
+        },
+        {
+          title: `${sldComLanguage('商品价格')}`,
+          dataIndex: 'goodsPrice',
+          align: 'center',
+          width: 100,
+        },
+        {
+          title: `${sldComLanguage('商品库存')}`,
+          dataIndex: 'goodsStock',
+          align: 'center',
+          width: 100,
+          render: (text, record, index) => {
+            return <span style={{
+              color: record.warning ? '#FF490A' : '#696969',
+              fontWeight: record.warning ? '700' : '500',
+            }}>{text}</span>;
+          },
+        },
+        {
+          title: `${sldComLanguage('实际/虚拟销量')}`,
+          dataIndex: 'actualSales',
+          align: 'center',
+          width: 150,
+          render: (text, record) => {
+            return <div>{record.actualSales}/{record.virtualSales}</div>;
+          },
+        },
+        {
+          title: `${sldComLanguage('是否推荐')}`,
+          dataIndex: 'storeIsRecommend',
+          align: 'center',
+          width: 100,
+          render: (text, record) => {
+            return text == 1 ? `${sldComLanguage('推荐')}` : `${sldComLanguage('不推荐')}`;
+          },
+        },
+        {
+          title: `${sldComLanguage('发布时间')}`,
+          dataIndex: 'createTime',
+          align: 'center',
+          width: 150,
+        },
+      ],
+    };
+  }
+
+
+  componentDidMount() {
+    this.get_list({ pageSize: pageSize });
+    this.getTemplateList();
+    this.resize();
+    window.addEventListener('resize', this.resize);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('resize', this.resize);
+  }
+
+  resize = () =>{
+    const {search_height} = this.state;
+    if(this.refs.search_part!=undefined){
+      if(this.refs.search_part.clientHeight != search_height){
+        this.setState({search_height:this.refs.search_part.clientHeight})
+      }
+    }
+  }
+
+
+  sldHandleConfirm = (val) => {
+    const { selectedRowKeys } = this.state;
+    val.goodsIds = selectedRowKeys.join(',');
+    if (val.topTemplateId == undefined && val.bottomTemplateId == undefined) {
+      failTip(`${sldComLanguage('请至少选择一个模版')}`);
+      return false;
+    }
+    this.operateGoods(val, 'template');
+  };
+
+  // 查看规格
+  viewSpec = (val) => {
+    let { view_spec_data, operateData } = this.state;
+    operateData = JSON.parse(JSON.stringify(view_spec_data));
+    operateData[0].columns = this.goods_spec_columns;
+    operateData[0].data = val.productList;
+    this.setState({
+      modalVisible: true,
+      show_foot: false,
+      title: `${sldComLanguage('查看规格')}`,
+      modal_width: 700,
+      operateData,
+    });
+  };
+
+  //商品操作
+  operateGoods = (id, type) => {
+    this.setState({ submiting: true });
+    const { params } = this.state;
+    const { dispatch } = this.props;
+    let param_data = {};
+    let dis_type = '';
+    if (type == 'add') {
+      dis_type = 'mgoods/add_goods';
+      param_data = id;
+    } 
+    console.log(param_data)
+    dispatch({
+      type: dis_type,
+      payload: param_data,
+      callback: (res) => {
+        this.setState({ submiting: false });
+        if (res.state == 200) {
+          sucTip(res.msg);
+        } else {
+          failTip(res.msg);
+        }
+      },
+    });
+  };
+
+  //获取数据列表
+  get_list = (params) => {
+    this.setState({ initLoading: true });
+    const { dispatch } = this.props;
+    dispatch({
+      type: 'product/get_goods_lists',
+      payload: { ...params, state: 3 },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          if (res.data.length == 0 && this.state.params.current > 1) {
+            params.current = params.current - 1;
+            this.get_list(params);
+          } else {
+            res.data.list.map(item=>{
+              item.disabled = item.isLock == 1?true:false;
+            })
+            this.setState({
+              data: res.data,
+            });
+          }
+        }
+      },
+    });
+  };
+
+  //获取关联版式列表
+  getTemplateList = () => {
+    const { dispatch } = this.props;
+    let { addData } = this.state;
+    dispatch({
+      type: 'product/get_related_template_lists',
+      payload: { pageSize: list_com_page_more },
+      callback: (res) => {
+        this.setState({ initLoading: false });
+        if (res.state == 200) {
+          let topData = res.data.list.filter(item => item.templatePosition == 1);
+          let bottomData = res.data.list.filter(item => item.templatePosition == 2);
+          for (let i in addData) {
+            if (addData[i].name == 'topTemplateId') {
+              addData[i].sel_data = topData;
+            } else {
+              addData[i].sel_data = bottomData;
+            }
+          }
+          this.setState({ addData });
+        }
+      },
+    });
+  };
+
+  handleSelectRows = (rows, rowkeys) => {
+    this.setState({
+      selectedRows: rows,
+      selectedRowKeys: rowkeys,
+    });
+  };
+
+  handleTablePagination = (pagination, filtersArg, sorter, type = 'main') => {
+    const { formValues } = this.state;
+    if (type == 'main') {
+      const params = sldHandlePaginationData(pagination, filtersArg, sorter, formValues);
+      pageSize = params.pageSize;
+      this.setState({ params });
+      this.get_list(params);
+    }
+  };
+
+  //表格拖动
+  resizeTable = (index, size, type, data) => {
+    let datas = dragSldTableColumn(index, size, data);
+    this.setState({ [type]: datas });
+  };
+
+  //搜索事件
+  search = (data) => {
+    const values = { ...data };
+    
+    for (let i in values) {
+      if (values[i] == '') {
+        delete values[i];
+      }
+    }
+    this.setState({
+      formValues: values,
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize, ...values });
+  };
+  //搜索重置事件
+  seaReset = () => {
+    //搜索条件置为空
+    this.setState({
+      formValues: {},
+      params: { pageSize: pageSize }
+    });
+    this.get_list({ pageSize: pageSize });
+  };
+
+  sldHandleCancle = () => {
+    this.setState({ modalVisible: false });
+  };
+
+
+  //搜索点击
+  moreSearchToggle = () => {
+    const {search_height} = this.state;
+    if(this.refs.search_part!=undefined){
+      if(this.refs.search_part.clientHeight != search_height){
+        this.setState({search_height:this.refs.search_part.clientHeight})
+      }
+    }
+  }
+
+  render() {
+    const { selectedRows, selectedRowKeys, search_data, columns, initLoading, data, modalVisible, operateData, title, modal_width, show_foot, submiting, search_height } = this.state;
+    return (
+      <div className={global.common_page} style={{ flex: 1, padding: 0 }}>
+        <div style={{width:'94.8%'}} className={global.tableListForm} ref={'search_part'}>
+          <Search search_data={search_data} moreSearchToggle={() => this.moreSearchToggle()}
+                  seaSubmit={(data) => this.search(data)} seaReset={() => this.seaReset()}/>
+        </div>
+        <div style={{float:'right',marginTop:'-2.2%',height:"29px",width:"69px"}} onClick={() => this.props.history.goBack()} className={global.add_goods_bottom_btn}>
+          {sldComLanguage('返回')}
+        </div>
+        {/*公共功能条-start*/}
+        <div className={global.operate_bg}
+             style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
+          <div style={{ display: 'flex', flexDirection: 'row' }}>
+            {selectedRowKeys.length == 0 ? sldIconBtn(() => {
+              failTip(`${sldComLanguage('请先选中数据')}`);
+              //确认添加选中的商品吗？
+            }, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006') : sldPopConfirm('leftBottom', `${sldComLanguage('确认添加选中的商品吗？')}`, () => this.operateGoods({ goodsIds: selectedRowKeys.join(',') }, 'add'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldIconBtn(null, `${sldComLanguage('添加')}`, 7, 0, 13, 13, 3, 'ziyuan31', '#f9a006'), 0, 0, '#f9a006')}
+
+          </div>
+        </div>
+        {/*公共功能条-end*/}
+        <Spin spinning={initLoading}>
+          {/*标准表格-start*/}
+          <StandardTable
+            totalHeight={document.body.clientHeight - 190 - search_height - 15}
+            bordered={false}
+            selectedRows={selectedRows}
+            data={data}
+            rowKey={'goodsId'}
+            isCheck={true}
+            columns={columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'main')}
+            onSldHandleSeleRow={this.onSldHandleSeleRow}
+            resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
+            isColumnResize={true}
+          />
+          {/*标准表格-end*/}
+
+        </Spin>
+
+        { /*新增/编辑对话框-start*/}
+        <SldModal
+          width={modal_width}
+          title={title}
+          submiting={submiting}
+          modalVisible={modalVisible}
+          sldHandleConfirm={(val) => this.sldHandleConfirm(val)}
+          sldHandleCancle={this.sldHandleCancle}
+          formItemLayoutModal={formItemLayoutModal}
+          content={operateData}
+          show_foot={show_foot}
+        />
+        { /*新增/编辑对话框-end*/}
+      </div>
+
+    );
+  }
+}

seller/src/pages/live/live_goods/product.less

@@ -0,0 +1,83 @@
+.right_nav {
+  position: fixed;
+  top: 20vh;
+  right: 10px;
+  width:120px;
+  background:rgba(255,255,255,1);
+  box-shadow:0 0 15px 0 rgba(153,153,153,0.15);
+  .nav_title{
+    height:38px;
+    line-height: 38px;
+    width: 100%;
+    display: inline-block;
+    background:rgba(236,245,255,1);
+    text-align:center;
+    color: #08A9B7;
+    font-size: 14px;
+    font-weight: 700;
+  }
+  .nav_item{
+    color: #999;
+    font-size: 12px;
+    font-weight: 700;
+    padding: 9px 35px 9px 26px;
+    width:111px;
+    height:30px;
+    line-height: 12px;
+    background:#fff;
+    border-radius:15px 0 0 15px;
+    display: block;
+    margin: 10px 0 10px 9px;
+  }
+  .nav_item:hover,.nav_item.nav_sel{
+    color: #333;
+    background:rgba(65,157,253,.1);
+  }
+}
+
+.goods_detail_body{
+  border: 1px solid #F2F2F2;
+  padding: 15px;
+}
+
+.goods_info{
+  .goods_detail{
+    height: 80px;
+    margin-left: 10px;
+    flex: 1;
+  }
+  .goods_img{
+    width:80px;
+    height:80px;
+    background:rgba(248,248,248,1);
+    border:1px solid rgba(226,229,246,1);
+    border-radius:3px;
+    overflow: hidden;
+    display: inline-block;
+  }
+  .goods_name{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    word-break: break-word;
+    color:#333;
+    font-size: 14px;
+    line-height: 17px;
+    text-align: left;
+    height: 34px;
+    flex-shrink: 0;
+  }
+  .goods_brief{
+    color: #666;
+    font-size: 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: left;
+    width: 100%;
+    display: inline-block;
+  }
+}

seller/src/pages/live/models/mgoods.js

@@ -0,0 +1,41 @@
+import { sldCommonService } from '@/utils/utils';
+
+export default {
+	
+	namespace: 'mgoods',
+	state: {
+		loading: false,// 加载状态
+		data: {
+			list: [],
+			pagination: {},
+		},
+	},
+
+	effects: {
+		//slodon_直播_获取直播页列表 
+		* get_live_page_lists({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/goods/list');
+			if (callback) callback(response);
+		},
+		//slodon_直播_获取直播间绑定商品列表 
+		* get_live_goods_relation_lists({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/goods/list/relation');
+			if (callback) callback(response);
+		},
+		//slodon_直播_添加移动端直播页面
+		* add_goods({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'post', 'v3/live/seller/goods/add');
+			if (callback) callback(response);
+		},
+		//slodon_直播_编辑移动端直播页面
+		* edit_m_live_page({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'post', 'v3/live/seller/broad/wxBroadcastRoomEdit');
+			if (callback) callback(response);
+		},
+		//slodon_直播_删除移动端直播页面
+		* del_m_live_page({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/goods/wxDelLive');
+			if (callback) callback(response);
+		},
+	},
+};

seller/src/pages/live/models/mlive.js

@@ -0,0 +1,41 @@
+import { sldCommonService } from '@/utils/utils';
+
+export default {
+	
+	namespace: 'mlive',
+	state: {
+		loading: false,// 加载状态
+		data: {
+			list: [],
+			pagination: {},
+		},
+	},
+
+	effects: {
+		//slodon_直播_获取直播页列表 
+		* get_live_page_lists({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/broad/list');
+			if (callback) callback(response);
+		},
+		//slodon_直播_添加移动端直播页面
+		* add_m_live_page({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'post', 'v3/live/seller/broad/wxBroadcastRoomCreate');
+			if (callback) callback(response);
+		},
+		//slodon_直播_编辑移动端直播页面
+		* edit_m_live_page({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'post', 'v3/live/seller/broad/wxBroadcastRoomEdit');
+			if (callback) callback(response);
+		},
+		//slodon_直播_删除移动端直播页面
+		* del_m_live_page({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/broad/wxDelLive');
+			if (callback) callback(response);
+		},
+		//slodon_直播_直播添加商品
+		* add_live_goods({ payload, callback }, { call, put }) {
+			const response = yield call(sldCommonService, payload, 'get', 'v3/live/seller/broad/wxAddLiveGoods');
+			if (callback) callback(response);
+		},
+	},
+};

seller/src/pages/live/models/product.js

@@ -0,0 +1,196 @@
+import { sldCommonService } from '@/utils/utils';
+import { sldComLanguage } from '@/utils/utils';
+
+export default {
+  namespace: 'product',
+  state: {
+    loading: false,//加载状态
+    data: {
+      list: [],
+      pagination: {},
+    },
+  },
+
+  effects: {
+     //slodon_获取分类列表_根据分类id获取下级分类
+    * get_cate_list_by_id({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/seller/goodsCategory/list`);
+      if (callback) callback(response);
+    },
+    //slodon_获取商品规格列表
+    * get_goods_spec_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/seller/goodsSpec/list`);
+      if (callback) callback(response);
+    },
+    //slodon_添加商品规格
+    * add_goods_spec({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goodsSpec/add`);
+      if (callback) callback(response);
+    },
+    //slodon_添加商品规格值
+    * add_goods_spec_val({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goodsSpec/addSpecValue`);
+      if (callback) callback(response);
+    },
+    //slodon_批量设置推荐/取消推荐商品
+    * set_goods_recommend({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/isRecommend`);
+      if (callback) callback(response);
+    },
+    //slodon_获取商品标签列表
+    * get_goods_label_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/seller/goodsLabel/list`);
+      if (callback) callback(response);
+    },
+    //slodon_删除商品标签
+    * del_goods_label({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/admin/goodsLabel/del`);
+      if (callback) callback(response);
+    },
+    //slodon_添加商品标签
+    * add_goods_label({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/admin/goodsLabel/add`);
+      if (callback) callback(response);
+    },
+    //slodon_编辑商品标签
+    * edit_goods_label({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/admin/goodsLabel/edit`);
+      if (callback) callback(response);
+    },
+    //slodon_获取分类绑定的品牌和属性信息
+    * get_brand_attr_detail({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsAttribute/listByCategoryId');
+      if (callback) callback(response);
+    },
+    //slodon_发布商品
+    * add_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goods/add', 'json');
+      if (callback) callback(response);
+    },
+    //slodon_获取店铺分类列表
+    * get_store_category_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/seller/seller/storeCategory/list');
+      if (callback) callback(response);
+    },
+    //slodon_获取商品详情
+    * get_goods_detail({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goods/getGoodsInfo');
+      if (callback) callback(response);
+    },
+    //slodon_编辑商品
+    * edit_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goods/edit', 'json');
+      if (callback) callback(response);
+    },
+    //slodon_获取商品列表
+    * get_goods_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goods/list');
+      if (callback) callback(response);
+    },
+    //slodon_商品列表_下架商品
+    * lockup_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/lockup`);
+      if (callback) callback(response);
+    },
+    //slodon_商品列表_上架商品
+    * up_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/upperShelf`);
+      if (callback) callback(response);
+    },
+    //slodon_商品列表_删除商品
+    * del_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/deleteGoods`);
+      if (callback) callback(response);
+    },
+    // slodon_获取关联版式列表
+    * get_related_template_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/seller/goodsRelatedTemplate/list`);
+      if (callback) callback(response);
+    },
+    //slodon_ 添加关联版式
+    * add_related_template({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goodsRelatedTemplate/add`);
+      if (callback) callback(response);
+    },
+    //slodon_获取关联版式详情
+    * get_related_template_detail({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/seller/goodsRelatedTemplate/details`);
+      if (callback) callback(response);
+    },
+    //slodon_ 编辑关联版式
+    * edit_related_template({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goodsRelatedTemplate/edit`);
+      if (callback) callback(response);
+    },
+    //slodon_删除关联版式
+    * del_related_template({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goodsRelatedTemplate/delete`);
+      if (callback) callback(response);
+    },
+    //slodon_为商品批量设置关联版式
+    * set_related_template({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/setRelatedTemplate`);
+      if (callback) callback(response);
+    },
+    //slodon_获取属性分组列表
+    * get_attribute_group_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsParameterGroup/list');
+      if (callback) callback(response);
+    },
+    //slodon_获取可用的属性分组列表
+    * get_attribute_group_lists_can_use({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsParameterGroup/canUseList');
+      if (callback) callback(response);
+    },
+    //slodon_添加属性分组
+    * add_attribute_group({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameterGroup/add');
+      if (callback) callback(response);
+    },
+    //slodon_编辑属性分组
+    * edit_attribute_group({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameterGroup/edit');
+      if (callback) callback(response);
+    },
+    //slodon_删除属性分组
+    * del_attribute_group({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameterGroup/del');
+      if (callback) callback(response);
+    },
+    //slodon_获取属性列表
+    * get_attribute_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsParameter/list');
+      if (callback) callback(response);
+    },
+    //slodon_获取可用的属性列表
+    * get_attribute_lists_can_use({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsParameter/canUseList');
+      if (callback) callback(response);
+    },
+    //slodon_添加属性
+    * add_attribute({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameter/add');
+      if (callback) callback(response);
+    },
+    //slodon_编辑属性
+    * edit_attribute({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameter/edit');
+      if (callback) callback(response);
+    },
+    //slodon_删除属性
+    * del_attribute({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', 'v3/goods/seller/goodsParameter/del');
+      if (callback) callback(response);
+    },
+    //slodon_申请通过的商品分类
+    * get_system_seller_cate_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goodsCategory/cateList');
+      if (callback) callback(response);
+    },
+    //slodon_验证是否允许发布商品
+    * check_is_allow_add_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/seller/goods/enablePublish');
+      if (callback) callback(response);
+    },
+  },
+};

seller/src/pages/settledManage/openUp/open_up.js

@@ -33,7 +33,7 @@ export default class openUp extends Component {
       submiting: false,
       check_state: getSettleData('state'),
       detail: {},//入驻详情
-      pay_method: 'alipay',//支付方式
+      pay_method: 'wx',//支付方式
       apply_progress: {},//入驻进度
       store_pay_data: [{
         type: 'show_text',
@@ -289,11 +289,11 @@ export default class openUp extends Component {
             <div>
               <div className={styles.settle_pay}>
                 <Radio.Group onChange={this.handlePayMethod} value={pay_method}>
-                  <Radio value={'alipay'}>
+                  {/* <Radio value={'alipay'}>
                     <div className={`${styles.pay_item} ${global.flex_row_center_center} ${styles.pay_item_mr}`}>
                       <img className={styles.pay_item_img} src={require('@/assets/alipay.png')}/>
                     </div>
-                  </Radio>
+                  </Radio> */}
                   <Radio value={'wx'}>
                     <div className={`${styles.pay_item} ${global.flex_row_center_center}`}>
                       <img className={styles.pay_item_img} src={require('@/assets/wx.png')}/>