Skip to content

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

订单列表 ordertype==11 跳转相册订单详情 

订单详情头部修改  头部显示状态 当为退款中显示额外文字：款项预计1-7个工作日退回原支付账户
订单详情 二维码只有 orderStatus==2/4的时候才显示
parent 04feaacc
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 17 deletions
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ c8b2a0b0
......@@ -190,7 +190,7 @@ export default {
}).then((res)=>{
if(res.code=='00'){
this.merchantMessage = res.data
this.checkMonkey()
this.checkMonkey()
}else{
this.$refs.uToast.show({
title: res.message,
......@@ -252,7 +252,7 @@ export default {
item['image']=item.faceSourceUrl||item.faceAiUrl
item['title']=''
})
this.mearchLoadList()
this.mearchLoadList()
}else{
this.$refs.uToast.show({
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ c8b2a0b0
......@@ -3,7 +3,7 @@
<view class="order-status">
<view class="status-box">
<view class="status-type" v-if="orderInfo.orderStatus==2">
<template v-if="orderInfo.orderType==1">
<!-- <template v-if="orderInfo.orderType==1">
出票成功
</template>
<template v-else-if="orderInfo.orderType==2">
......@@ -14,13 +14,15 @@
</template>
<template v-else-if="orderInfo.orderType==4">
购买成功
</template>
</template> -->
{{orderInfo.orderStatus|orderStatus1}}
</view>
<view class="status-product">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view>
<!-- {{orderInfo.merchantName}}（{{orderInfo.productName}}） -->
<view class="status-product" v-if="orderInfo.orderStatus==6">款项预计1-7个工作日退回原支付账户</view>
</view>
</view>
<template v-if="orderInfo.orderType==1&&ticketCode!=null&&orderInfo.orderStatus==2||orderInfo.orderType==1&&ticketCode!=null&&orderInfo.orderStatus==4||orderInfo.orderType==3&&ticketCode!=null&&orderInfo.orderStatus==4||orderInfo.orderType==3&&ticketCode!=null&&orderInfo.orderStatus==2">
<view class="order-certificate order-allType order-positionTop">
<view class="order-certificate order-allType order-positionTop" :class="orderInfo.orderStatus==6?'order-positionTopAct':''" >
<!-- <view class="alltype-title">
<view class="title-line">
<view></view>
......@@ -52,7 +54,7 @@
</view>
</view>
</template>
<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1">
<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==4||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==2">
<view class="alltype-title">
<!-- <view class="title-line">
<view></view>
......@@ -1020,11 +1022,13 @@ export default {
.order-status .status-box {
display: flex;
flex-wrap: wrap;
color: #fff;
overflow: hidden;
}
.order-status .status-type {
width: 100%;
font-size: 48rpx;
line-height: 66rpx;
font-weight: bold;
......@@ -1035,8 +1039,7 @@ export default {
.order-status .status-product,
.order-status .status-prompt {
font-size: 28rpx;
line-height: 85rpx;
margin-left: 16rpx;
line-height: 65rpx;
overflow:hidden;
white-space: nowrap;
text-overflow: ellipsis;
......@@ -1113,10 +1116,13 @@ export default {
top: 24rpx !important;
}
.order-positionTop:nth-child(2){
margin-top: -302rpx;
margin-top: -322rpx;
position: relative;
z-index: 2;
}
.order-positionTopAct{
margin-top: -262rpx;
}
/*排队详情*/
.order-queueUp {
......
pages/my/order/orderList/orderList.vue
View file @ c8b2a0b0
......@@ -71,7 +71,7 @@
<!--列表-->
<view class="product-goods" v-if="lists.length>0">
<template v-for="(item,index) in lists">
<view class="product-block" :key="index" v-if="item.showList" @click="orderJump(item.id)">
<view class="product-block" :key="index" v-if="item.showList" @click="orderJump(item.id,item.orderType)">
<view class="block-title">
<view class="title-left">
<view class="left-imgBox" v-if="item.orderType==1">
......@@ -135,12 +135,12 @@
<view class="block-button" @click.stop="operation(item,index)" v-if="item.orderStatus==9||item.orderStatus==10">删除</view>
<view class="block-button" @click.stop="operation(item,index)" v-if="item.orderStatus==0">取消订单</view>
<template v-if="item.orderType==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)">查看详情</view>
<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)">查看详情</view>
<view class="block-button" v-if="item.orderStatus==2||item.orderStatus==4||item.orderStatus==5||item.orderStatus==10">查看物流</view>
<view class="block-button" v-if="item.orderStatus==5">评价</view>
</template>
<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.orderStatus==2?'去使用':'查看详情'}}</view>
<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>
<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>
</template>
......@@ -619,10 +619,17 @@ export default {
operationClose(){//操作 删除和取消订单 取消
this.configShow =false
},
orderJump(orderId){//-------------------订单详情跳转
uni.navigateTo({
url: '/pages/my/order/electronicTicket/electronicTicket?orderId='+orderId
})
orderJump(orderId,orderType){//-------------------订单详情跳转
if(orderType==11){
uni.navigateTo({
url: '/pages/album/albumOrderdetail/albumOrderdetail?orderId='+orderId
})
}else{
uni.navigateTo({
url: '/pages/my/order/electronicTicket/electronicTicket?orderId='+orderId
})
}
},
refundJump(id){//-------------------退款
uni.reLaunch({
......
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