fix order status

src/components/timing_order/timing_order.vue

@@ -48,6 +48,7 @@ export default {
 	            const _obj = {
 	                '0': '计费中',
 	                '1': '已完成',
+					'4': '已退款',
 	            }
 	            return _obj[`${status}`] || '-'
 	        }

src/pages/order_list/order_list.vue

@@ -114,6 +114,7 @@
 	    {id:'', name:'全部'},
 	    {id:0, name:'计费中'},
 	    {id:1, name:'已完成'},
+		{id:4, name:'已退款'},
 	]
     export default {
         components: {
@@ -215,8 +216,8 @@
                     start: '',
                     end: ''
                 }
-                if(type == 3 || type == 1)_obj['start']=util.formatDate({}),_obj['end'] = util.formatDate({date: _afterSeven});
-                if(type == 4)_obj['start']=util.formatDate({date: _beforeSeven}),_obj['end'] = util.formatDate({});
+                if(type == 3 )_obj['start']=util.formatDate({}),_obj['end'] = util.formatDate({date: _afterSeven});
+                if(type == 4 || type == 1)_obj['start']=util.formatDate({date: _beforeSeven}),_obj['end'] = util.formatDate({});
                 console.log(_obj)
                 return _obj;
             },

src/subpackage/device/components/order/timing_detail/timing_detail.vue

@@ -23,10 +23,10 @@
 				<view v-if="orderInfo.order_type==1">项目：<text>{{orderInfo.project_name || '-'}}({{orderInfo.venue_name || '-'}})</text></view>
 				<view>进场时间：<text>{{orderInfo.start_time || '-'}}</text></view>
 				<!-- 离场时间 已完成显示 -->
-				<view v-if="orderInfo.pay_status == 1">离场时间：<text>{{orderInfo.end_time || '-'}}</text></view>
+				<view v-if="orderInfo.pay_status != 0">离场时间：<text>{{orderInfo.end_time || '-'}}</text></view>
 				<view>时长合计：<text>{{orderInfo.extension.duration || '-'}}</text></view>
 			</view>
-			<view class="tb-section" v-if="orderInfo.pay_status == 1">
+			<view class="tb-section" v-if="orderInfo.pay_status!= 0">
 				<view class="ts-line">
 					<view>金额小计</view>
 					<view>¥{{orderInfo.amount || 0}}</view>
@@ -48,7 +48,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="td-box" v-if="orderInfo.pay_status == 1">
+		<view class="td-box" v-if="orderInfo.pay_status != 0">
 			<view class="tb-title">支付信息</view>
 			<view class="tb-line">
 				<view>支付方式：<text>{{zh_pay_type(orderInfo.pay_type)}}</text></view>
@@ -96,6 +96,7 @@ export default {
 				const _obj = {
 					'0': '计费中',
 					'1': '已完成',
+					'4': '已退款',
 				}
 				return _obj[`${status}`] || '-'
 			}