Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

pages/order/index.vue

@@ -43,47 +43,67 @@
 		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getList" @init="mescrollInit" :use="false"
 			v-if="tabIndex ==0">
 			<view class="order_item" v-for="(item,index) in orderList" :key="item.id" @click="geDetail(item)">
-				<view class="order_id" v-if="item.stateCode && !item.refundType">
+				<view class="order_id" >
 					<view class="id_left">
 						订单编号：{{item.orderId}}
 					</view>
-					<view class="id_right" v-if="item.stateCode ==5">
-						<!-- {{item.state}} -->
-						待付款
-					</view>
+					
 					<view class="id_right" v-if="item.stateCode ==0" style="color: #ff9900;">
 						待使用
 					</view>
-					<view class="id_right" v-if="item.stateCode == 4" style="color:#449AFF ;">
-						退款/售后
-					</view>
 					<view class="id_right" v-if="item.stateCode ==1">
 						已使用
 					</view>
-				</view>
-				<view class="order_id" v-if="item.stateCode == 4 && item.refundType ">
-					<view class="id_left">
-						订单编号：{{item.orderId}}
+					<view class="id_right" v-if="item.stateCode == 2">
+						待评价
+					</view>
+					<view class="id_right" v-if="item.stateCode ==3">
+						已过期
 					</view>
-					<view class="id_right" v-if="item.refundType ==0">
-						未退款
+					<view class="id_right" v-if="item.stateCode == 5">
+						待付款
+					</view>
+					<view class="id_right" v-if="item.stateCode == 6">
+						支付中
+					</view>
+					<view class="id_right" v-if="item.stateCode == 7">
+						支付失败
+					</view>
+					<view class="id_right" v-if="item.stateCode == 8">
+						已撤销
+					</view>
+					<view class="id_right" v-if="item.stateCode == 9">
+						已退款
+					</view>
+					<view class="id_right" v-if="item.stateCode == 10">
+						订单关闭
+					</view>
+					<!-- <view class="id_right" v-if="item.stateCode == 4 && item.refundType !=1" style="color:#449AFF ;">
+						退款/售后
+					</view> -->
+					
+					<view class="id_right" v-if="item.refundType ==0  && item.stateCode == 4">
+						售后申请中
 					</view>
-					<view class="id_right" v-if="item.refundType ==1">
+					<view class="id_right" v-if="item.refundType ==1 && item.stateCode == 4">
 						退款成功
 					</view>
-					<view class="id_right" v-if="item.refundType ==2">
+					<view class="id_right" v-if="item.refundType ==2  && item.stateCode == 4">
 						退款中
 					</view>
-					<view class="id_right" v-if="item.refundType ==3">
+					<view class="id_right" v-if="item.refundType ==3  && item.stateCode == 4">
 						退款失败
 					</view>
-					<view class="id_right" v-if="item.refundType ==4">
+					<view class="id_right" v-if="item.refundType ==4  && item.stateCode == 4">
 						拒绝退款
 					</view>
-					<view class="id_right" v-if="item.refundType ==99">
+					<view class="id_right" v-if="item.refundType ==99  && item.stateCode == 4">
 						挂起
 					</view>
 				</view>
+			<!-- 	<view class="order_id" v-if="item.stateCode == 4 && item.refundType ">
+					
+				</view> -->
 				<!-- 普通订单 -->
 				<view class="order_product" v-if="item.categoryId != 1945013773786701826">
 					<view class="img">