Skip to content

U
uni-pdtravel
Commit 81a70a06 authored by 潘永坪's avatar 潘永坪
Browse files
Options

购票须知样式处理，联票取号bug处理

parent 921fcd49
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 82 deletions
components/buyKnow.vue
View file @ 81a70a06
...@@ -12,85 +12,83 @@ ...@@ -12,85 +12,83 @@
<view class="head3"> <view class="head3">
挂牌价：￥{{buyKnowData.originalPrice}} 挂牌价：￥{{buyKnowData.originalPrice}}
</view> </view>
</view> </view>
<view style="flex: 1;overflow-y: scroll;"> <view class="middle">
<view class="middle"> <view style="margin-top: 30rpx;">
<view style="margin-top: 30rpx;">
<!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 -->
<image style="width: 100%;" v-for="(item,index) in buyKnowData.productImgs||buyKnowData.imgResVos" :key="index" :src="item.url" mode="widthFix">
</image>
</view>
<!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 --> <!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 -->
<view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos||buyKnowData.productTitleData" :key="a"> <image style="width: 100%;" v-for="(item,index) in buyKnowData.productImgs||buyKnowData.imgResVos" :key="index" :src="item.url" mode="widthFix">
<view class="middle-title">
{{item.title}} </image>
</view> </view>
<view class="middle-content" v-for="(items,b) of item.productChildTitleData" :key="b"> <!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 -->
<text> <view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos||buyKnowData.productTitleData" :key="a">
{{items.title}} <view class="middle-title">
{{item.title}}
</view>
<view class="middle-content" v-for="(items,b) of item.productChildTitleData" :key="b">
<text>
{{items.title}}
</text>
<view>
<!--<text>随买随用</text>-->
<text v-for="(itemss,c) of items.contentList" :key="c" class="content-child">
{{itemss.content}}
</text> </text>
<view>
<!--<text>随买随用</text>-->
<text v-for="(itemss,c) of items.contentList" :key="c" class="content-child">
{{itemss.content}}
</text>
</view>
</view> </view>
</view> </view>
<!-- 退票规则 --> </view>
<view class="middle-list" style="border-bottom: none;"> <!-- 退票规则 -->
<view class="middle-title"> <view class="middle-list" style="border-bottom: none;">
<text v-if="buyKnowData.backChangeRule == 0">不可退</text> <view class="middle-title">
<text v-if="buyKnowData.backChangeRule == 1">有条件退</text> <text v-if="buyKnowData.backChangeRule == 0">不可退</text>
<text v-if="buyKnowData.backChangeRule == 2">随时可退</text> <text v-if="buyKnowData.backChangeRule == 1">有条件退</text>
</view> <text v-if="buyKnowData.backChangeRule == 2">随时可退</text>
<view v-if="buyKnowData.productRefundRuleVo&&buyKnowData.productRefundRuleVo.refundType== 1"> </view>
<view v-for="(item,index) in buyKnowData.productRefundRuleVo.refundRuleList" :key="index" style="margin-top: 16rpx;"> <view v-if="buyKnowData.productRefundRuleVo&&buyKnowData.productRefundRuleVo.refundType== 1">
<!--已配置文字内容 --> <view v-for="(item,index) in buyKnowData.productRefundRuleVo.refundRuleList" :key="index" style="margin-top: 16rpx;">
<text v-if="item.refundShowMessage"> <!--已配置文字内容 -->
{{item.refundShowMessage}} <text v-if="item.refundShowMessage">
{{item.refundShowMessage}}
</text>
<!-- 未配置文字内容 -->
<template v-else>
<!-- 使用日期前 -->
<text v-if="buyKnowData.productRefundRuleVo.refundTimeType==1">
<text v-if="item.refundDay==0">
使用日期当天{{item.refundTime}}之前可退
</text>
<text v-else>
使用日期前{{item.refundDay}}天{{item.refundTime}}之前可退
</text>
</text> </text>
<!-- 未配置文字内容 --> <!-- 过期 -->
<template v-else> <text v-if="buyKnowData.productRefundRuleVo.refundTimeType==2">
<!-- 使用日期前 --> <text v-if="item.refundDay==0">
<text v-if="buyKnowData.productRefundRuleVo.refundTimeType==1"> 过期当天{{item.refundTime}}之前可退
<text v-if="item.refundDay==0">
使用日期当天{{item.refundTime}}之前可退
</text>
<text v-else>
使用日期前{{item.refundDay}}天{{item.refundTime}}之前可退
</text>
</text> </text>
<!-- 过期 --> <text v-else>
<text v-if="buyKnowData.productRefundRuleVo.refundTimeType==2"> 过期后{{item.refundDay}}天{{item.refundTime}}之前可退
<text v-if="item.refundDay==0">
过期当天{{item.refundTime}}之前可退
</text>
<text v-else>
过期后{{item.refundDay}}天{{item.refundTime}}之前可退
</text>
</text> </text>
</template> </text>
</template>
</view>
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="bottom"> <view class="bottom">
<text class="bottom-left"> <text class="bottom-left">
¥ <text>{{buyKnowData.sellingPrice}}</text> ¥ <text>{{buyKnowData.sellingPrice}}</text>
</text>
<view class="bottom-right">
<text class="btn" @click="showPop=false">
确定
</text> </text>
<view class="bottom-right">
<text class="btn" @click="showPop=false">
确定
</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</u-popup> </u-popup>
</template> </template>
...@@ -142,6 +140,8 @@ export default { ...@@ -142,6 +140,8 @@ export default {
.middle { .middle {
padding: 0 24rpx 24rpx 24rpx; padding: 0 24rpx 24rpx 24rpx;
font-size: 28rpx; font-size: 28rpx;
flex: 1;
overflow-y: scroll;
} }
.middle-list { .middle-list {
margin: 30rpx 0; margin: 30rpx 0;
......
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @ 81a70a06
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<view>您排队号已过</view> <view>您排队号已过</view>
<view v-show="item2.sortFair==3"> <view v-show="item2.sortFair==3">
<!-- 1为过号提示确定后重新排号 --> <!-- 1为过号提示确定后重新排号 -->
<text class="number-btn" v-if="item2.config.paPassedNumTakeType==1" @click="clickSortAgain(item)"> <text class="number-btn" v-if="item2.config.paPassedNumTakeType==1" @click="clickAgain(item)">
重新取号 重新取号
</text> </text>
<!-- 0为过号直接重新排号 --> <!-- 0为过号直接重新排号 -->
...@@ -377,10 +377,10 @@ ...@@ -377,10 +377,10 @@
<!-- 是否重新排号 --> <!-- 是否重新排号 -->
<u-modal <u-modal
:show="showModal" :show="showModal"
@confirm="sortAgain(sortAgainData)" @confirm="sortAgain(againData)"
@cancel="showModal=false" @cancel="showModal=false"
showCancelButton showCancelButton
:title="sortAgainData.config.paPassedNumTakeTypeHint||'是否重新排号'" > :title="againData.config.paPassedNumTakeTypeHint||'是否重新排号'" >
</u-modal> </u-modal>
<!-- 子产品退票列表弹窗 --> <!-- 子产品退票列表弹窗 -->
<u-popup :show="refundPop" :round="20" @close="refundPop=false" closeable> <u-popup :show="refundPop" :round="20" @close="refundPop=false" closeable>
...@@ -451,7 +451,7 @@ export default { ...@@ -451,7 +451,7 @@ export default {
orderInfo:'',//订单信息 orderInfo:'',//订单信息
nowCodeNo:'',//当前动态二维码编号 nowCodeNo:'',//当前动态二维码编号
showModal:false,//重排号弹窗显示隐藏 showModal:false,//重排号弹窗显示隐藏
sortAgainData:'',//重排号数据 againData:'',//重排号数据
canTakeNumber:false,//返程或者第一次取号时，是否可以显示取号按钮 canTakeNumber:false,//返程或者第一次取号时，是否可以显示取号按钮
minute:'',//倒计时分钟 minute:'',//倒计时分钟
second:'',//倒计时秒 second:'',//倒计时秒
...@@ -922,16 +922,6 @@ export default { ...@@ -922,16 +922,6 @@ export default {
} }
} }
}) })
// //子产品获取公司Id,用于重排号传参
// if(dataObj.pays.length>0){
// item.merchantCodeCopy = dataObj.pays[0].companyId
// }
//子产品获取三方Id,用于重排号传参
// item.thirdIdCopy=dataObj.order.orderId
//子产品获取站点编码,用于重排号传参
// if(item.sorts.length>0){
// item.areaCodeCopy=item.sorts[0].projectId
// }
this.$forceUpdate() this.$forceUpdate()
//每两分钟刷新一次 //每两分钟刷新一次
this.numberFlag=setTimeout(()=>{ this.numberFlag=setTimeout(()=>{
...@@ -982,9 +972,9 @@ export default { ...@@ -982,9 +972,9 @@ export default {
}) })
}, },
//---点击重新取号，显示弹窗 //---点击重新取号，显示弹窗
clickSortAgain(item){ clickAgain(item){
this.showModal=true this.showModal=true
this.sortAgainData=item this.againData=item
}, },
//---重新排号 //---重新排号
sortAgain(item){ sortAgain(item){
...@@ -992,7 +982,7 @@ export default { ...@@ -992,7 +982,7 @@ export default {
againNumber:1,//是否重排 againNumber:1,//是否重排
userId:this.openid, userId:this.openid,
thirdId:item.thirdOrderId,//三方订单id thirdId:item.thirdOrderId,//三方订单id
areaCode:item.areaCode,//站点 areaCode:item.sorts[0].projectId,//当前排号站点
merchantCode:item.merchantCode, merchantCode:item.merchantCode,
orderId:item.id,//订单id orderId:item.id,//订单id
orderNum:item.orderNum,//订单数量 orderNum:item.orderNum,//订单数量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment