Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/coupon/edit.vue

@@ -513,7 +513,7 @@ export default {
 		// 满减活动如果选择的满多少金额减，则在选择满货币后需要同步减的货币，且禁用减的货币修改
 		checkReduceCurrency(item){
 			// 金额满减
-			if(this.form.type == 2){
+			if([2,4,5,7].indexOf(this.form.type) > -1){
 				// 只要不是按产品单位满减
 				if(!item.combUnit || item.combUnit.split('_')[0] != 'prodUnit'){
 					this.$set(item, 'reduceCurrencyDisabled', true)
@@ -524,21 +524,29 @@ export default {
 					if(!currencyId){
 						currencyId = this.currencyList[0].id
 					}
-					this.$set(item, 'reduceCurrencyId', currencyId)
+					// 满减
+					if(this.form.type == 2){
+						this.$set(item, 'reduceCurrencyId', currencyId)
+					}
+
+					// 优惠5,区间价7
+					if(this.form.type == 5 || this.form.type == 7){
+						this.$set(item, 'netReceiptsCurrencyId', currencyId)
+					}
 				}else this.$set(item, 'reduceCurrencyDisabled', false)
 				
 				return
 			}
 
 			// 优惠
-			if(this.form.type == 5){
+			/* if(this.form.type == 5){
 				if(!item.fullCurrencyId){
 					this.$set(item, 'fullCurrencyId', this.currencyList[0].id)
 				}
-				this.$set(item, 'reduceCurrencyDisabled', true)
+				// this.$set(item, 'reduceCurrencyDisabled', true)
 				this.$set(item, 'netReceiptsCurrencyId', +item.fullCurrencyId)
 				return
-			}
+			} */
 
 			// 区间价
 			if(this.form.type== 7){