Merge branch 'bugfix' into dev

src/views/card/form.js

@@ -901,10 +901,7 @@ export default {
         // sale_limit.fee 消费金额满,sale_limit.goods 消费指定商品;  goods.ok 适用商品, goods.no 不适应商品, only: 1 不与其他优惠共享(不勾选only不传)
       } else if (this.form.cardType === 2) {
         card.useCondition = {
-          sale_limit: {
-            fee: this.sale_limit.fee,
-            goods: this.sale_limit.goods
-          },
+          sale_limit: {},
           goods: {
             ok: this.goods.ok,
             no: this.goods.no
@@ -913,6 +910,12 @@ export default {
           proNo: this.form.proNoList.length ? this.form.proNoList[0].id : '',
           products_exchange_number: this.form.proNoList.length ? this.form.products_exchange_number : 0
         };
+        // 兑换券的使用条件参数只能传一个，不能同时传
+        if (this.sale_limit.type == 1) {
+          card.useCondition.sale_limit = { fee: this.sale_limit.fee };
+        } else if (this.sale_limit.type == 2) {
+          card.useCondition.sale_limit = { goods: this.sale_limit.goods };
+        }
         if (this.only) {
           card.useCondition.only = Number(this.only);
         }