Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/coupon/details/details.vue

@@ -36,7 +36,7 @@
 					</view>
 					<view class="cdTiaojianBRight">
 						<view class="cdTiaojianBRTitle">有效期</view>
-						<view class="cdTiaojianBRText">{{g.effectDate}}-{{g.expirationDate}}</view>
+						<view class="cdTiaojianBRText">{{g.effectDate}} / {{g.expirationDate}}</view>
 					</view>
 				</view>
 				<view class="cdTiaojianB">

pages/coupon/index/index.vue

@@ -30,11 +30,11 @@
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
 				<view class="couponList">
 					<view class="couponListBox" :class="{
-						'active0': x.couponsType,'active1': '',
-						'active2': '','active3': '',
-						'active4': '','active5': '',
-						'active6': '','active7': '',
-						'active8': '',
+						'active0': x.couponsUseScope==-1,'active1': x.couponsUseScope==0,
+						'active2': x.couponsUseScope==1,'active3': x.couponsUseScope==2,
+						'active4': x.couponsUseScope==3,'active5': x.couponsUseScope==4,
+						'active6': x.couponsUseScope==5,'active7': x.couponsUseScope==6,
+						'active8': x.couponsUseScope==7,
 					}"
 					 v-for="(x, i) in couponDataList" :key="i">
 						<view class="item">
@@ -288,7 +288,20 @@
 						arrList(res.data.pageData)
 						this.couponDataList = res.data.pageData;
 						this.couponDataList.forEach(x => {
-							x.backGroubd = this.lineImgs[0]
+							if(x.couponsUseScope<=7){
+								if(x.couponsUseScope==-1) x.backGroubd = this.lineImgs[0]
+								if(x.couponsUseScope==0) x.backGroubd = this.lineImgs[1]
+								if(x.couponsUseScope==1) x.backGroubd = this.lineImgs[2]
+								if(x.couponsUseScope==2) x.backGroubd = this.lineImgs[3]
+								if(x.couponsUseScope==3) x.backGroubd = this.lineImgs[4]
+								if(x.couponsUseScope==4) x.backGroubd = this.lineImgs[5]
+								if(x.couponsUseScope==5) x.backGroubd = this.lineImgs[6]
+								if(x.couponsUseScope==6) x.backGroubd = this.lineImgs[7]
+								if(x.couponsUseScope==7) x.backGroubd = this.lineImgs[8]
+							}else{
+								if(x.couponsUseScope==-1) x.backGroubd = this.lineImgs[0]
+							}
+							
 						})
 						this.page_count = res.data.pageCount;
 						if(this.page_count==1) this.status = 'nomore'
@@ -399,7 +412,7 @@
 		display: flex;
 		align-items: flex-start;
 		background: #fff;
-		overflow: hidden;
+		// overflow: hidden;
 	}
 
 	.couponStyle .item .ticket {
@@ -613,45 +626,48 @@
 		font-size: 24rpx;
 		font-weight: 100;
 	}
-
+	.couponListBox .nameType {
+		color: rgba(29, 152, 144, 1);
+		background: rgba(97, 220, 212, .5);
+	}
 	.couponListBox.active0 .nameType {
 		color: rgba(29, 152, 144, 1);
-		background: rgba(97, 220, 212, 1);
+		background: rgba(97, 220, 212, .5);
 	}
 
 	.couponListBox.active1 .nameType {
 		color: rgba(212, 84, 42, 1);
-		background: rgba(253, 127, 86, 1);
+		background: rgba(253, 127, 86, .5);
 	}
 
 	.couponListBox.active2 .nameType {
 		color: rgba(60, 103, 160, 1);
-		background: rgba(106, 168, 249, 1);
+		background: rgba(106, 168, 249, .5);
 	}
 
 	.couponListBox.active3 .nameType {
 		color: rgba(204, 60, 110, 1);
-		background: rgba(243, 108, 155, 1);
+		background: rgba(243, 108, 155, .5);
 	}
 
 	.couponListBox.active4 .nameType {
 		color: rgba(40, 132, 163, 1);
-		background: rgba(24, 184, 237, 1);
+		background: rgba(24, 184, 237, .5);
 	}
 
 	.couponListBox.active5 .nameType {
 		color: rgba(184, 163, 19, 1);
-		background: rgba(233, 235, 51, 1);
+		background: rgba(233, 235, 51, .5);
 	}
 
 	.couponListBox.active6 .nameType {
 		color: rgba(186, 110, 1, 1);
-		background: rgba(255, 150, 0, 1);
+		background: rgba(255, 150, 0, .5);
 	}
 
 	.couponListBox.active7 .nameType {
 		color: rgba(55, 143, 71, 1);
-		background: rgba(31, 193, 62, 1);
+		background: rgba(31, 193, 62, .5);
 	}
 
 	.couponListBox.active8 .nameType {
@@ -681,7 +697,7 @@
 	.coupondLineGo {
 		position: absolute;
 		right: 0;
-		top: 56rpx;
+		top: 76rpx;
 		width: 114rpx;
 		height: 44rpx;
 		border-radius: 12rpx;
@@ -690,7 +706,9 @@
 		text-align: center;
 		line-height: 44rpx;
 	}
-
+	.couponListBox .coupondLineGo {
+		background: linear-gradient(133deg, #26C6A5, #61DCD4);
+	}
 	.couponListBox.active0 .coupondLineGo {
 		background: linear-gradient(133deg, #26C6A5, #61DCD4);
 	}