Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

BagStation/orderDetail/orderDetail.vue

@@ -43,7 +43,7 @@
 					</view>
 				</view>
 				<view class="cu-list menu solid-bottom">
-					<view class="cu-item arrow" @tap="toDetail(order)">
+					<view class="cu-item " :class="order.zpDisable === 'DISABLE' ? '' :'arrow'" @tap="toDetail(order)">
 						油站：
 						<text class="fr">{{order.siteName?order.siteName:''}}</text>
 					</view>
@@ -332,6 +332,7 @@
 				})
 			},
 		toDetail(item) {
+			if(item.zpDisable === 'DISABLE') return 
 			var itemS = JSON.stringify(item)
 			uni.setStorageSync('siteInfo',itemS) 
 			uni.navigateTo({
@@ -345,6 +346,7 @@
 				})
 			},
 			cancelOrder() {
+				
 				orderApi.cancelOrder(this.id).then(res => {
 					if (res.code == 20000) {
 						uni.showToast({