Merge branch 'fix/goodsManage' into 'master'

Fix/goods manage

See merge request !34

config/env.config.js

@@ -2,15 +2,15 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 
 const envAPi = {
-  api: '//backstms-test9.liangkebang.net',
-  kdspOpApi: 'https://kdsp-operation-test9.liangkebang.net',
-  kdspApi: 'https://sc-op-api-test9.liangkebang.net',
-  goodsApi: 'https://sc-op-api-test9.liangkebang.net',
-  querysApi: 'https://sc-settlement-api-test9.liangkebang.net',
+  api: '//backstms-test4.liangkebang.net',
+  kdspOpApi: 'https://kdsp-operation-test4.liangkebang.net',
+  kdspApi: 'https://sc-op-api-test4.liangkebang.net',
+  goodsApi: 'https://sc-op-api-test4.liangkebang.net',
+  querysApi: 'https://sc-settlement-api-test4.liangkebang.net',
   // goodsApi: '//192.168.188.111:7000',
-  prologueDomain: 'https://mall-test9.liangkebang.net',
+  prologueDomain: 'https://mall-test4.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',
-  opapiHost: 'https://opapi-test9.liangkebang.net',
+  opapiHost: 'https://opapi-test4.liangkebang.net',
 };
 
 const prodApi = {

src/pages/GoodsManage/createModal/index.jsx

@@ -408,7 +408,6 @@ class goodsManage extends Component {
               initCascader: null,
             });
             this.props.form.resetFields();
-            console.log(this.BatchSetting);
             return;
           }
           this.onCancel();
@@ -645,11 +644,17 @@ class goodsManage extends Component {
                   <FormItem label="商品卖点：" labelCol={{ span: 2 }}>
                     {getFieldDecorator('character', {
                       initialValue: initData.character,
+                      rules: [
+                        {
+                          required: true,
+                          message: '请输入商品卖点',
+                        },
+                      ],
                     })(
                       <Input
                         style={{ width: 690 }}
                         maxLength={50}
-                        placeholder="好的卖点信息有利于提高商品转化，限50字"
+                        placeholder="卖点最优可填写3个词,12个字。前后用空格加竖杠分隔,例: 莹莹剔透 | 粒粒优选 | 易煮易熟"
                         allowClear
                       />,
                     )}
@@ -840,7 +845,7 @@ class goodsManage extends Component {
             <Row>
               <Table
                 bordered
-                rowKey={r => r.thirdSkuNo}
+                // rowKey={r => r.thirdSkuNo}
                 pagination={false}
                 scroll={{ y: 300, x: 1200 }}
                 dataSource={this.state.editData}
@@ -881,7 +886,10 @@ class goodsManage extends Component {
                 ></Checkbox>
               </Col>
               <Col span={23} className={styles.imgBorder}>
-                <p className={styles.ptop}>公共滑动图：</p>
+                <p className={styles.ptop}>
+                  公共滑动图：
+                  <span className={styles.sizeTitle}>（图片最大上传2M）</span>
+                </p>
                 <FormItem>
                   {getFieldDecorator('commonImageList', {
                     initialValue: this.state.initForm.commonImageList,
@@ -904,9 +912,10 @@ class goodsManage extends Component {
                       ></Checkbox>
                     </Col>,
                     <Col span={23} className={styles.imgBorder}>
-                      <p className={styles.ptop}>{`滑动图${
-                        color === 'null' ? '' : `(${color})`
-                      }:`}</p>
+                      <p className={styles.ptop}>
+                        {`滑动图${color === 'null' ? '' : `(${color})`}:`}
+                        <span className={styles.sizeTitle}>（图片最大上传2M）</span>
+                      </p>
                       <FormItem key={color}>
                         {getFieldDecorator(`imageList[${color}]`, {
                           initialValue:
@@ -943,7 +952,10 @@ class goodsManage extends Component {
                 ></Checkbox>
               </Col>
               <Col span={23} className={styles.imgBorder}>
-                <p className={styles.ptop}>详情图：</p>
+                <p className={styles.ptop}>
+                  详情图：
+                  <span className={styles.sizeTitle}>（图片最大上传2M）</span>
+                </p>
                 <FormItem>
                   {getFieldDecorator('detailImageList', {
                     initialValue: this.state.initForm.detailImageList,

src/pages/GoodsManage/style.less

@@ -95,3 +95,7 @@
 .iptNumRight {
   margin-right: 0 !important;
 }
+
+.sizeTitle {
+  font-size: 12px;
+}