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

pages/jiuzhai/jz_Reserve.vue

@@ -334,27 +334,27 @@
 					<view style="flex:1">
 						<text style="margin-right: 30rpx;">儿童(占床)</text>
 					</view>
-					<view style="text-align: right;">{{orderMsg.ChirdNeedBedNum}}人 × ¥{{($utils.getretailer()? currentPriceInfo.b2BPrice:currentPriceInfo.b2CPrice)+currentPriceInfo.childNeedPrice}}</view>
+					<view style="text-align: right;">{{orderMsg.ChirdNeedBedNum}}人 × ¥{{($utils.getretailer()? currentPriceInfo.b2BPrice:currentPriceInfo.b2CPrice)+(currentPriceInfo.childNeedPrice?currentPriceInfo.childNeedPrice:0)}}</view>
 				</view>
 				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderMsg.ChirdNoBedNum>0">
 					<view style="flex:1">
 						<text style="margin-right: 30rpx;">儿童(不占床)</text>
 					</view>
-					<view style="text-align: right;">{{orderMsg.ChirdNoBedNum}}人 × ¥{{($utils.getretailer()? currentPriceInfo.b2BPrice:currentPriceInfo.b2CPrice)+currentPriceInfo.childNoNeedPrice}}</view>
+					<view style="text-align: right;">{{orderMsg.ChirdNoBedNum}}人 × ¥{{($utils.getretailer()? currentPriceInfo.b2BPrice:currentPriceInfo.b2CPrice)-(currentPriceInfo.childNoNeedPrice?currentPriceInfo.childNoNeedPrice:0)}}</view>
 				</view>
 				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderMsg.BabyNum>0">
 					<view style="flex:1">
 						<text style="margin-right: 30rpx;">婴儿</text>
 					</view>
 					<view style="text-align: right;">
-						{{orderMsg.BabyNum}}人 × ¥{{currentPriceInfo.babyPrice}}</view>
+						{{orderMsg.BabyNum}}人 × ¥{{currentPriceInfo.babyPrice?currentPriceInfo.babyPrice:0}}</view>
 				</view>
-				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderMsg.BabyNum>0&&currentPriceInfo.babyChargePrice>0">
+				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderMsg.ChirdNum>0&&currentPriceInfo.babyChargePrice&&currentPriceInfo.babyChargePrice>0">
 					<view style="flex:1">
-						<text style="margin-right: 30rpx;">婴儿(附加费)</text>
+						<text style="margin-right: 30rpx;">儿童(附加费)</text>
 					</view>
 					<view style="text-align: right;">
-						{{orderMsg.BabyNum}}人 × ¥{{currentPriceInfo.babyChargePrice}}</view>
+						{{orderMsg.ChirdNum}}人 × ¥{{currentPriceInfo.babyChargePrice}}</view>
 				</view>
 			</view>
 			
@@ -491,11 +491,11 @@
 
 				let money = price * this.orderMsg.ManNum
 				money += price * this.orderMsg.ChirdNum
-				money += this.currentPriceInfo.babyChargePrice * this.orderMsg.ChirdNeedBedNum
-				money += this.currentPriceInfo.babyPrice * this.orderMsg.BabyNum
-				money += this.currentPriceInfo.childNeedPrice * this.orderMsg.ChirdNeedBedNum
+				money += (this.currentPriceInfo.babyChargePrice?this.currentPriceInfo.babyChargePrice:0) * this.orderMsg.ChirdNum
+				money += (this.currentPriceInfo.babyPrice?this.currentPriceInfo.babyPrice:0) * this.orderMsg.BabyNum
+				money += (this.currentPriceInfo.childNeedPrice?this.currentPriceInfo.childNeedPrice:0) * this.orderMsg.ChirdNeedBedNum
 				if (this.orderMsg.ChirdNoBedNum > 0) {
-					money -= this.currentPriceInfo.childNoNeedPrice * this.orderMsg.ChirdNoBedNum
+					money -= (this.currentPriceInfo.childNoNeedPrice?this.currentPriceInfo.childNoNeedPrice:0) * this.orderMsg.ChirdNoBedNum
 				}
 				this.price = money
 
@@ -639,7 +639,8 @@
 					fail: function(err) {
 						console.log('fail:', err);
 						uni.showToast({
-							title: "支付失败"
+							title: "支付失败",
+							icon:"none"
 						})
 						setTimeout(()=>{
 							uni.redirectTo({

pages/jiuzhai/jz_SureOrder.vue

@@ -434,7 +434,7 @@
 					<view style="flex:1">
 						<text style="margin-right: 30rpx;">儿童(不占床)</text>
 					</view>
-					<view style="text-align: right;">{{orderData.model.ChirdNum-orderData.model.ChirdNeedBedNum}}人 × ¥{{(orderData.model.Unit_Price+(orderData.modelPrice.ChildNoNeedPrice?orderData.modelPrice.ChildNoNeedPrice:0))}}</view>
+					<view style="text-align: right;">{{orderData.model.ChirdNum-orderData.model.ChirdNeedBedNum}}人 × ¥{{(orderData.model.Unit_Price-(orderData.modelPrice.ChildNoNeedPrice?orderData.modelPrice.ChildNoNeedPrice:0))}}</view>
 				</view>
 				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderData.model.BabyNum>0">
 					<view style="flex:1">
@@ -443,12 +443,12 @@
 					<view style="text-align: right;">
 						{{orderData.model.BabyNum}}人 × ¥{{orderData.modelPrice.BabyPrice?orderData.modelPrice.BabyPrice:0}}</view>
 				</view>
-				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderData.model.BabyNum>0&&orderData.modelPrice.BabyChargePrice&&orderData.modelPrice.BabyChargePrice>0">
+				<view class="flex f12 grey" style="margin-bottom:40rpx;" :key="index" v-if="orderData.model.ChirdNum>0&&orderData.modelPrice.BabyChargePrice&&orderData.modelPrice.BabyChargePrice>0">
 					<view style="flex:1">
-						<text style="margin-right: 30rpx;">婴儿(附加费)</text>
+						<text style="margin-right: 30rpx;">儿童(附加费)</text>
 					</view>
 					<view style="text-align: right;">
-						{{orderData.model.BabyNum}}人 × ¥{{orderData.modelPrice.BabyChargePrice}}</view>
+						{{orderData.model.ChirdNum}}人 × ¥{{orderData.modelPrice.BabyChargePrice}}</view>
 				</view>
 			</view>