Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/coupon/edit.vue

@@ -497,6 +497,9 @@ export default {
 
 			// 优惠
 			if(this.form.type == 5){
+				if(!item.fullCurrencyId){
+					this.$set(item, 'fullCurrencyId', this.currencyList[0].id)
+				}
 				this.$set(item, 'reduceCurrencyDisabled', true)
 				this.$set(item, 'netReceiptsCurrencyId', +item.fullCurrencyId)
 				return
@@ -504,6 +507,9 @@ export default {
 
 			// 区间价
 			if(this.form.type== 7){
+				if(!item.startAndEndCurrencyId){
+					this.$set(item, 'startAndEndCurrencyId', this.currencyList[0].id)
+				}
 				this.$set(item, 'reduceCurrencyDisabled', true)
 				this.$set(item, 'netReceiptsCurrencyId', +item.startAndEndCurrencyId)
 				return
@@ -516,7 +522,7 @@ export default {
 			
 		},
 		getCouponSelect(){
-			getCouponSelect().then(res => {
+			getCouponSelect({overdueStatus: 1, status: 1}).then(res => {
 				this.couponList = res.data
 			})
 		},