Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

App.vue

@@ -70,6 +70,7 @@ export default {
     })
   },
   onShow: function() {
+    
   },
   onHide: function() {
   }

pages/combination/combiChoose/combiChoose.vue

+<!-- 由于配置了两个页面的码，这个页面的代码直接复制distributionCombiChoose里面的代码，两个页面需要同步更新-->
 <template>
-	<!-- 由于配置了两个页面的码，这个页面的代码直接复制distributionCombiChoose里面的代码，两个页面需要同步更新-->
 	<view class="wrap">
 		<scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
 			<view class="banner">
@@ -56,14 +56,17 @@
 												<view style="font-size: 24rpx;display: flex;">
 													<text class="product-rule" v-if="items.productRefundRuleVo">
 														<!-- 索道写死 -->
-														<text v-if="item.id== 'z0015605022691a5945bbe463141668c'">
+														<!-- <text v-if="item.id== 'z0015605022691a5945bbe463141668c'">
 															条件退
 														</text>
 														<template v-else>
 															<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
 															<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
 															<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
-														</template>
+														</template> -->
+														<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 													</text>
 													<text class="product-rule"> 无需取票 </text>
 													<text @click.stop="showBuyKnow(items)">购买须知</text>

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

+<!-- 修改这个页面时，需要同步更新combiChoose页面的代码 -->
 <template>
 	<view class="wrap">
-		<!-- 修改这个页面时，需要同步更新combiChoose页面的代码 -->
 		<scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
 			<view class="banner">
 				<u-swiper :list="imgList" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="400" circular>
@@ -56,14 +56,17 @@
 												<view style="font-size: 24rpx;display: flex;">
 													<text class="product-rule" v-if="items.productRefundRuleVo">
 														<!-- 索道写死 -->
-														<text v-if="item.id=='z0015605022691a5945bbe463141668c'">
+														<!-- <text v-if="item.id=='z0015605022691a5945bbe463141668c'">
 															条件退
 														</text>
 														<template v-else>
 															<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
 															<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
 															<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
-														</template>
+														</template> -->
+														<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 1">条件退</text>
+														<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
 													</text>
 													<text class="product-rule"> 无需取票 </text>
 													<text @click.stop="showBuyKnow(items)">购买须知</text>

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -18,14 +18,17 @@
 						<view @click="showBuyKnow(index)" class="buyKnow">
 							<view>
 								<!-- 索道写死 -->
-								<text v-if="item.merchantId=='z0015605022691a5945bbe463141668c'">
+								<!-- <text v-if="item.merchantId=='z0015605022691a5945bbe463141668c'">
 									条件退
 								</text>
 								<template v-else>
 									<text v-if="item.backChangeRule == 0">不可退换</text>
 									<text v-if="item.backChangeRule == 1">条件退</text>
 									<text v-if="item.backChangeRule == 2">随时可退</text>
-								</template>
+								</template> -->
+								<text v-if="item.backChangeRule == 0">不可退换</text>
+								<text v-if="item.backChangeRule == 1">条件退</text>
+								<text v-if="item.backChangeRule == 2">随时可退</text>
 								<text v-if="item.isFetch == 1" style="margin-left: 10rpx;">无需取号</text>
 							</view>
 							<view>

pages/scenic/scenicProduct/scenicProduct-new.vue

@@ -56,6 +56,7 @@
 						<text>随时可退</text>
 					</view>
 				</view>
+				
 				<view>
 					
 				</view>

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -17,15 +17,17 @@
 					<view @click="showBuyKnow()" class="buyKnow">
 						<view>
 							<!-- 索道写死 -->
-							<text v-if="merchantId=='z0015605022691a5945bbe463141668c'">
+							<!-- <text v-if="merchantId=='z0015605022691a5945bbe463141668c'">
 								条件退
 							</text>
 							<template v-else>
 								<text v-if="productIfo.backChangeRule == 0">不可退换</text>
 								<text v-if="productIfo.backChangeRule == 1">条件退</text>
 								<text v-if="productIfo.backChangeRule == 2">随时可退</text>
-							</template>
-							
+							</template> -->
+							<text v-if="productIfo.backChangeRule == 0">不可退换</text>
+							<text v-if="productIfo.backChangeRule == 1">条件退</text>
+							<text v-if="productIfo.backChangeRule == 2">随时可退</text>
 							<text v-if="productIfo.isFetch == 1" style="margin-left: 10rpx;">无需取号</text>
 						</view>
 						<view>