Skip to content

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

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

parents 9c3828d6 3e63c4b8
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
pages/my/order/orderList/orderList.vue
View file @ 5ad666f0
...@@ -97,17 +97,20 @@ ...@@ -97,17 +97,20 @@
</view> </view>
<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!=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==10&&item.subOrderType!=4">
{{item.orderStatus|orderStatus1}}
</template>
<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> <template v-else>
......
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