Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-app-ui into feature/asyncOrder

# Conflicts:
#	pages/market/one/leader/order.vue

pages/market/one/leader/order.vue

@@ -51,6 +51,8 @@
 					<template
 						v-if="item.peopleConfirmStatus == 1 && item.Sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
 						<view class="an" style="color: #f44336" @click.stop="orderRefund(item.id)">退款</view>
+					<template v-if="item.peopleConfirmStatus == 1 && item.sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
+						<view class="an" style="color: #f44336"  @click.stop="orderRefund(item.id)">退款</view>
 					</template>
 					<!-- 	<template v-if="item.resaleStatus == 1 && item.beingOrder == 0">
 						<view class="an" style="color: #f44336"  @click.stop="updateResalePrice(item.id)">修改转售价格</view>
@@ -257,11 +259,10 @@
 </script>
 
 <style lang="scss">
-	page {
-		background-color: $pg;
-	}
-
-	.state {
-		margin-right: -70px;
-	}
-</style>
+page {
+	background-color: $pg;
+}
+.state{
+	margin-right: -70px;
+}
+</style>