Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -231,33 +231,6 @@ var myGoods = new Vue({
                         })
                     })
                 }
-            }else {
-            console.log(_this.checkList);
-             _this.checkList.map(function(el){
-                    if(el.validFlag != 2){ isValidFlag = true; }
-                });
-                 if(isValidFlag){
-                    CAIMEI.Alert('部分选中的商品暂未上架，不能进行下架操作','确定');
-                    return;
-                }else {
-                    CAIMEI.Modal('确定下架选中的商品吗？','取消','确定',function () {
-                          var shelProductsList='';
-                        _this.checkList.map(function(el){
-                            if(el.validFlag == 2){
-                                shelProductsList += el.productID+','
-                            }
-                        });
-                        SupplierApi.SupplierSoldOut({productIds:shelProductsList,},function (response) {
-                            if (response.code == 0){
-                                CAIMEI.dialog('下架成功！');
-                                _this.productsList = [];
-                                _this.GetMyproductDataInfo();
-                            }else{
-                                 CAIMEI.Alert(response.msg,'确定');
-                            }
-                        })
-                    })
-                }
             }
         },
         ItemDownshelf: function(pros){//下架商品

src/main/resources/templates/supplier-center/shop/goods.html

@@ -144,18 +144,11 @@
                                 </li>
                                 <li>
                                     <div class="good-handle">
-                                        <a class="btn " href="javascript: void(0);"
-                                           v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1"
-                                           @click="editGoodFn(product)">编辑</a>
-                                            <a class="btn primary" href="javascript: void(0);"
-                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
-                                           @click="pageLinkDetils(product)">预览商品</a>
-                                           <a class="btn " href="javascript: void(0);"
-                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                           <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
-                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                           <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
-                                           @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
+                                        <a class="btn primary" href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
                                     </div>
                                 </li>
                             </ul>
@@ -222,15 +215,10 @@
                                     </div>
                                 </div>
                                 <div class="good-handle">
-                                        <a class="btn down" href="javascript: void(0);"
-                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
-                                           @click="AddPushHotFn(product)">添加主页推荐</a>
-                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
-                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                        <a class="btn primary" href="javascript: void(0);"
-                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
-                                           @click="pageLinkDetils(product)">预览商品</a>
+                                        <a class="btn down" href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn primary" href="javascript: void(0);" v-if="['1','2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
                                     </div>
                             </div>
                           </div>