优惠金额满足条件

pages/airTicket/flightDetail.vue

@@ -263,6 +263,7 @@
 				goVisible:false,
 				orderInfo: {},
 				Mailbox: '',
+				price: 0,
 			}
 		},
 		components: {
@@ -640,13 +641,13 @@
 					let discount = 0
 					const money = this.price
 					this.couponList.forEach(x=>{
-						if(x.couponsType==1 && x.denomination>discount&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)) {
+						if(x.couponsType==1 && x.denomination>discount&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition) {
 							discount=x.denomination
 							maxCouponId = x.id
 						}
 						if(x.couponsType==2){
 							let disMoney = money*(1-x.denomination)
-							if(discount<disMoney&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)){
+							if(discount<disMoney&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition){
 								discount=disMoney
 								maxCouponId = x.id
 							}

pages/bus/components/address/airport.vue

@@ -26,7 +26,9 @@
 		<scroll-view :scroll-y="true" style="height: 1px;flex: 1;overflow: hidden;" @scrolltolower="lower">
 			<view class="searchCityCenterBox">
 				<template v-if="airportList.length>0">
-					<view class="searchCityCenter column" v-for="(item,index) in airportList" :key="index"
+					<view class="searchCityCenter column" v-for="(item,index) in airportList" 
+					:key="index"
+					:class="[(busInfor.CarType==1&&busInfor.CountryId==item.Country)||(busInfor.CarType==2&&busInfor.desCountryId==item.Country)?'active':'']"
 						>
 						<view class="searchCityTitle">
 							<view>{{ item.CountryName }}</view>
@@ -35,7 +37,8 @@
 						v-for="(items,i) in item.AirportList"
 						:key="i"
 						@click="currentData(item,items,1)">
-							<view class="searchCityTextL col">
+							<view class="searchCityTextL col"
+							:class="[(busInfor.CarType==1&&busInfor.CityId==items.City)||(busInfor.CarType==2&&busInfor.desCityId==items.City)?'active':'']">
 								{{ items.AirportName }}
 							</view>
 							<view class="searchCityTextR">
@@ -231,6 +234,9 @@
 		text-overflow: ellipsis;
 		overflow: hidden;
 	}
+	.searchCityCenter.active .searchCityTextL.active{
+		color: #B99846;
+	}
 
 	.searchCityTextR {
 		margin-left: 15rpx;

pages/bus/order.vue

@@ -80,7 +80,7 @@
 							<view class="visaProductTitle">{{orderMsg.OrderType==1?'接机':orderMsg.OrderType==2?'送机':'包车'}}信息</view>
 						</view>
 						<view class="row-sbas-n items-center">
-							
+							<!---->
 							<view class="addPnum addPnumL" @click="orderMsg.Num>1?editNum(1):''">
 								<image v-if="orderMsg.Num>1" style="width: 27rpx;height: 27rpx;display: block;"
 									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245939665786.png" />
@@ -630,6 +630,7 @@
 			//计算总价
 			CalTotalPrice() {
 				this.orderMsg.Money = this.getPrice(this.orderMsg.Unit_Price * this.orderMsg.Num)
+				this.price = this.orderMsg.Money;
 			},
 			initData() {
 				uni.showLoading({
@@ -705,14 +706,14 @@
 					const money = this.price
 					this.couponList.forEach(x => {
 						if (x.couponsType == 1 && x.denomination > discount && (this.orderMsg.PeopleNum >= x
-								.orderGuestNum || !x.orderGuestNum)) {
+								.orderGuestNum || !x.orderGuestNum)&&this.price>=x.useCondition) {
 							discount = x.denomination
 							maxCouponId = x.id
 						}
 						if (x.couponsType == 2) {
 							let disMoney = money * (1 - x.denomination)
 							if (discount < disMoney && (this.orderMsg.PeopleNum >= x.orderGuestNum || !x
-									.orderGuestNum)) {
+									.orderGuestNum)&&this.price>=x.useCondition) {
 								discount = disMoney
 								maxCouponId = x.id
 							}
@@ -720,7 +721,6 @@
 					})
 					if (maxCouponId > 0) this.closeCouponHandler([maxCouponId])
 					else this.closeCouponHandler(-1)
-					this.CalTotalPrice()
 				}
 			},
 			getUserCouponList() {
@@ -742,7 +742,12 @@
 					"coupon_post_GetUserCanUseCouponList", couponParams,
 					(res) => {
 						if (res.resultCode == 1) {
-							this.couponList = res.data
+							res.data.forEach((x) => {
+								if(x.useCondition){
+									this.couponList.push(x)
+								}
+							})
+							// this.couponList = res.data
 							this.calcMaxCouponHandle()
 						}
 					},
@@ -795,8 +800,10 @@
 				} else {
 					this.orderMsg.Num++;
 				}
-				if(this.currentCoupon.discountMoney>0) this.calcMaxCouponHandle();	
-				else this.CalTotalPrice();
+				this.CalTotalPrice();
+				setTimeout(() => {
+					this.calcMaxCouponHandle()	
+				},200)
 			},
 			formatDate(str) {
 				let temp = str.split("-");

pages/hotel/order.vue

@@ -671,14 +671,14 @@
 					const money = this.price
 					this.couponList.forEach(x => {
 						if (x.couponsType == 1 && x.denomination > discount && (this.orderMsg.AdultPeopleNum >= x
-								.orderGuestNum || !x.orderGuestNum)) {
+								.orderGuestNum || !x.orderGuestNum)&&this.price>=x.useCondition) {
 							discount = x.denomination
 							maxCouponId = x.id
 						}
 						if (x.couponsType == 2) {
 							let disMoney = money * (1 - x.denomination)
 							if (discount < disMoney && (this.orderMsg.AdultPeopleNum >= x.orderGuestNum || !x
-									.orderGuestNum)) {
+									.orderGuestNum)&&this.price>=x.useCondition) {
 								discount = disMoney
 								maxCouponId = x.id
 							}

pages/jiuzhai/jz_Reserve.vue

@@ -830,13 +830,13 @@
 					let discount = 0
 					const money = this.price
 					this.couponList.forEach(x=>{
-						if(x.couponsType==1 && x.denomination>discount&&(this.total>=x.orderGuestNum||!x.orderGuestNum)) {
+						if(x.couponsType==1 && x.denomination>discount&&(this.total>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition) {
 							discount=x.denomination
 							maxCouponId = x.id
 						}
 						if(x.couponsType==2){
 							let disMoney = money*(1-x.denomination)
-							if(discount<disMoney&&(this.total>=x.orderGuestNum||!x.orderGuestNum)){
+							if(discount<disMoney&&(this.total>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition){
 								discount=disMoney
 								maxCouponId = x.id
 							}

pages/visa/visa_Reserve.vue

@@ -1163,13 +1163,13 @@
 					let discount = 0
 					const money = this.price
 					this.couponList.forEach(x=>{
-						if(x.couponsType==1 && x.denomination>discount&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)) {
+						if(x.couponsType==1 && x.denomination>discount&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition) {
 							discount=x.denomination
 							maxCouponId = x.id
 						}
 						if(x.couponsType==2){
 							let disMoney = money*(1-x.denomination)
-							if(discount<disMoney&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)){
+							if(discount<disMoney&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)&&this.price>=x.useCondition){
 								discount=disMoney
 								maxCouponId = x.id
 							}