Skip to content

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

联票样式处理

parent 658b92e3
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 325 deletions
pages/combination/distributionCombiChoose/distributionCombiChoose.vue
View file @ d467d949
...@@ -10,13 +10,9 @@ ...@@ -10,13 +10,9 @@
</u-swiper> </u-swiper>
</view> </view>
<view class="middle"> <view class="middle">
<!-- <view class="tabbar" :style="tabbarObj"> <view class="detail">
<text v-for="(item, index) in tabbar" :key="index" @click="tabbarChange(index)" :class="{ on: active == index }">
{{ item }} </view>
</text>
</view> -->
<swiper :current="active" @animationfinish="animationfinish" class="swiper-box" :style="{ height: swiperHeight + 'px' }">
<swiper-item class="swiper-item">
<checkbox-group @change="checkboxChange" class="checkbox-box"> <checkbox-group @change="checkboxChange" class="checkbox-box">
<view class="merchant" v-for="(item, index) in scenicList" :key="index"> <view class="merchant" v-for="(item, index) in scenicList" :key="index">
<view class="merchant-title" @click="clikDetail(item.id)"> <view class="merchant-title" @click="clikDetail(item.id)">
...@@ -55,15 +51,6 @@ ...@@ -55,15 +51,6 @@
<view class="product-price"> <view class="product-price">
<view style="font-size: 24rpx;display: flex;"> <view style="font-size: 24rpx;display: flex;">
<text class="product-rule" v-if="items.productRefundRuleVo"> <text class="product-rule" v-if="items.productRefundRuleVo">
<!-- 索道写死 -->
<!-- <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> -->
<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text> <text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text> <text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text> <text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
...@@ -94,59 +81,6 @@ ...@@ -94,59 +81,6 @@
</view> </view>
</view> </view>
</checkbox-group> </checkbox-group>
<!-- <u-empty text="空空如也..." mode="list" v-if="scenicList.length == 0" width="320" height="320"></u-empty> -->
</swiper-item>
<!-- <swiper-item class="swiper-item">
<u-waterfall v-model="albumList" class="waterfall" style="padding-top: 8rpx;">
<template v-slot:left="{leftList}">
<view v-for="(item, index) in leftList" :key="index" class="album-left" @click="goAlbum(index)">
<view class="album-list-top">
<image :src="item.image" mode="widthFix"></image>
</view>
<view class="album-list-bottom" :style="{'background': item.color}">
<view>{{item.title}}</view>
<view>快来定制吧</view>
<view>
<view class="album-btn">
点击定制
<u-icon name="arrow-right" style="margin-left: 4rpx;"></u-icon>
</view>
<text class="count">{{item.count}}</text>
</view>
</view>
</view>
</template>
<template v-slot:right="{rightList}">
<view v-for="(item, index) in rightList" :key="index" class="album-right" @click="goAlbum(index)">
<view class="album-list-top">
<image :src="item.image" mode="widthFix"></image>
</view>
<view class="album-list-bottom" :style="{'background': item.color}">
<view>{{item.title}}</view>
<view>快来定制吧</view>
<view>
<view class="album-btn">
点击定制
<u-icon name="arrow-right" style="margin-left: 4rpx;"></u-icon>
</view>
<text class="count">{{item.count}}</text>
</view>
</view>
</view>
</template>
</u-waterfall>
</swiper-item>
<swiper-item class="swiper-item">
<u-empty text="空空如也..." mode="list" width="320" height="320"></u-empty>
</swiper-item>
<swiper-item class="swiper-item">
<u-empty text="空空如也..." mode="list" width="320" height="320"></u-empty>
</swiper-item> -->
</swiper>
<u-empty text="暂无数据..." mode="list" v-if="scenicList.length == 0" iconSize="160" textSize='24' textColor='#3688FF'></u-empty> <u-empty text="暂无数据..." mode="list" v-if="scenicList.length == 0" iconSize="160" textSize='24' textColor='#3688FF'></u-empty>
</view> </view>
<view class="bottom"> <view class="bottom">
...@@ -223,9 +157,6 @@ export default { ...@@ -223,9 +157,6 @@ export default {
groupId: '', //组合Id groupId: '', //组合Id
groupChannelId: '', //组合渠道Id groupChannelId: '', //组合渠道Id
channelId:'',//渠道Id channelId:'',//渠道Id
// tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表
active: 0, //导航栏下标
currentNum:0,//轮播图下标 currentNum:0,//轮播图下标
imgList: [], //图片列表 imgList: [], //图片列表
scenicList:[], //景区数据 scenicList:[], //景区数据
...@@ -235,7 +166,6 @@ export default { ...@@ -235,7 +166,6 @@ export default {
showModal: false, //是否显示模态框 showModal: false, //是否显示模态框
chooseMerchantProduct: '', //不支持多产品购买时，选中的景区产品 chooseMerchantProduct: '', //不支持多产品购买时，选中的景区产品
swiperHeight: 0 ,//swiper高度 swiperHeight: 0 ,//swiper高度
tabbarObj:'',
albumList: [{ albumList: [{
title: '精彩瞬间', title: '精彩瞬间',
count: '10W+', count: '10W+',
...@@ -454,9 +384,6 @@ export default { ...@@ -454,9 +384,6 @@ export default {
} }
}) })
}) })
this.$nextTick(() => {
this.countSwiper()
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
...@@ -526,21 +453,6 @@ export default { ...@@ -526,21 +453,6 @@ export default {
this.tabbarObj='top:-40rpx;position:relative;border-radius:16rpx;' this.tabbarObj='top:-40rpx;position:relative;border-radius:16rpx;'
} }
}, },
//---导航栏切换
tabbarChange(index) {
this.active = index
if(index==0){
this.countSwiper()
}
if(index==1){
this.countSwiper('waterfall')
}
},
//---swiper滑动结束，分别设置tabs和swiper的状态
animationfinish(e) {
let current = e.detail.current
this.active = current
},
//---展示客服组件 //---展示客服组件
showCustomer() { showCustomer() {
this.$refs.customer.showPop = true this.$refs.customer.showPop = true
...@@ -556,29 +468,15 @@ export default { ...@@ -556,29 +468,15 @@ export default {
this.initDetail(merchantId) this.initDetail(merchantId)
}, },
//计算swiper高度
countSwiper(label){
let labels=label||'checkbox-box'
this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this)
query.select(`.${labels}`).boundingClientRect(data => {
if(data){
this.swiperHeight=data.height+20
}
}).exec()
})
},
//---展示更多产品 //---展示更多产品
showMoreProduct(item) { showMoreProduct(item) {
item.productListCopy = item.productList item.productListCopy = item.productList
this.$forceUpdate() this.$forceUpdate()
this.countSwiper()
}, },
//---收起产品 //---收起产品
retractProduct(item) { retractProduct(item) {
item.productListCopy = item.productList.slice(0, 2) item.productListCopy = item.productList.slice(0, 2)
this.$forceUpdate() this.$forceUpdate()
this.countSwiper()
}, },
//---多选框变化 //---多选框变化
checkboxChange(e) { checkboxChange(e) {
...@@ -698,36 +596,7 @@ export default { ...@@ -698,36 +596,7 @@ export default {
}) })
} }
} }
},
//---跳转影集页面
goAlbum(index){
if(index==0){
let data={
openid: uni.getStorageSync('openid')||''
} }
this.$request('wechatUser/pdFace/checkScanFace',data).then(res => {
if (res.code === '00') {
let merchantId = this.merchantId || 'z0015605022691a5945bbe463141668c' // 默认长江索道
if (res.data.isScanFace == 0) { //未扫脸
uni.navigateTo({
url:`/pages/album/getPortrait?merchantId=${merchantId}`
})
} else if (res.data.isScanFace == 1) { //已扫脸
let faceIds = JSON.stringify(res.data.faceIds)
let companyId = this.companyId
uni.navigateTo({
url: `/pages/album/myPhotoAlbum/myPhotoAlbum?faceIds=${faceIds}&companyId=${companyId}&merchantId${merchantId}`
})
}
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
}
},
} }
} }
</script> </script>
...@@ -743,39 +612,6 @@ export default { ...@@ -743,39 +612,6 @@ export default {
padding: 0 24rpx 100rpx 24rpx; padding: 0 24rpx 100rpx 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// flex: 1;
}
.swiper-box {
// flex: 1;
position: relative;
top: -40rpx;
}
.tabbar {
transition:1s;
width: 100%;
left: 0;
z-index: 1;
position: relative;
top: -40rpx;
background: #fff;
box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.08);
border-radius: 16rpx;
display: flex;
justify-content: space-between;
font-size: 32rpx;
text {
padding: 24rpx 32rpx 24rpx 20rpx;
border-radius: 16rpx;
width: 33.3%;
text-align: center;
}
}
.tabbar .on {
// background: url('../../../static/img/scenic/tabbar.png') no-repeat;
background: $theme;
background-size: 100% 100%;
color: #fff;
font-weight: bold;
} }
.merchant { .merchant {
border-radius: 16rpx; border-radius: 16rpx;
...@@ -956,57 +792,10 @@ export default { ...@@ -956,57 +792,10 @@ export default {
font-size: 32rpx; font-size: 32rpx;
width: 200rpx; width: 200rpx;
} }
//摄影、旅拍
.album-left{
margin:8rpx 6rpx 0 0;
}
.album-right{
margin: 8rpx 0 0 6rpx;
}
.album-list-top image {
width: 100%;
}
.album-list-bottom{
border-radius: 0 0 16rpx 16rpx;
position: relative;
top: -4px;
padding: 20rpx 16rpx;
color: #fff;
view:first-child{
font-weight: bold;
}
view:nth-child(2){
font-size: 24rpx;
margin-top: 16rpx;
}
view:nth-child(3){
display: flex;
justify-content: space-between;
margin-top: 20rpx;
}
}
.album-btn{
display: flex;
width: 160rpx;
height: 44rpx;
background: #E1E1D9;
border-radius: 20rpx 20rpx 20rpx 20rpx;
font-size: 22rpx;
color: #333333;
align-items: center;
justify-content: center;
padding-left: 8rpx;
}
.suodaoImg{ .suodaoImg{
position: fixed; position: fixed;
z-index: 9999; z-index: 9999;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.swiper-item /deep/ .u-waterfall{
padding-top:8rpx;
}
.swiper-item /deep/ .u-empty{
height: 300px;
}
</style> </style>
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @ d467d949
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<view class="wrap"> <view class="wrap">
<!-- 联票电子门票 --> <!-- 联票电子门票 -->
<view class="top"> <view class="top">
<text class="one-txt-cut"> <text>
{{orderInfo.productName}} {{orderInfo.productName}}X{{orderInfo.orderNum}}份
</text> </text>
<text> <text>
¥{{orderInfo.totalMoney}} ¥{{orderInfo.totalMoney}}
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view class="productInfo" v-for="(item,index) in orderInfo.childs" :key="index"> <view class="productInfo" v-for="(item,index) in orderInfo.childs" :key="index">
<view class="product-top"> <view class="product-top">
<view class="product-name"> <view class="product-name">
<text class="one-txt-cut">{{item.productName}}</text> <text>{{item.productName}}</text>
<text>{{item.orderStatus|orderStatus}}</text> <text>{{item.orderStatus|orderStatus}}</text>
</view> </view>
<view class="product-datetime"> <view class="product-datetime">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<!-- 等于1为需要排号的景区 --> <!-- 等于1为需要排号的景区 -->
<view class="product-number" v-if="item.showSortInfo==true" v-for="(item2,a) in item.sorts" :key='a'> <view class="product-number" v-if="item.showSortInfo==true" v-for="(item2,a) in item.sorts" :key='a'>
<!-- 1可进入等候区 --> <!-- 1可进入等候区 -->
<view v-if="item2.sortFair==1" style="background: #31AA6B;color: #ffffff;"> <view v-if="item2.sortFair==1" style="background: #31AA6B;color: #ffffff;border: none;">
<view class="my-number" > <view class="my-number" >
<view> <view>
<view>我的排队号</view> <view>我的排队号</view>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<view class="current-number"> <view class="current-number">
当前排队区间<text>{{item2.showStart}}-{{item2.showEnd}}</text>号 当前排队区间<text>{{item2.showStart}}-{{item2.showEnd}}</text>号
</view> </view>
<view class="number-notice" style="color: #ffffff;"> <view class="number-notice" style="color: #9ed9ba;">
<view> <view>
温馨提示：{{item2.config.paRowNumHint}} 温馨提示：{{item2.config.paRowNumHint}}
</view> </view>
...@@ -175,14 +175,14 @@ ...@@ -175,14 +175,14 @@
<!-- 后端返回了二维码才显示下面内容 --> <!-- 后端返回了二维码才显示下面内容 -->
<view class="product-code" v-if="item.orderTicketDetailList.length>0&&item.orderTicketDetailList[0].verifyCode"> <view class="product-code" v-if="item.orderTicketDetailList.length>0&&item.orderTicketDetailList[0].verifyCode">
<view class="code-title"> <view class="code-title">
凭「身份证」或「入园码」直接入园 凭「入园码」直接入园
</view> </view>
<view class="code-image"> <view class="code-image">
<image :src="item.codeImage"></image> <image :src="item.codeImage"></image>
</view> </view>
<view class="code-number"> <view class="code-number">
<text> <text>
数字码:{{item.orderTicketDetailList[0].verifyCode}} {{item.orderTicketDetailList[0].verifyCode}}
</text> </text>
<text @click="copyText(item.orderTicketDetailList[0].verifyCode)"> <text @click="copyText(item.orderTicketDetailList[0].verifyCode)">
复制 复制
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<view class="rufundRule"> <view class="rufundRule">
<!-- 等于3退票规则以子订单为准 --> <!-- 等于3退票规则以子订单为准 -->
<template v-if="orderInfo.isRefund==3"> <view style="padding: 32rpx;" v-if="orderInfo.isRefund==3">
<view v-for="(item,index) in orderInfo.childs" :key="index" > <view v-for="(item,index) in orderInfo.childs" :key="index" >
<view class="rule-title"> <view class="rule-title">
{{item.productName}}退改规则 {{item.productName}}退改规则
...@@ -250,9 +250,9 @@ ...@@ -250,9 +250,9 @@
</view> </view>
</view> </view>
</view> </view>
</template> </view>
<!-- 不等于3退票规则以主订单为准 --> <!-- 不等于3退票规则以主订单为准 -->
<template v-else> <view style="padding: 32rpx;" v-else>
<view class="rule-title"> <view class="rule-title">
退改规则 退改规则
</view> </view>
...@@ -291,10 +291,10 @@ ...@@ -291,10 +291,10 @@
</view> </view>
</view> </view>
</template> </view>
<view class="rule-service" @click="makePhone('4000720368')"> <view class="rule-service" @click="makePhone('4000720368')">
<u-icon name='kefu-ermai'></u-icon> <u-icon name='kefu-ermai'></u-icon>
联系客服 <text style="margin-left: 12rpx;">联系客服</text>
</view> </view>
</view> </view>
<view class="orderInfo"> <view class="orderInfo">
...@@ -305,7 +305,9 @@ ...@@ -305,7 +305,9 @@
<view> <view>
<text style="flex-shrink: 0;">订单编号</text> <text style="flex-shrink: 0;">订单编号</text>
<view class="order-id"> <view class="order-id">
<text class="one-txt-cut" style="flex: 1;">{{orderInfo.id?orderInfo.id.substr(0,8)+"****"+orderInfo.id.substr(orderInfo.id.length-8,8):''}}</text> <text class="one-txt-cut" style="flex: 1;text-align: right;">
{{orderInfo.id?orderInfo.id.substr(0,8)+"****"+orderInfo.id.substr(orderInfo.id.length-8,8):''}}
</text>
<text class="order-btn">复制</text> <text class="order-btn">复制</text>
</view> </view>
</view> </view>
...@@ -613,8 +615,7 @@ export default { ...@@ -613,8 +615,7 @@ export default {
refundTime = orderInfo.playDate+' '+item2.refundTime refundTime = orderInfo.playDate+' '+item2.refundTime
} }
let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime() let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime()
//refundDateType退款时间0之前1之后2至（用于区间） // refundDateType退款时间0之前,1至(用于区间),2之后
if(item2.refundDateType==0){ if(item2.refundDateType==0){
if(nowTimeNumber<refundTimeNumber){ if(nowTimeNumber<refundTimeNumber){
this.subRefundBtn=true this.subRefundBtn=true
...@@ -625,15 +626,6 @@ export default { ...@@ -625,15 +626,6 @@ export default {
} }
} }
if(item2.refundDateType==1){ if(item2.refundDateType==1){
if(nowTimeNumber>refundTimeNumber){
this.subRefundBtn=true
//增加字段用于弹窗展示该产品是否可退
item.ifRefund=true
}else{
this.subRefundBtn=false
}
}
if(item2.refundDateType==2){
let refundEndTime='' let refundEndTime=''
if(item2.refundDay){ if(item2.refundDay){
let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay) let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
...@@ -649,12 +641,20 @@ export default { ...@@ -649,12 +641,20 @@ export default {
this.subRefundBtn=false this.subRefundBtn=false
} }
} }
if(item2.refundDateType==2){
if(nowTimeNumber>refundTimeNumber){
this.subRefundBtn=true
//增加字段用于弹窗展示该产品是否可退
item.ifRefund=true
}else{
this.subRefundBtn=false
}
}
} }
}) })
} }
} }
}) })
console.log(this.orderInfo.childs)
}else{ }else{
// 退票规则以主订单为准 // 退票规则以主订单为准
if(orderInfo.orderStatus==2||orderInfo.orderStatus==7){ if(orderInfo.orderStatus==2||orderInfo.orderStatus==7){
...@@ -696,13 +696,6 @@ export default { ...@@ -696,13 +696,6 @@ export default {
} }
} }
if(item.refundDateType==1){ if(item.refundDateType==1){
if(nowTimeNumber>refundTimeNumber){
this.mainRefundBtn=true
}else{
this.mainRefundBtn=false
}
}
if(item.refundDateType==2){
let refundEndTime='' let refundEndTime=''
if(item.refundDay){ if(item.refundDay){
let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay) let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay)
...@@ -716,6 +709,14 @@ export default { ...@@ -716,6 +709,14 @@ export default {
this.mainRefundBtn=false this.mainRefundBtn=false
} }
} }
if(item.refundDateType==2){
if(nowTimeNumber>refundTimeNumber){
this.mainRefundBtn=true
}else{
this.mainRefundBtn=false
}
}
} }
}) })
} }
...@@ -1020,17 +1021,20 @@ export default { ...@@ -1020,17 +1021,20 @@ export default {
margin-top: 20rpx; margin-top: 20rpx;
background: #ffffff; background: #ffffff;
border-radius: 16rpx; border-radius: 16rpx;
padding: 40rpx 32rpx 32rpx 32rpx; padding: 40rpx 0 32rpx 0;
} }
.product-refund-detail{ .product-refund-detail{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 20rpx 0; padding: 20rpx 32rpx;
border-bottom: 1px solid #EDEDED; border-bottom: 1px solid #EDEDED;
} }
.product-refund-list view{ .product-refund-list view{
margin-top: 10rpx; margin-top: 10rpx;
} }
.product-top{
padding: 0 32rpx;
}
.product-name{ .product-name{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -1055,13 +1059,14 @@ export default { ...@@ -1055,13 +1059,14 @@ export default {
} }
} }
.product-number{ .product-number{
padding: 0 32rpx;
border-radius: 16rpx; border-radius: 16rpx;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #dcdcdc;
margin-top: 20rpx; margin-top: 20rpx;
>view{ >view{
padding: 32rpx; padding: 32rpx;
border-radius: 16rpx; border-radius: 16rpx;
border: 1px solid #dcdcdc;
} }
} }
.my-number{ .my-number{
...@@ -1122,7 +1127,7 @@ export default { ...@@ -1122,7 +1127,7 @@ export default {
} }
.code-title{ .code-title{
margin-top: 40rpx; margin-top: 40rpx;
font-size: 32rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.code-number{ .code-number{
...@@ -1162,7 +1167,6 @@ export default { ...@@ -1162,7 +1167,6 @@ export default {
// 退票规则 // 退票规则
.rufundRule{ .rufundRule{
background: #ffffff; background: #ffffff;
padding: 32rpx;
border-radius: 16rpx; border-radius: 16rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
...@@ -1181,12 +1185,12 @@ export default { ...@@ -1181,12 +1185,12 @@ export default {
} }
} }
.rule-list{ .rule-list{
margin: 30rpx 0; margin-top:30rpx;
} }
.rule-service{ .rule-service{
display: flex; display: flex;
align-items: center; align-items: center;
padding-top: 36rpx; padding: 36rpx 0;
justify-content: center; justify-content: center;
border-top: 1px solid #EBEEF5; border-top: 1px solid #EBEEF5;
} }
...@@ -1226,6 +1230,7 @@ export default { ...@@ -1226,6 +1230,7 @@ export default {
border-radius: 20rpx; border-radius: 20rpx;
font-size: 24rpx; font-size: 24rpx;
margin-left: 20rpx; margin-left: 20rpx;
color: #333333;
} }
.bottom{ .bottom{
position: fixed; position: fixed;
...@@ -1238,7 +1243,7 @@ export default { ...@@ -1238,7 +1243,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 40rpx; padding: 0 40rpx;
justify-content: space-around; justify-content:flex-end;
text{ text{
display: inline-block; display: inline-block;
width: 170rpx; width: 170rpx;
...@@ -1248,6 +1253,7 @@ export default { ...@@ -1248,6 +1253,7 @@ export default {
text-align: center; text-align: center;
line-height: 60rpx; line-height: 60rpx;
color: #666666; color: #666666;
margin-left: 20rpx;
} }
} }
.subtitle{ .subtitle{
......
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