Merge branch 'dev_v3' of http://git.dgtis.com/armg/wxapp_shuibei into dev_v3

components/OrderListCard/index.vue

@@ -17,7 +17,7 @@
             "
           >{{ order.activityType }}</text
           >
-          {{ order.orderStatus }}
+          {{ order.status == 6 ? '已取消':order.orderStatus }}
         </view>
       </view>
       <view

pages/order_details/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="order-details">
 			<view class="header" v-if="orderInfo.shippingType === 1">
-				<view class="picTxt">
+				<view class="picTxt" v-if="orderInfo.status!=6">
 					<image v-if="!orderInfo.paid" src="@/static/images/shop/daifukuan@2x.png" mode=""></image>
 					<image v-else-if="orderInfo.status === 0 || orderInfo.status === 1" src="@/static/images/shop/daifahuo@2x.png" mode=""></image>
 					<image v-else-if="orderInfo.status === 3" src="@/static/images/shop/yiwancheng@2x.png" mode=""></image>
@@ -239,7 +239,7 @@
 <!-- && orderInfo.status != 0 -->
 		<template v-if="isGoodsReturn == false && orderInfo.status != 0 || orderInfo.status == 0 && !orderInfo.paid">
 			<view class="kong"></view>
-			<view class="footer">
+			<view class="footer" v-if="orderInfo.status!=6">
 				<view class="footer-box">
 					<view class="qs-btn" v-if="!orderInfo.paid" @click.stop="cancelOrder">
 						<image src="@/static/images/shop/closeOrder@2x.png" mode=""></image>

pages/order_list/index.vue

@@ -110,7 +110,11 @@
 			orderStatus: 4,
       value: 4
 		},
-
+    {
+      name: '已取消',
+      orderStatus: 6,
+      value: 6
+    },
 	]) //头部导航
 
 	// 生命周期