Skip to content

U
uni-pdtravel
Commit 8972574e authored by qipeng's avatar qipeng
Browse files
Options

1.券显示问题 

2.列表文字显示问题
parent 216e41df
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 27 deletions
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 8972574e
...@@ -317,15 +317,22 @@ ...@@ -317,15 +317,22 @@
</view> </view>
</view> </view>
<!--抵消券 对应的遮罩--> <!--抵消券 对应的遮罩-->
<image class="coupon" src="../../../../static/img/my/coupon.png" @click="showUseRule = true" v-if="couponType"></image> <view class="couponBox" @click="showUseRule = true" v-if="couponType">
<image class="coupon" src="../../../../static/img/my/coupon.png"></image>
<text class="coupon-price">
<text class="r-symbol">￥</text>
{{couponPrice}}
</text>
</view>
<u-mask :show="showtip || showUseRule"> <u-mask :show="showtip || showUseRule">
<view class="mask"> <view class="mask">
<view class="img-box"> <view class="img-box">
<!-- <image src="../../../../static/img/my/postcardTip.png" v-if="showtip"></image> <!-- <image src="../../../../static/img/my/postcardTip.png" v-if="showtip"></image>
<image src="../../../../static/img/my/useRule.png" v-if="showUseRule"></image> --> <image src="../../../../static/img/my/useRule.png" v-if="showUseRule"></image> -->
<div v-if="showtip" class="tips-vouchers"> <view v-if="showtip" class="tips-vouchers">
<view class="vouchers-title">恭喜您！</view> <view class="vouchers-title">恭喜您！</view>
<view class="vouchers-title2">获得摄影抵用<text>20</text>券</view> <view class="vouchers-title2">获得摄影抵用<text>{{couponPrice}}</text>券</view>
<image class="vouchers-img" src="../../../../static/img/my/bookmark.png"></image> <image class="vouchers-img" src="../../../../static/img/my/bookmark.png"></image>
<view class="vouchers-to" @click="showtipFun()"> <view class="vouchers-to" @click="showtipFun()">
使用规则 使用规则
...@@ -334,23 +341,18 @@ ...@@ -334,23 +341,18 @@
<view class="vouchers-text"> <view class="vouchers-text">
（使用地址：长江索道南站观景台旁） （使用地址：长江索道南站观景台旁）
</view> </view>
</div> </view>
<div v-if="showUseRule" class="tips-useRule"> <view v-if="showUseRule" class="tips-useRule">
<view class="useRule-title">使用规则</view> <view class="useRule-title">使用规则</view>
<view class="useRule-list"> <view class="useRule-list">
<view class="list-title">规则说明</view> <view class="list-title">规则说明</view>
<view class="list-text">· 任意金额皆可抵扣，最高抵扣20</view> <view class="list-text" v-for="(item,index) in couponRule" :key="index">· {{item}}</view>
<view class="list-text">· 指定地点可用，提交订单时自动抵扣</view>
<view class="list-text">· 优惠券只可使用一次，不找零不折现</view>
<view class="list-text">· 仅支持下载电子照片至手机</view>
<view class="list-text">· 如需打印，需额外支付打印费用</view>
</view> </view>
<view class="useRule-list"> <view class="useRule-list">
<view class="list-title">补充说明</view> <view class="list-title">补充说明</view>
<view class="list-text">· 使用地址：重庆市渝中区新华路151号长江索道 南站观景台旁</view> <view class="list-text" v-for="(item,index) in couponRuleRemind" :key="index">· {{item}}</view>
<view class="list-text">· 咨询电话：023-68567748</view>
</view> </view>
</div> </view>
<image class="coupon-backgruondImg" src="../../../../static/img/my/backgroundIcon01.png" ></image> <image class="coupon-backgruondImg" src="../../../../static/img/my/backgroundIcon01.png" ></image>
<u-icon class="close" name="close-circle" @click="closeMask"></u-icon> <u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
</view> </view>
...@@ -563,6 +565,9 @@ export default { ...@@ -563,6 +565,9 @@ export default {
showUseRule: false,//使用规则提示 showUseRule: false,//使用规则提示
couponType:false,//是否拥有相册优惠券 couponType:false,//是否拥有相册优惠券
findPageMarketList:[],//券信息 findPageMarketList:[],//券信息
couponPrice:0,//优惠价格
couponRule:[],//规则说明
couponRuleRemind:[],//补充说明
} }
}, },
onShow() { onShow() {
...@@ -666,8 +671,10 @@ export default { ...@@ -666,8 +671,10 @@ export default {
res.data.forEach((item,index)=>{ res.data.forEach((item,index)=>{
if(item.useRange==11&&item.couponStatus==1){ if(item.useRange==11&&item.couponStatus==1){
this.couponType=true this.couponType=true
this.couponPrice = item.deductPrice
this.couponRule = item.couponRule.split(';')//规则说明
this.couponRuleRemind = item.couponRuleRemind.split(';')//补充说明
} }
}) })
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -1598,10 +1605,14 @@ export default { ...@@ -1598,10 +1605,14 @@ export default {
} }
.tips-useRule{ .tips-useRule{
width: 100%; width: 100%;
padding: 50rpx 40rpx 0 32rpx; padding: 50rpx 40rpx 32rpx 32rpx;
margin: auto;
overflow: auto;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
right:0;
bottom: 0;
.useRule-title{ .useRule-title{
font-size: 36rpx; font-size: 36rpx;
color: #191919; color: #191919;
...@@ -1634,12 +1645,30 @@ export default { ...@@ -1634,12 +1645,30 @@ export default {
} }
} }
} }
.coupon { .couponBox{
position: fixed; position: fixed;
right: -30rpx; right: -30rpx;
bottom: 200rpx; bottom: 200rpx;
width: 140rpx; width: 140rpx;
height: 140rpx; height: 140rpx;
z-index: 20; z-index: 20;
.coupon {
width: 140rpx;
height: 140rpx;
}
.coupon-price {
position: absolute;
bottom: 46rpx;
left: 50%;
transform: translateX(-50%);
font-size: 40rpx;
font-weight: 700;
color: #fff;
}
.r-symbol {
font-size: 10rpx;
}
} }
</style> </style>
pages/my/order/orderList/orderList.vue
View file @ 8972574e
...@@ -98,18 +98,21 @@ ...@@ -98,18 +98,21 @@
<text class="left-Name">{{item.merchantName}}({{item.productName}})</text> <text class="left-Name">{{item.merchantName}}({{item.productName}})</text>
</view> </view>
<view class="title-right" v-if="item.orderType!=10&&item.orderType!=0"> <view class="title-right" v-if="item.orderType!=10&&item.orderType!=0">
<template v-if="item.orderType==1"> <template v-if="item.orderType==1&&item.subOrderType!=4">
{{item.orderStatus|orderStatus1}} {{item.orderStatus|orderStatus1}}
</template> </template>
<template v-else-if="item.orderType==2"> <template v-else-if="item.orderType==2&&item.subOrderType!=4">
{{item.orderStatus|orderStatus2}} {{item.orderStatus|orderStatus2}}
</template> </template>
<template v-else-if="item.orderType==3"> <template v-else-if="item.orderType==3&&item.subOrderType!=4">
{{item.orderStatus|orderStatus3}} {{item.orderStatus|orderStatus3}}
</template> </template>
<template v-else-if="item.orderType==4"> <template v-else-if="item.orderType==4&&item.subOrderType!=4">
{{item.orderStatus|orderStatus4}} {{item.orderStatus|orderStatus4}}
</template> </template>
<template v-else>
{{item.orderStatus|orderStatus5}}
</template>
</view> </view>
</view> </view>
<view class="block-main"> <view class="block-main">
...@@ -117,11 +120,12 @@ ...@@ -117,11 +120,12 @@
<view class="InfoWrap-mb30">订单时间：{{item.playDate.substr(0,10)}}</view> <view class="InfoWrap-mb30">订单时间：{{item.playDate.substr(0,10)}}</view>
<view> <view>
购买数量： 购买数量：
<template v-if="item.orderType==1">{{item.orderNum}}张</template> <template v-if="item.orderType==1&&item.subOrderType!=4">{{item.orderNum}}张</template>
<template v-else-if="item.orderType==2">{{item.orderNum}}间</template> <template v-else-if="item.orderType==2&&item.subOrderType!=4">{{item.orderNum}}间</template>
<template v-else-if="item.orderType==3">{{item.orderNum}}桌</template> <template v-else-if="item.orderType==3&&item.subOrderType!=4">{{item.orderNum}}桌</template>
<template v-else-if="item.orderType==4">{{item.orderNum}}箱</template> <template v-else-if="item.orderType==4&&item.subOrderType!=4">{{item.orderNum}}箱</template>
<template v-else-if="item.orderType==10">{{item.orderNum}}张</template> <template v-else-if="item.orderType==10&&item.subOrderType!=4">{{item.orderNum}}张</template>
<template v-else>{{item.orderNum}}份</template>
</view> </view>
<view class="allPice"> <view class="allPice">
<text>¥</text>{{item.totalMoney}} <text>¥</text>{{item.totalMoney}}
...@@ -140,7 +144,9 @@ ...@@ -140,7 +144,9 @@
<view class="block-button" v-if="item.orderStatus==5">评价</view> <view class="block-button" v-if="item.orderStatus==5">评价</view>
</template> </template>
<template v-else> <template v-else>
<view class="block-button" v-if="item.orderStatus==1||item.orderStatus==2||item.orderStatus==4||item.orderStatus==5||item.orderStatus==10" @click.stop="orderJump(item.id,item.orderType)">{{item.orderStatus==2?'去使用':'查看详情'}}</view> <template v-if="item.subOrderType!=4">
<view class="block-button" v-if="item.orderStatus==1||item.orderStatus==2||item.orderStatus==4||item.orderStatus==5||item.orderStatus==10" @click.stop="orderJump(item.id,item.orderType)">{{item.orderStatus==2?'去使用':'查看详情'}}</view>
</template>
<view class="block-button" v-if="item.orderStatus==2&&item.isRefund!=0" @click.stop="refundJump(item.id)">退款/售后</view> <view class="block-button" v-if="item.orderStatus==2&&item.isRefund!=0" @click.stop="refundJump(item.id)">退款/售后</view>
<view class="block-button" v-if="item.orderStatus==5">评价</view> <view class="block-button" v-if="item.orderStatus==5">评价</view>
</template> </template>
...@@ -310,7 +316,7 @@ export default { ...@@ -310,7 +316,7 @@ export default {
break break
} }
}, },
orderStatus4(i){//餐饮订单状态 orderStatus4(i){//特产状态
switch(i){ switch(i){
case 0: case 0:
return '待支付' return '待支付'
...@@ -349,6 +355,46 @@ export default { ...@@ -349,6 +355,46 @@ export default {
return '已过期 ' return '已过期 '
break break
} }
},
orderStatus5(i){
switch(i){
case 0:
return '待支付'
break
case 1:
return '确认中'
break
case 2:
return '支付成功'
break
case 3:
return '预定失败'
break
case 4:
return '核销中'
break
case 5:
return '待评价'
break
case 6:
return '退款中'
break
case 7:
return '部分退货/退款'
break
case 8:
return '全部退款退货 '
break
case 9:
return '取消 '
break
case 10:
return '已完成 '
break
case 11:
return '已过期 '
break
}
} }
}, },
components: { components: {
......
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