Merge branch 'dev_link' into test6.5

wangwei
Commit 5c9e572d69cccea4674b3d639e352fb4fd539374 2 parents d11ff149 10464ee4
Showing 1 changed file with 4 additions and 0 deletions
code/static/js.jquery/module/marketing/CouponList/AddOrUpdate.js
--- a/code/static/js.jquery/module/marketing/CouponList/AddOrUpdate.js
View file @5c9e572
+++ b/code/static/js.jquery/module/marketing/CouponList/AddOrUpdate.js
View file @5c9e572
@@ -424,6 +424,10 @@ $(document).on("click", "#save_brand", function () {
     var productLimit = $("textarea[name=\"productLimit\"]").val();
     if(productLimit){
         couponBean.productLimit = productLimit;
+        if(productLimit.indexOf("，")>-1){
+            common.util.__tip('指定商品请使用英文逗号', 'warning');
+            return false;
+        }
     }
     if (e.validate()) {
         delete couponBean.useRange;