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

pages/visa/visaDetail.vue

@@ -42,7 +42,8 @@
                 <view style="padding: 33rpx 30rpx 51rpx 38rpx;">
                     <view class="jz_LineTitle row items-center">
                         <view class="col">
-                            <text class="jz_renmin">原价：</text>
+                            <text>原价：</text>
+							<text class="jz_renmin">¥</text>
                             <text class="jz_B2bPrice">
                                 <!--{{ discountPrice }}-->
 								{{ $utils.getretailer()?dataList.VisaPrice:dataList.VisaB2CPrice }}

pages/visa/visa_MyOrder.vue

@@ -119,7 +119,7 @@
 								<view>下单时间：{{ item.createTime }}</view>
 								<view style="margin-top: 22rpx">订单总额：¥{{ item.totalPrice }},
 									<text v-if="item.discountMoney&&item.discountMoney>0" style="margin-left: 15px;">优惠金额：￥<text style="color:indianred">{{item.discountMoney}}</text></text>
-									<text v-if="item.customerPayMoney>0" style="margin-left: 15px;">已付款金额：￥<text style="color:indianred">{{item.customerPayMoney?item.customerPayMoney:0}}</text></text>
+									<text style="margin-left: 15px;">已付款金额：￥<text style="color:indianred">{{item.income?item.income:0}}</text></text>
 								</view>
 							</view>
 						</view>

pages/visa/visa_Reserve.vue

@@ -645,7 +645,7 @@
 			<template v-if="couponList.length>0">
 
 			<view class="empty-block"></view>
-			<view style="padding: 50rpx 40rpx">
+			<view style="padding: 50rpx 40rpx;background: #fff;">
 				<view class="big-title">
 					<text>优惠券</text>
 				</view>
@@ -668,7 +668,7 @@
 			<view class="empty-block"></view>
 			</template>
 			<coupon v-if="couponList.length > 0 && showCoupon" :price="price" :list="couponList" :current="useCouponIds" @close="closeCouponHandler" :current-price="realCurrentPriceInfo" :order="orderMsg"></coupon>
-			<view style="padding: 50rpx 40rpx" v-if="tips != ''">
+			<view style="padding: 50rpx 40rpx;background: #fff;" v-if="tips != ''&&tips!=null">
 				<view class="big-title">
 					<text>重要提示</text>
 				</view>
@@ -1064,6 +1064,7 @@
 						uni.hideLoading();
 						if (res.resultCode == 1) {
                             this.dataList = res.data
+							this.tips = res.data.VisaProductInfo.ImportantTip;
 							let dates = getBeforeDate(-res.data.BookAdvance, new Date())
 							
 							this.orderMsg.EnterCountryTime = dates