审核商品查看详情功能

admin/config/router.config.js

@@ -218,6 +218,12 @@ export default [
             name: 'goods_list',
             component: './manage/product/goods_list',
           },
+          //待审核商品_发布商品
+          {
+            path: '/manage_product/goods_check_list_to_add',
+            name: '',
+            component: './manage/goods/add_goods',
+          },
           //分类管理
           {
             path: '/manage_product/cate_lists',

admin/src/components/SldTableRowTwo/index.js

@@ -598,7 +598,7 @@ export default class SldTableRowTwo extends PureComponent {
 	            backgroundColor: '#FFFAF7',
 	            height: val.item_height!=undefined?val.item_height+2:cur_height + 2,
             }}>
-              {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={{

admin/src/components/SldTableRowTwoSeller/index.js

@@ -0,0 +1,643 @@
+/*
+*发布商品的布局（表单内容）   一行多列  左侧label 右侧内容
+* */
+import React, { PureComponent, Fragment } from 'react';
+import {
+	Form, Select, Icon, Row, Col, Input, InputNumber, DatePicker, TreeSelect, Cascader, Checkbox, Radio, Upload,  Tooltip,
+} from 'antd';
+import global from '@/global.less';
+import styles from './index.less';
+import { sldInputAfterAddons, sldBeforeUpload, getSldComImg, getLocalStorageStingVal,sldBeforeUploadVideo } from '@/utils/utils';
+import ALibbSvg from '@/components/ALibbSvg';
+
+const FormItem = Form.Item;
+const { RangePicker } = DatePicker;
+const InputGroup = Input.Group;
+const RadioGroup = Radio.Group;
+const CheckboxGroup = Checkbox.Group;
+const Option = Select.Option;
+const { TextArea } = Input;
+
+export default class SldTableRowTwo extends PureComponent {
+	constructor(props) {
+		super(props);
+		this.state = {
+			props_data: props,
+		};
+	}
+
+	componentWillReceiveProps(props) {
+		this.setState({
+			props_data: props,
+		});
+	}
+
+	//处理input内容变化事件
+	handleInputOnchange = (e, item) => {
+		if (item.handleChange) {
+			item.handleChange(e);
+		}
+	};
+
+	//处理复选框变化事件
+	handleSingleCheckboxOnchange = (e, item) => {
+		if (item.onChange) {
+			item.onChange(e);
+		}
+	};
+
+	//多选事件
+	sldCheckShop = (items, value) => {
+		if (items.sldCheckShop) {
+			items.sldCheckShop(value);
+		}
+	};
+
+	redioOnChange = (e, val) => {
+		if (val.onChange) {
+			val.onChange(e.target.value);
+		}
+	};
+
+  //图品的点击预览
+  sldShowImgPre = (val,item) => {
+    if (val.preView) {
+      val.preView(true, item);
+    }
+  };
+
+  radio_select = (e, item) => {
+    if (item.callback) {
+      item.callback(e);
+    }
+  };
+
+	commonCon = (val, index) => {
+		let {
+			form: { getFieldDecorator }, item_width,
+		} = this.props;
+		//普通输入框
+		item_width = item_width != undefined ? item_width : 'auto';
+		const uploadButton = (
+			<div>
+				<Icon type="plus"/>
+				<div className="ant-upload-text">上传图片</div>
+			</div>
+		);
+    const uploadButtonVideo = (
+      <div>
+        <Icon type="plus"/>
+        <div className="ant-upload-text">上传视频</div>
+      </div>
+    );
+		if (val.type == 'input') {
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '80%' }}
+				>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+						<Input maxLength={val.maxLength!=undefined?val.maxLength:250} disabled={val.disable != undefined ? val.disable : false} className={styles.item}
+						        placeholder={val.placeholder}/>,
+					)}
+				</FormItem>
+			);
+		}else if (val.type == 'show_text') {
+		  //内容展示，目前用于商品详情页
+      return (<FormItem
+          key={index}
+          extra={val.extra}
+          style={{ width: '80%' }}
+        >
+          <div style={{color:this.props.r_color!=undefined?this.props.r_color:'#999',fontWeight: this.props.r_fontw!=undefined?this.props.r_fontw:'500',lineHeight:'16px'}}>
+            {val.text.length>84
+              ?<Tooltip placement="bottomRight" title={val.text}>
+                <span className={styles.word_break}>{val.text.substring(0,83)}...</span>
+              </Tooltip>
+              :val.text
+            }
+          </div>
+        </FormItem>
+      );
+    }else if (val.type == 'show_text1') {
+        //内容展示，目前用于商品详情页
+    return (<FormItem
+        key={index}
+        extra={val.extra}
+        style={{ width: '80%' }}
+      >
+        <div style={{color:this.props.r_color!=undefined?this.props.r_color:'#999',fontWeight: this.props.r_fontw!=undefined?this.props.r_fontw:'500',lineHeight:'16px'}} title={val.text}>{val.text.length > 30 ? val.text.substring(0,30) + '...' : val.text}</div>
+      </FormItem>
+    );
+  }else if (val.type == 'show_goods_img_more') {
+		  //展示商品图片（多图），目前用于商品详情页
+      return (<FormItem
+          key={index}
+          extra={val.extra}
+          style={{ width: '100%' }}
+        >
+          <div style={{flexDirection:'row',justifyContent:'flex-start',}}>
+            {val.data.length > 0 ?  val.data.map((item,index)=>{
+              return <div key={index} onClick={() => this.sldShowImgPre(val,item.imageUrl)} style={{flexDirection:'row',justifyContent:'center',alignItems:'center',overFlow:'hidden',width:100,height:100,display:'inline-flex',backgroundColor:'#F8F8F8',marginRight:10}}>
+                <img style={{ maxWidth: '100%', maxHeight: '100%' }} src={item.imageUrl} />
+              </div>;
+            })
+              :'--'
+            }
+          </div>
+        </FormItem>
+      );
+    } else if (val.type == 'inputnum') {
+			//数字搜索框
+			return (
+				<FormItem key={index}
+				          style={{ width: '80%' }}
+				          extra={val.extra}
+				>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(<InputNumber
+						min={val.min != undefined ? val.min : 0}
+						max={val.max != undefined ? val.max : 999999999}
+						step={val.step ? val.step : 1} className={styles.item} placeholder={val.placeholder}
+						precision={val.precision != undefined ? val.precision : 0} disabled={val.disable}
+						onChange={(e) => this.handleInputOnchange(e, val)}/>)}
+				</FormItem>
+			);
+
+		} else if (val.type == 'select') {
+			//下拉选择框
+			return (<FormItem
+					key={index}
+					style={{ width: val.width != undefined ? val.width : ' 80%' }}
+					extra={val.extra}
+				>
+					{getFieldDecorator(val.name, val.initialValue ? {
+						initialValue: val.initialValue,
+						rules: val.rules,
+					} : {
+						rules: val.rules,
+					})(
+						<Select placeholder={val.placeholder}
+                    className={styles.item}
+                    onChange={val.onChange}
+                    getPopupContainer={triggerNode => triggerNode.parentNode}
+            >
+							{val.sel_data.map((items, indexs) => {
+								return <Option key={indexs}
+								               value={val.diy != undefined && val.diy ? items[val.sele_key] : items.key}>{val.diy != undefined && val.diy ? items[val.sele_name] : items.name}</Option>;
+							})}
+						</Select>,
+					)}
+				</FormItem>
+			);
+
+		} else if (val.type == 'multiple_select') {
+			//下拉多选框
+			return (<FormItem
+					key={index}
+					style={{ width: val.width != undefined ? val.width : ' 80%' }}
+					extra={val.extra}
+				>
+					{getFieldDecorator(val.name, val.initialValue ? {
+						initialValue: val.initialValue,
+						rules: val.rules,
+					} : {
+						rules: val.rules,
+					})(
+						<Select mode="multiple"
+                    placeholder={val.placeholder}
+                    className={styles.item}
+                    onChange={val.onChange}
+                    getPopupContainer={triggerNode => triggerNode.parentNode}
+            >
+							{val.sel_data.map((items, indexs) => {
+								return <Option key={indexs}
+								               value={val.diy != undefined && val.diy ? items[val.sele_key] : items.key}>{val.diy != undefined && val.diy ? items[val.sele_name] : items.name}</Option>;
+							})}
+						</Select>,
+					)}
+				</FormItem>
+			);
+
+		} else if (val.type == 'textarea') {
+
+			return (<FormItem
+				key={index}
+				help={val.help}
+				extra={val.extra}
+				style={{ width: '100%' }}
+			>
+				{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+					<TextArea className={styles.item}
+                    maxLength={val.maxLength!=undefined?val.maxLength:250}
+					          disabled={val.is_disable != undefined && val.is_disable ? true : false}
+					          style={{ minHeight: 32 }} rows={2} placeholder={val.placeholder}/>,
+				)}
+			</FormItem>);
+		} else if (val.type == 'rangepicker') {
+			//时间范围选择器
+			return (<FormItem
+					key={index}
+					style={{ width: '100%' }}
+					extra={val.extra}
+				>
+					{getFieldDecorator(val.name)(
+						<RangePicker
+							className={styles.item}
+							placeholder={[val.placeholder1, val.placeholder2,]}
+              showTime={val.show_time != undefined ? val.show_time : false}
+              getCalendarContainer={(triggerNode)=>{
+                return triggerNode.parentNode
+              }}
+						/>,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'datepicker') {
+			//时间选择器
+			return (<FormItem key={index}
+			                  extra={val.extra}
+			                  style={{ width: '100%' }}
+				>
+					{val.initialValue && getFieldDecorator(val.name, {
+						initialValue: val.initialValue,
+						rules: val.rules,
+					})(
+						<DatePicker className={styles.item} placeholder={val.placeholder} showTime={val.show_time != undefined ? val.show_time : false}
+              getCalendarContainer={(triggerNode)=>{
+                return triggerNode.parentNode
+              }}
+            />,
+					)}
+					{!val.initialValue && getFieldDecorator(val.name, { rules: val.rules })(
+						<DatePicker className={styles.item} placeholder={val.placeholder} showTime={val.show_time != undefined ? val.show_time : false}
+              getCalendarContainer={(triggerNode)=>{
+                return triggerNode.parentNode
+              }}
+            />,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'rangeval') {
+			//范围选择器
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '100%' }}
+				>
+					<InputGroup compact className={styles.item}>
+						{getFieldDecorator([val.name1])(<Input maxLength={250} style={{ width: '40%', textAlign: 'center' }}
+						                                       placeholder={val.placeholder1}/>)}
+
+						<Input maxLength={250} style={{ width: '20%', borderLeft: 0, pointerEvents: 'none', backgroundColor: '#fff' }}
+						       placeholder="~" disabled/>
+						{getFieldDecorator([val.name2])(<Input
+							style={{ width: '40%', textAlign: 'center', borderLeft: 0 }}
+							placeholder={val.placeholder2}/>)}
+					</InputGroup>
+				</FormItem>
+			);
+
+		} else if (val.type == 'input_after') {
+			//带图标后缀
+			return (<FormItem
+				key={index}
+				extra={val.extra}
+				style={{ width: '100%' }}
+			>
+				<div onClick={() => val.callback(val.operate_obj)}>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+						<Input maxLength={250} style={{ width: 150, marginLeft: 3 }} disabled={true} addonAfter={sldInputAfterAddons()}
+						       placeholder={val.placeholder}/>,
+					)}
+				</div>
+			</FormItem>);
+		} else if (val.type == 'textarea_single') {
+			return <FormItem
+				key={index}
+				extra={val.extra}
+				style={{ width: '100%' }}
+			>
+				{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+					<TextArea className={styles.item} style={{ minHeight: 30 }} rows={1}/>,
+				)}
+			</FormItem>;
+		} else if (val.type == 'TreeSelect') {
+			return <FormItem key={index} extra={val.extra} style={{ width: ' 80%' }}>
+				{getFieldDecorator(val.name, {
+					initialValue: val.initialValue == '' ? undefined : val.initialValue,
+					rules: val.rules,
+				})(
+					<TreeSelect
+						className={styles.item}
+						treeData={val.data}
+						showSearch={true}
+						placeholder={val.placeholder}
+						allowClear={val.allowClear}
+						onSelect={val.onSelect}
+            dropdownStyle={{maxHeight:300}}
+            getPopupContainer={triggerNode => triggerNode.parentNode}
+					/>,
+				)}
+			</FormItem>;
+		} else if (val.type == 'tree_select_more') {
+		  //树选择器——多选
+			return <FormItem key={index} extra={val.extra} style={{ width: ' 80%' }}>
+				{getFieldDecorator(val.name, {
+					initialValue: val.initialValue == '' ? undefined : val.initialValue,
+					rules: val.rules,
+				})(
+					<TreeSelect
+						className={styles.item}
+						treeData={val.data}
+            treeCheckable={true}
+            treeDefaultExpandAll={true}
+            showCheckedStrategy={'SHOW_PARENT'}
+						placeholder={val.placeholder}
+						allowClear={val.allowClear}
+            onChange={val.onChange}
+            dropdownStyle={{maxHeight:300}}
+            getPopupContainer={triggerNode => triggerNode.parentNode}
+					/>,
+				)}
+			</FormItem>;
+		} else if (val.type == 'cascader') {
+			//店铺分类选择
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '80%' }}
+				>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+						<Cascader
+							disabled={val.disable != undefined && val.disable ? val.disable : false}
+							fieldNames={{ label: 'title', value: 'key', children: 'children' }}
+							className={styles.item} options={val.options}
+							placeholder={val.placeholder}/>,
+					)}
+				</FormItem>
+			);
+		}else if (val.type == 'cascader_area') {
+			//三级地址选择
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '80%' }}
+				>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+						<Cascader
+							disabled={val.disable != undefined ? val.disable : false}
+							options={JSON.parse(localStorage.getItem('common_area_list'))}
+							placeholder={val.placeholder}
+						/>,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'single_checkbox') {
+			//选择框
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '100%' }}
+				>
+					{getFieldDecorator(val.name, {
+						valuePropName: 'checked',
+						initialValue: val.initialValue,
+						rules: val.rules,
+					})(
+						<Checkbox
+							disabled={val.disable != undefined && val.disable ? val.disable : false}
+							className={styles.item}
+							onChange={(e) => this.handleSingleCheckboxOnchange(e, val)}
+						>
+							{val.check_con}
+						</Checkbox>,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'radio') {
+			//radio
+			return (<FormItem
+					key={index}
+					extra={val.extra}
+					style={{ width: '100%' }}
+				>
+					{getFieldDecorator(val.name, {
+						valuePropName: 'checked',
+						rules: val.rules,
+						initialValue: val.initialValue,
+					})(
+						<RadioGroup size={'small'} defaultValue={val.initialValue} className={styles.item}
+						            onChange={(e) => this.redioOnChange(e, val)}>
+							{val.sel_data.map((item, index) => {
+								return <Radio key={index} value={item.key}>{item.name}</Radio>;
+							})}
+						</RadioGroup>,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'radio_select') {
+      return (<FormItem
+        key={index}
+        extra={val.extra}
+        style={{ width: '100%' }}
+      >
+        {getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+          <Radio.Group size={'small'} buttonStyle="solid" disabled={val.disable}
+                       onChange={(e) => this.radio_select(e, val)}>
+            {val.data.map((cval, ckey) => {
+              return <Radio.Button key={ckey} value={cval.key}>{cval.value}</Radio.Button>;
+            })}
+
+          </Radio.Group>,
+        )}
+      </FormItem>);
+    } else if (val.type == 'checkboxgroup') {
+			//radio
+			return (<FormItem
+					key={index}
+					style={{ width: '100%' }}
+					extra={val.extra}
+				>
+					{getFieldDecorator(val.name, { initialValue: val.initialValue, rules: val.rules })(
+						<CheckboxGroup className={styles.item} options={val.sldOptions}
+						               onChange={(value) => this.sldCheckShop(val, value)}/>,
+					)}
+				</FormItem>
+			);
+		} else if (val.type == 'upload_img_upload') {
+			return <FormItem
+				key={index}
+				style={{ width: '100%' }}
+				extra={val.extra}
+			>
+				<Upload
+					beforeUpload={sldBeforeUpload}
+					withCredentials={true}
+					accept={'.gif, .jpeg, .png,.jpg,'}
+					name={val.upload_name}
+					action={val.upload_url}
+					listType="picture-card"
+					fileList={val.fileList}
+					onPreview={(info) => val.uploadPreview(info)}
+					onChange={(info) => val.uploadChange(info,val.extra_param!=undefined?val.extra_param:{})}
+          headers={{
+            Authorization: 'Bearer ' + getLocalStorageStingVal('sld_token')
+          }}
+				>
+					{val.fileList.length >= (val.num!=undefined?val.num:6) ? null : uploadButton}
+				</Upload>
+			</FormItem>;
+		} else if (val.type == 'upload_video') {
+      return <FormItem
+        key={index}
+        style={{ width: '100%' }}
+        extra={val.extra}
+      >
+        {val.fileList.length > 0 && val.fileList[0].status == 'done'&&val.fileList[0].response!=undefined
+          ?<div style={{marginTop:12,position:'relative'}}>
+            <video width={102} height={102} src={val.fileList[0].response.data.url} controls autoPlay/>
+            <div style={{position:'absolute',zIndex:99,top:'-11px',left:'93px'}} onClick={()=>val.delVideo()}>
+              <ALibbSvg
+                fill={'#c8c8c8'} width={18} height={18} type={'qingchu'}/>
+            </div>
+          </div>
+          :<Upload
+            beforeUpload={sldBeforeUploadVideo}
+            withCredentials={true}
+            accept={'.mp4'}
+            name={val.upload_name}
+            action={val.upload_url}
+            listType="picture-card"
+            fileList={val.fileList}
+            onPreview={(info) => val.uploadPreview(info)}
+            onChange={(info) => val.uploadChange(info,val.extra_param!=undefined?val.extra_param:{})}
+          >
+            {val.fileList.length ==0 && uploadButtonVideo}
+          </Upload>
+        }
+      </FormItem>;
+    } else if (val.type == 'show_img_more') {
+      return <FormItem
+        key={index}
+        style={{ width: '100%' }}
+        extra={val.extra}
+      >
+        <div className={`${global.flex_row_start_center}`}>
+          {val.data.map(item=>{
+            return <div  className={`${global.flex_row_center_center}`}>
+              {getSldComImg(item,200,200,100,100)}
+            </div>
+          })}
+
+        </div>
+      </FormItem>;
+    } else if (val.type == 'goods_spec_sele') {
+			let con = <div className={styles.spec_wrap}>
+				{
+					val.sel_data.length > 0 && val.sel_data.map((vall, keyl) => {
+						return <div key={keyl}
+						            className={`${styles.spec_r_wrap} ${keyl != val.sel_data.length - 1 ? styles.show_bot_border : null}`}>
+							<span className={styles.spec_l}>{vall.name}</span>
+							{vall.attrList.length > 0 &&
+							<div className={styles.spec_item_wrap}>
+								<Checkbox.Group disabled={val.disable != undefined && val.disable ? val.disable : false}
+								                style={{ width: '100%' }}>
+									<Row>
+										{vall.attrList.map((valr, keyr) => {
+											return <Col key={keyr} span={4}><Checkbox
+												value={valr.id}>{valr.name}</Checkbox>
+												{vall.type == 2 &&
+												<Upload
+													beforeUpload={sldBeforeUpload}
+													withCredentials={true}
+													accept={'.gif, .jpeg, .png,.jpg,'}
+													name={val.upload_name}
+													action={val.upload_url}
+													listType="picture-card"
+													fileList={[]}
+													onPreview={(info) => val.uploadPreview(info)}
+													onChange={(info) => val.uploadChange(info)}
+                          headers={{
+                            Authorization: 'Bearer ' + getLocalStorageStingVal('sld_token')
+                          }}
+												>
+													{uploadButton}
+												</Upload>
+												}
+
+											</Col>;
+										})}
+									</Row>
+								</Checkbox.Group>
+							</div>
+							}
+						</div>;
+					})
+				}
+			</div>;
+
+			return con;
+		} else if (val.type == 'show_text_btn') {
+			return <FormItem
+				key={index}
+				style={{ width: '100%' }}
+				extra={val.extra}
+			>
+				<div className={`${global.flex_row_start_center}`}>
+					<span>{val.initialValue}</span>
+					{val.btn != undefined &&
+          <div onClick={val.btn.callback} className={`${global.add_goods_bottom_btn}`} style={{width:95,marginLeft:10}}>
+            {val.btn.text}
+          </div>
+					}
+				</div>
+			</FormItem>;
+		}
+	};
+
+	render() {
+		const { data, lwidth, rwidth, totalHeght, part_width } = this.state.props_data;
+		let {
+			form: { getFieldDecorator },
+		} = this.props;
+		const total_width = document.body.clientWidth-208;
+		const cur_height = totalHeght != undefined ? totalHeght : 70;
+		return (
+			<div className={styles.sld_table_row_two} style={{ height: totalHeght }}>
+				<div className={styles.sld_det_lr_wrap}>
+					{data != undefined && data.length > 0 && data.map((val, index) => {
+						return <div className={styles.sld_det_lr_item_wrap} key={index} style={{
+							width: `${(part_width != undefined ? part_width : 50)*0.01*total_width-2}px`,
+							height: val.item_height!=undefined?val.item_height+1:cur_height + 1,
+						}}>
+            <span className={styles.sld_det_r_item} style={{
+	            flexDirection: 'row',
+	            alignItems: 'center',
+	            justifyContent: 'flex-end',
+	            width: `${lwidth != undefined ? lwidth : 20}%`,
+	            backgroundColor: '#fff',
+	            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',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={{
+								width: `${rwidth != undefined ? rwidth : 80}%`,
+								alignItems: 'flex-start',
+								paddingLeft: 20,
+								height: val.item_height!=undefined?val.item_height+2:cur_height + 2,
+								borderRightWidth: 1,
+                borderTopWidth:val.rTopWidth!=undefined?val.rTopWidth:1,
+							}}>
+              <span className={styles.sld_det_r_text} style={{ width: '100%', }}>
+                {this.commonCon(val, index)}
+              </span>
+            </span>
+						</div>;
+					})}
+				</div>
+			</div>
+		);
+	}
+}

admin/src/components/SldTableRowTwoSeller/index.less

@@ -0,0 +1,83 @@
+.sld_table_row_two{
+  :global{
+    .ant-form-item-control-wrapper{
+      width: 100%;
+    }
+  }
+}
+.sld_det_lr_wrap {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
+  border-left:1px solid #F0F0F0;
+  padding-top: 1px;
+  width:100%;
+}
+
+.sld_det_lr_item_wrap {
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.sld_det_r_item {
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-end;
+  padding-right: 10px;
+  display: flex;
+  border:1px solid #F0F0F0;
+  border-left:0;
+}
+.sld_det_r_text {
+  font-size: 13px !important;
+  color: #333;
+}
+.item{
+  width:100%;
+}
+.spec_wrap{
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.spec_r_wrap{
+  width:100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-start;
+  .spec_l{
+    width:100px;
+    justify-content: flex-end;
+    align-items: center;
+    padding-top: 10px;
+  }
+  .spec_item_wrap{
+    width: 100%;
+    padding: 10px;
+  }
+}
+
+.show_bot_border{
+  border-bottom: 1px dashed #DCDCDC;
+}
+
+.sld_det_r_text{
+  :global {
+    .ant-form-item {
+      margin-bottom: 0!important;
+    }
+  }
+}
+
+.word_break{
+  word-wrap: break-word;
+  word-break: break-all;
+}

admin/src/pages/CheckLogin.js

@@ -39,7 +39,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("/manage_product/") >-1 || children.props.location.pathname.indexOf(all_routes[i]) > -1) {
         contain_redirect_flag = true;
         break;
       }

admin/src/pages/manage/goods/models/product.js

@@ -0,0 +1,86 @@
+import { sldCommonService } from '@/utils/utils';
+import { sldComLanguage } from '@/utils/utils';
+
+export default {
+  namespace: 'gproduct',
+  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/admin/seller/list`);
+      if (callback) callback(response);
+    },
+    //slodon_获取商品规格列表
+    * get_goods_spec_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/admin/seller/ggList`);
+      if (callback) callback(response);
+    },
+    //slodon_获取商品标签列表
+    * get_goods_label_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/admin/seller/bqList`);
+      if (callback) callback(response);
+    },
+    //slodon_获取分类绑定的品牌和属性信息
+    * get_brand_attr_detail({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/admin/seller/listByCategoryId');
+      if (callback) callback(response);
+    },
+    //slodon_获取店铺分类列表
+    * get_store_category_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/seller/admin/seller/dpList');
+      if (callback) callback(response);
+    },
+    //slodon_获取商品详情
+    * get_goods_detail({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/admin/seller/getGoodsInfo');
+      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_获取关联版式列表
+    * get_related_template_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', `v3/goods/admin/seller/bsList`);
+      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/admin/seller/canUseList');
+      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_申请通过的商品分类
+    * get_system_seller_cate_list({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/admin/seller/cateList');
+      if (callback) callback(response);
+    },
+    //slodon_获取店铺运费模板列表
+    * get_transport_lists({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'get', 'v3/goods/admin/seller/yfList');
+      if (callback) callback(response);
+    },
+  },
+};

admin/src/pages/manage/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;
+  }
+}

admin/src/pages/manage/goods/sel_goods_cat.js

@@ -0,0 +1,99 @@
+/*发布商品选择商品分类组件*/
+import { connect } from 'dva/index';
+import React, { Component, Fragment } from 'react';
+import { Form, } from 'antd';
+import {
+	failTip,
+	getSldEmptyH,sldFullHeight,
+	sldComLanguage,
+} from '@/utils/utils';
+import global from './global.less';
+import { Scrollbars } from 'react-custom-scrollbars';
+
+let sthis = '';
+@connect(({ gproduct, global }) => ({
+	gproduct, global,
+}))
+@Form.create()
+export default class SelGoodsCat extends Component {
+	constructor(props) {
+		super(props);
+		sthis = this;
+		this.state = {
+			modalVisible: props.modalVisible,
+			data: props.data,
+			sele_goods_cat_data: [],
+		};
+	}
+
+	componentDidMount() {
+
+	}
+
+	componentWillReceiveProps(nextProps, nextContext) {
+		this.setState({ modalVisible: nextProps.modalVisible, sele_goods_cat_data: nextProps.sele_goods_cat_data });
+	}
+
+	componentWillUnmount() {
+
+	}
+
+	//下一步事件
+	addGoodsNext = () => {
+		if (this.props.sele_goods_cat_data.length == 3) {
+			this.props.sldAddGoodsSecond();
+		} else {
+			failTip(`${sldComLanguage('分类必须选到第三级才可以发布商品')}`);
+		}
+	};
+
+	//获取下级分类
+	getChild = (item, index) => {
+		this.props.sldHandleGoodsCat(item, index);
+	};
+
+	render() {
+		const { data, sele_goods_cat_data } = this.state;
+		let sele_cat_str = '';
+		if (sele_goods_cat_data.length == 0) {
+			sele_cat_str = `${sldComLanguage('请选择商品类别')}`;
+		} else {
+			sele_cat_str = `${sldComLanguage('您选择商品类别是:')}`;
+			sele_goods_cat_data.map((item, index) => {
+				sele_cat_str += item.categoryName;
+				if (index != sele_goods_cat_data.length - 1) {
+					sele_cat_str += ' > ';
+				}
+			});
+		}
+		return (
+			<div className={global.sele_goods_cat}>
+				<div className={global.goods_cat_wrap} style={{marginTop:sldFullHeight(34),marginBottom:sldFullHeight(17),height:sldFullHeight(600)}}>
+					{data.map((item, index) => {
+						return index < 3 &&
+							<div className={global.wrap} key={index} style={{ marginLeft: index == 0 ? 0 : 16,paddingTop:10 }}>
+								<Scrollbars autoHeight
+								            autoHeightMin={0}
+								            autoHeightMax={sldFullHeight(530)}>
+									{item.length > 0 && item.map((items, indexs) => {
+										return <div onClick={() => this.getChild(items, index + 1)}
+										            className={`${global.goods_cat_item} ${sele_goods_cat_data[index] != undefined && items.categoryId == sele_goods_cat_data[index].categoryId ? global.select : null}`}
+										            key={indexs}>{items.categoryName}</div>;
+									})}
+                  {getSldEmptyH(15)}
+                </Scrollbars>
+							</div>;
+					})}
+				</div>
+				<div className={`${global.sele_cat_info} ${sele_goods_cat_data.length == 0 ? 'tip_bg' : null}`}>
+					<span className={`${sele_goods_cat_data.length == 0 ? 'tip' : null}`}>{sele_cat_str}</span>
+				</div>
+				<div className={global.com_flex_column_center} style={{marginTop:sldFullHeight(41)}}>
+					<div className={global.add_goods_step1_btn} onClick={() => this.addGoodsNext()}>
+						<span className={global.text}>{sldComLanguage('下一步，填写商品信息')}</span>
+					</div>
+				</div>
+			</div>
+		);
+	}
+}

admin/src/pages/manage/product/goods_check_lists.js

@@ -20,11 +20,13 @@ import {
   sldPopConfirmDiy,
   sldPopConfirm,
 } from '@/utils/utils';
+import Link from 'umi/link';
 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';
+import router from 'umi/router';
 
 let pageSize = list_com_page_size_10;
 @connect(({ product }) => ({
@@ -159,7 +161,7 @@ export default class GoodsCheckLists extends Component {
           title: `${sldComLanguage('拒绝理由')}`,//拒绝理由
           dataIndex: 'auditReason',
           align: 'center',
-          width: 150,
+          width: 130,
           render: (text, record) =>{
             return (text?text:'')+(record.auditComment?(','+record.auditComment):'')
           }
@@ -168,25 +170,29 @@ export default class GoodsCheckLists extends Component {
           title: `${sldComLanguage('发布时间')}`,//发布时间
           dataIndex: 'createTime',
           align: 'center',
-          width: 150,
+          width: 130,
         },
         {
           title: `${sldComLanguage('操作')}`,//操作
           align: 'center',
-          width: 100,
+          width: 120,
           render: (text, record) => {
             return (record.state == 20||record.state == 21)?<Fragment>
               {sldPopConfirmDiy('leftBottom', `${sldComLanguage('确认审核通过该商品吗？')}`, () => this.operateGoods({goodsIds:record.goodsId,state:1}), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`,
                 sldtbaleOpeBtnText(`${sldComLanguage('审核通过')}`, () => null))}
               <span className={global.splitLine}></span>
               {sldtbaleOpeBtnText(`${sldComLanguage('审核拒绝')}`, () => this.refuseGoods(record.goodsId))}
+              <span className={global.splitLine}></span>
+              {sldtbaleOpeBtnText(`${sldComLanguage('查看')}`, () => this.goDetail(record))}
             </Fragment>:'--'
           },
         },
       ],
     };
   }
-
+  goDetail = (val) =>{
+    router.push(`/manage_product/goods_check_list_to_add?id=${val.goodsId}&storeId=${val.storeId}`);
+  }
   operate_ids = '';//当前操作的商品id串
   reason_list = [];