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

pages/my/order/orderList/orderList.vue

@@ -150,7 +150,7 @@
 							<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||item.orderStatus==7&&item.isRefund!=0" @click.stop="refundJump(item.id)">退款/售后</view>
+							<view class="block-button" v-if="item.orderStatus==2&&item.isRefund!=0&&item.isRefund!=3||item.orderStatus==7&&item.isRefund!=0&&item.isRefund!=3" @click.stop="refundJump(item.id)">退款/售后</view>
 							<!-- <view class="block-button" v-if="item.orderStatus==5">评价</view> -->
 						</template>
 						<view class="block-button block-buttonOrange" v-if="item.orderStatus==0">去支付</view>