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

pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue

@@ -13,7 +13,29 @@
 				<!-- <text v-if="orderRefundRuleDay!=0">使用日期截止前{{orderRefundRuleDay}}天</text>
 				<text v-else>游玩当天</text>{{orderRefundRuleTimer}}之前未使用可退 -->
 				<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
-					<text>{{item.refundShowMessage}}<br/></text>
+						<!--已配置文字内容 -->
+						<text v-if="item.refundShowMessage">
+							{{item.refundShowMessage}}
+						</text>
+						<!-- 未配置文字内容 refundTimeRule 1 为过期前 2为过期后-->
+						<template v-else>
+							<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==1">
+								<text v-if="item.refundDay==0">
+									使用日期当天{{item.refundTime}}之前可退
+								</text>
+								<text v-else>
+									使用日期前{{item.refundDay}}天{{item.refundTime}}之前可退
+								</text>
+							</text>
+							<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==2">
+								<text v-if="item.refundDay==0">
+									过期当天{{item.refundTime}}之前可退
+								</text>
+								<text v-else>
+									过期后{{item.refundDay}}天{{item.refundTime}}之前可退
+								</text>
+							</text>
+						</template>
 				</view>
 			</view>
 		</view>
@@ -65,7 +87,29 @@
 			<view class="mask-box">
 				<view class="box-text">
 					<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
-						<text>{{item.refundShowMessage}}<br/></text>
+						<!--已配置文字内容 -->
+						<text v-if="item.refundShowMessage">
+							{{item.refundShowMessage}}
+						</text>
+						<!-- 未配置文字内容 refundTimeRule 1 为过期前 2为过期后-->
+						<template v-else>
+							<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==1">
+								<text v-if="item.refundDay==0">
+									使用日期当天{{item.refundTime}}之前可退
+								</text>
+								<text v-else>
+									使用日期前{{item.refundDay}}天{{item.refundTime}}之前可退
+								</text>
+							</text>
+							<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==2">
+								<text v-if="item.refundDay==0">
+									过期当天{{item.refundTime}}之前可退
+								</text>
+								<text v-else>
+									过期后{{item.refundDay}}天{{item.refundTime}}之前可退
+								</text>
+							</text>
+						</template>
 					</view>
 				</view>
 				<view class="box-btn" @click="orderRefundRuleTimerBack()">返回</view>

pages/my/order/electronicTicket/electronicTicket.vue

@@ -337,7 +337,29 @@
 												<text v-else>游玩当天</text>
 												<text v-if="orderInfo.orderRefundRuleList[0]">{{orderInfo.orderRefundRuleList[0].refundTime.substr(0,5)}}之前可退</text> -->
 												<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
-													<text>{{item.refundShowMessage}}<br/></text>
+													<!--已配置文字内容 -->
+													<text v-if="item.refundShowMessage">
+														{{item.refundShowMessage}}
+													</text>
+													<!-- 未配置文字内容  refundTimeRule 1 为过期前 2为过期后-->
+													<template v-else>
+														<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==1">
+															<text v-if="item.refundDay==0">
+																使用日期当天{{item.refundTime}}之前可退
+															</text>
+															<text v-else>
+																使用日期前{{item.refundDay}}天{{item.refundTime}}之前可退
+															</text>
+														</text>
+														<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==2">
+															<text v-if="item.refundDay==0">
+																过期当天{{item.refundTime}}之前可退
+															</text>
+															<text v-else>
+																过期后{{item.refundDay}}天{{item.refundTime}}之前可退
+															</text>
+														</text>
+													</template>
 												</view>
 											</template>
 											<template v-else-if="orderInfo.isRefund==2">随时可退</template>