Merge remote-tracking branch 'origin/master'

xinkeaboard-seller/src/global.less

@@ -2035,6 +2035,7 @@ body {
   color: #333;
   padding: 3px 5px 3px 6px;
   border-radius: 3px;
+  cursor: pointer;
 }
 
 .tableOperateText:hover {

xinkeaboard-seller/src/pages/goods/add_goods.js

@@ -2185,7 +2185,7 @@ export default class AddGoods extends Component {
               }
               other_data[other_index].initialValue = tar_service_label_id;//商品标签
             } else if (other_data[other_index].name == 'sellNow') {
-              other_data[other_index].initialValue = true;
+              other_data[other_index].initialValue = result.sellNow;
             } else {
               other_data[other_index].initialValue = result[other_data[other_index].name];
             }

xinkeaboard-seller/src/pages/goods/goods_offline_lists.js

@@ -186,6 +186,7 @@ export default class GoodsOfflineLists extends Component {
           width: 100,
           render: (text, record) => (
             <Fragment>
+              {sldPopConfirm('leftBottom', `${sldComLanguage('确定要重新发布此商品并提交审核吗？')}`, () => this.operateGoods({goodsIds: record.goodsId}, 'retryRelease'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldtbaleOpeBtnText(`${sldComLanguage('重新发布')}`) )}
               {sldtbaleOpeBtnText(`${sldComLanguage('查看规格')}`, () => this.viewSpec(record))}
               <span className={global.splitLine}></span>
               <Link to={{
@@ -366,6 +367,9 @@ export default class GoodsOfflineLists extends Component {
     } else if (type == 'template') {
       dis_type = 'product/set_related_template';
       param_data = id
+    } else if (type === 'retryRelease') {
+      dis_type = 'product/retry_up_goods';
+      param_data = id
     }
     dispatch({
       type: dis_type,
@@ -487,6 +491,10 @@ export default class GoodsOfflineLists extends Component {
         <div className={global.operate_bg}>
           {selectedRowKeys.length == 0 ? sldIconBtn(() => {
             failTip(`${sldComLanguage('请先选中数据')}`);
+          //确认重新发布选中的商品吗？
+          }, `${sldComLanguage('批量重新发布')}`, 7, 0, 13, 13, 3, 'fabu1', '#036EB8') : sldPopConfirm('leftBottom', `${sldComLanguage('确定要重新发布已选中的商品并提交审核吗？')}`, () => this.operateGoods({goodsIds:selectedRowKeys.join(',')}, 'retryRelease'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldIconBtn(null, `${sldComLanguage('批量重新发布')}`, 7, 0, 13, 13, 3, 'ziyuan25', '#0bac6a'), 0, 0, '#0bac6a')}
+          {selectedRowKeys.length == 0 ? sldIconBtn(() => {
+            failTip(`${sldComLanguage('请先选中数据')}`);
             //确认删除选中的商品吗？
           }, `${sldComLanguage('删除')}`, 7, 0, 15, 15, 3, 'piliangshanchu', '#F21414') : sldPopConfirm('leftBottom', `${sldComLanguage('确认删除选中的商品吗？')}`, () => this.operateGoods({goodsIds:selectedRowKeys.join(',')}, 'del'), `${sldComLanguage('确定')}`, `${sldComLanguage('取消')}`, sldIconBtn(null, `${sldComLanguage('删除')}`, 7, 0, 15, 15, 3, 'piliangshanchu', '#F21414'), 0, 0, '#F21414')}
         </div>

xinkeaboard-seller/src/pages/goods/goods_online_lists.js

@@ -592,7 +592,7 @@ export default class GoodsOnlineLists extends Component {
         <div className={global.operate_bg}
              style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
           <div style={{ display: 'flex', flexDirection: 'row' }}>
-            {sldIconBtn(() => this.addGoods(), `${sldComLanguage('发布商品')}`, 7, 0, 12, 12, 3, 'fabu1', '#08A9B7')}
+            {sldIconBtn(() => this.addGoods(), `${sldComLanguage('发布商品')}`, 7, 0, 12, 12, 3, 'fabu1', '#036EB8')}
             {selectedRowKeys.length == 0 ? sldIconBtn(() => {
               failTip(`${sldComLanguage('请先选中数据')}`);
               //确认下架选中的商品吗？

xinkeaboard-seller/src/pages/goods/models/product.js

@@ -106,6 +106,11 @@ export default {
       const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/upperShelf`);
       if (callback) callback(response);
     },
+    // 重新发布商品
+    *retry_up_goods({ payload, callback }, { call }) {
+      const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/illegalUpperShelf`);
+      if (callback) callback(response);
+    },
     //slodon_商品列表_删除商品
     * del_goods({ payload, callback }, { call }) {
       const response = yield call(sldCommonService, payload, 'post', `v3/goods/seller/goods/deleteGoods`);