Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606

@@ -186,22 +186,26 @@ $(document).on('click', '.modify-btn', function() {
                 vipPrice($wrap);
             });
             $submitBtn.on('click', function() {
-                common.util.__ajax({
-                    url: '/product/updateProductPrice',
-                    data: {
-                        product_skn: skn,
-                        sales_price: $price.val(),
-                        vip_discount_type: $select.val(),
-                        vip_price: $vipPrice.val(),
-                        vip1_price: $vip1Price.val(),
-                        vip2_price: $vip2Price.val(),
-                        vip3_price: $vip3Price.val(),
-                        cgpriceStartTime:$startDate.val(),
-                        cgpriceEndTime:$endDate.val()
-                    }
-                }, function(res) {
-                    if (res.code == 200) {g.reload()}
-                })
+                if($price.val() != 0){
+                    common.util.__ajax({
+                        url: '/product/updateProductPrice',
+                        data: {
+                            product_skn: skn,
+                            sales_price: $price.val(),
+                            vip_discount_type: $select.val(),
+                            vip_price: $vipPrice.val(),
+                            vip1_price: $vip1Price.val(),
+                            vip2_price: $vip2Price.val(),
+                            vip3_price: $vip3Price.val(),
+                            cgpriceStartTime:$startDate.val(),
+                            cgpriceEndTime:$endDate.val()
+                        }
+                    }, function(res) {
+                        if (res.code == 200) {g.reload()}
+                    })
+                }else{
+                    common.util.__tip("销售价不能为0！");
+                }
             });
         },true);
     }