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

pages/coupon/index/index.vue

@@ -11,7 +11,7 @@
 					</view>
 				</view>
 				<view class="couponHeadRight">
-					<text v-for="(item,index) in couponStateList" :key="index" :class="[msg.CouponsType==item.id?'active':'']"
+					<text v-for="(item,index) in couponStateList" :key="index" :class="[checkStateType==item.id?'active':'']"
 					 @click.stop="changeState(item)">{{ item.name }}</text>
 				</view>
 			</view>
@@ -94,6 +94,7 @@
 				pageTitle: "我的优惠券",
 				showAuth: false,
 				U: {},
+				checkStateType:1,//状态选中
 				couponStateList: [{
 						name: "全部",
 						id: 0,
@@ -252,6 +253,7 @@
 			},
 			//状态切换
 			changeState(item) {
+				this.checkStateType=item.id;
 				if (item.id <= 2) {
 					this.msg.CouponsType = item.id,
 					this.msg.CouponStatus = 1;

pages/jiuzhai/jz_SureOrder.vue

@@ -394,12 +394,12 @@
 					{{ orderData.model.CreateDate.replace("T", " ") }}
 				</view>
 			</view>
-			<view class="form-items">
+			<!-- <view class="form-items">
 				<view class="label">下单日期</view>
 				<view class="jz_SureVal">
 					{{ orderData.model.CreateDate.replace("T", " ") }}
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="empty-block"></view>
 		<view class="jz_form jz_MyGuestList" v-for="(subItem, subIndex) in orderData.model.GuestList" :key="subIndex">
@@ -440,7 +440,14 @@
 					<view class="label"> 在线支付 </view>
 					<view class="val f14 regular" style="text-align: right">
 						<text style="margin-right: 30rpx">{{ orderData.model.GuestNum }}人</text>
-						<text class="red">￥{{ orderData.model.PreferPrice }}</text>
+						<text class="red">￥
+						<template v-if=" orderData.model.DiscountMoney&&orderData.model.DiscountMoney>0">
+						{{ Number(orderData.model.PreferPrice) -Number(orderData.model.DiscountMoney)}}
+						</template>
+						<template v-else>
+							{{ orderData.model.PreferPrice }}
+						</template>
+						</text>
 					</view>
 				</view>
 				<view class="form-items" style="border-bottom: none">