Showing
4 changed files
with
10 additions
and
3 deletions
| @@ -99,7 +99,9 @@ | @@ -99,7 +99,9 @@ | ||
| 99 | <select class="col-sm-1" name="operator" value="[[operator]]"> | 99 | <select class="col-sm-1" name="operator" value="[[operator]]"> |
| 100 | <option value=">" >大于</option> | 100 | <option value=">" >大于</option> |
| 101 | <option value=">=">大于等于</option> | 101 | <option value=">=">大于等于</option> |
| 102 | + <!-- | ||
| 102 | <option value="<">小于</option> | 103 | <option value="<">小于</option> |
| 104 | + --> | ||
| 103 | <option value="<=">小于等于</option> | 105 | <option value="<=">小于等于</option> |
| 104 | </select> | 106 | </select> |
| 105 | <input type="text" class="col-sm-2" name="value" value='[[ value ]]'/> | 107 | <input type="text" class="col-sm-2" name="value" value='[[ value ]]'/> |
| @@ -8,10 +8,12 @@ | @@ -8,10 +8,12 @@ | ||
| 8 | <option value="Discount">打折</option> | 8 | <option value="Discount">打折</option> |
| 9 | <option value="Cashreduce">满减</option> | 9 | <option value="Cashreduce">满减</option> |
| 10 | <option value="Gift">赠品</option> | 10 | <option value="Gift">赠品</option> |
| 11 | + <!-- | ||
| 11 | <option value="Changeshippingfee">调整运费</option> | 12 | <option value="Changeshippingfee">调整运费</option> |
| 12 | <option value="Vipfixeddiscount">VIP固定折扣</option> | 13 | <option value="Vipfixeddiscount">VIP固定折扣</option> |
| 13 | - <option value="Needpaygift">加价购</option> | ||
| 14 | <option value="Givecoupon">送优惠券</option> | 14 | <option value="Givecoupon">送优惠券</option> |
| 15 | + --> | ||
| 16 | + <option value="Needpaygift">加价购</option> | ||
| 15 | <option value="Degressdiscount">分件折扣</option> | 17 | <option value="Degressdiscount">分件折扣</option> |
| 16 | <option value="Cheapestfree">满X免1</option> | 18 | <option value="Cheapestfree">满X免1</option> |
| 17 | <option value="SpecifiedAmount">X件X元</option> | 19 | <option value="SpecifiedAmount">X件X元</option> |
| @@ -17,7 +17,8 @@ var operationEdit={ | @@ -17,7 +17,8 @@ var operationEdit={ | ||
| 17 | name:'discount', | 17 | name:'discount', |
| 18 | display_name : '折扣', | 18 | display_name : '折扣', |
| 19 | type : 'text', | 19 | type : 'text', |
| 20 | - default_value : '' | 20 | + default_value : '', |
| 21 | + remark:"请使用小数，例如：0.85,表示85折" | ||
| 21 | } | 22 | } |
| 22 | ] | 23 | ] |
| 23 | }, | 24 | }, |
| @@ -65,11 +65,13 @@ var conditionValidate={ | @@ -65,11 +65,13 @@ var conditionValidate={ | ||
| 65 | } | 65 | } |
| 66 | conditions_l2=obj_l2["conditions"]; | 66 | conditions_l2=obj_l2["conditions"]; |
| 67 | if(!conditions_l2||conditions_l2.length===0){ | 67 | if(!conditions_l2||conditions_l2.length===0){ |
| 68 | + /* | ||
| 68 | if(errorMsg["NO."+key2]){ | 69 | if(errorMsg["NO."+key2]){ |
| 69 | errorMsg["NO."+key2]=errorMsg["NO."+key2]+";"+"请添加品类、品牌、促销标记或特定商品！"; | 70 | errorMsg["NO."+key2]=errorMsg["NO."+key2]+";"+"请添加品类、品牌、促销标记或特定商品！"; |
| 70 | }else{ | 71 | }else{ |
| 71 | errorMsg["NO."+key2]="请添加品类、品牌、促销标记或特定商品！"; | 72 | errorMsg["NO."+key2]="请添加品类、品牌、促销标记或特定商品！"; |
| 72 | - } | 73 | + } */ |
| 74 | + continue; | ||
| 73 | } | 75 | } |
| 74 | //第三层中的conditions遍历校验 | 76 | //第三层中的conditions遍历校验 |
| 75 | for(var key3 in conditions_l2){ | 77 | for(var key3 in conditions_l2){ |
-
Please register or login to post a comment