bug修改

pages/europeOrder/eorderDetail.vue

@@ -57,7 +57,7 @@
 		 			   <view class="timeLeft">
 		 				   <span v-if="orderData.sheetState==1||orderData.sheetState==2||orderData.sheetState==0">预约到店：{{orderData.orderTime}}</span>
 						   <span v-else>服务时间：{{orderData.serviceTime}}</span>
-		 				   <image v-if="orderData.sheetState==2" src="../../static/img/icon_edit.png" mode="" class="timeEditImg" @click="timeShowClick"></image>
+		 				   <image v-if="orderData.sheetState==2&iOSInfo.indexOf('P003')!=-1" src="../../static/img/icon_edit.png"   mode="" class="timeEditImg" @click="timeShowClick"></image>
 		 			   </view>
 		 			<!--   <view class="timeRight" @click="qrcodeClick">订单码</view> -->
 		 		   </view>
@@ -210,7 +210,7 @@
 		 				<view class="payBtn" @click="evaluate">立即评价</view>
 		 		</view> -->
 				<view class="orderBottom" v-if="orderData.sheetState==2">
-					<view class="cancelBtn" style="margin-right: 16rpx;" @click="goHeXiao">核销</view>
+					<view class="cancelBtn" style="margin-right: 16rpx;" v-if="iOSInfo.indexOf('P004')!=-1||!iOSInfo" @click="goHeXiao">核销</view>
 				</view>
 		 		<!-- 二维码 -->
 		 		<view v-if="qrcodeShow" class="qrcodeBox" @click="qrcodeShow=false">
@@ -437,25 +437,25 @@ export default {
 			})
 		},
 		goback(){
-			// if(this.type==2){
-			// 	 uni.switchTab({
-			// 		url:'../index/index'
-			// 	}) 
-			// }else{
-			// 	uni.navigateBack({})
-			// }
-			var standalone = window.navigator.standalone
-			var userAgent = window.navigator.userAgent.toLowerCase()
-			var safari = /safari/.test(userAgent)
-			var ios = /iphone|ipod|ipad|mac/.test(userAgent)
-			var android = /android/.test(userAgent)
-			if (ios) {
-							 if ( true) {//!standalone&& !safari
-							   window.webkit.messageHandlers.goMyNav.postMessage(null)
-							 }
-			} else if (android) {
-							 window.android.postMessage()
-			}
+			//console.log("1111")
+			//return false;
+			 if(this.type==2){
+			 	 uni.navigateBack({}) 
+			 }else{
+			 	var standalone = window.navigator.standalone
+			 	var userAgent = window.navigator.userAgent.toLowerCase()
+			 	var safari = /safari/.test(userAgent)
+			 	var ios = /iphone|ipod|ipad|mac/.test(userAgent)
+			 	var android = /android/.test(userAgent)
+			 	if (ios) {
+			 			 if ( true) {//!standalone&& !safari
+			 			   window.webkit.messageHandlers.goMyNav.postMessage(null)
+			 			 }
+			 	} else if (android) {
+			 				window.android.postMessage()
+			 	}
+			 }
+			
 		},
 		evaluate(){
 			uni.navigateTo({

pages/europeOrder/europeOrder.vue

@@ -109,7 +109,7 @@ export default {
 	 //   }else{
 		//    this.state=num
 	 //   }
-		this.getData()
+		//this.getData()
 		var qxnum = uni.getStorageSync("quanxian");
 		if (qxnum == 1) {
 			this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
@@ -119,13 +119,14 @@ export default {
 	},
 	onShow() {
 		console.log(this.tabIndex)
-		var evaluate = uni.getStorageSync("evaluate")
-		 if(evaluate){
-			 this.items=[]
-			 this.getData()
-			  uni.removeStorageSync('evaluate');
-		} 
-		
+		// var evaluate = uni.getStorageSync("evaluate")
+		//  if(evaluate){
+		// 	 this.items=[]
+		// 	 this.getData()
+		// 	  uni.removeStorageSync('evaluate');
+		// } 
+		this.items=[]
+	    this.getData()
 	},
 	methods: {
 		inputconfirm(){
@@ -221,7 +222,7 @@ export default {
 		},
 		goDetail(id){
 			uni.navigateTo({
-				url:'eorderDetail?id='+id
+				url:'eorderDetail?id='+id+'&type=2'
 			})
 		},
 		getData(){