Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/uniapp-qxk

pages/order/order.vue

@@ -74,7 +74,7 @@
 						  <view class="justify-between">
 						    <view class="flex-row group_8">
 						      <image :src="showOrderStatusIcon(item.status)" class="image_7" />
-						      <text class="text_7">{{ ['在线送评','确认收货','定价','发货'][item.status-1] }}</text>
+						      <text class="text_7">{{ ['在线送评','确认收货','定价','发货','已确认'][item.status-1] }}</text>
 						    </view>
 						    <text class="text_8" :style="{color: item.status_text_color}">{{ item.status_text }}</text>
 						  </view>
@@ -139,6 +139,7 @@
 	import orderStatus2 from '@/static/icon/order_status2.png';
 	import orderStatus3 from '@/static/icon/order_status3.png';
 	import orderStatus4 from '@/static/icon/order_status4.png';
+	import orderStatus5 from '@/static/icon/order_status5.png';
 	
 	export default {
 		data(){
@@ -242,7 +243,7 @@
 			},
 			showOrderStatusIcon(){
 				return function(status){
-					return [orderStatus1, orderStatus2, orderStatus3, orderStatus4][status-1]
+					return [orderStatus1, orderStatus2, orderStatus3, orderStatus4, orderStatus5][status-1]
 				}
 			}
 		},