Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj

pages/mine/details.vue

@@ -116,7 +116,7 @@
 			<image src="/static/images/backTop.png" mode=""></image>
 		</view>
 		
-		<view class="eqLog" @click="eqLog()">
+		<view v-if="eqLog!=-1" class="eqLog" @click="eqLog()">
 			<view style="width: 78rpx;text-align: center;">设备日志</view>
 		</view>
 		<!-- 加入常错词 -->
@@ -282,10 +282,14 @@
 				ACTION: Symbol('zaudio'), // 唯一值区分每个页面的方法
 				isPageHide: false, // 是否息屏
 				duration: '', // 总时长
+				eqLog:0,
 			};
 		},
 
 		onLoad(options) {
+			let menu = uni.getStorageSync('weapp_session_Menu_data');
+			this.eqLog = menu.findIndex(item=>item.name=='设备日志');
+			
 			this.status = options.status;
 			this.customerId = options.customerId;
 			this.itemobj = uni.getStorageSync('searchobj');

pages/mine/details2.vue

@@ -97,7 +97,7 @@
 						mode=""></image>
 					<view @click="Receivedetailsabouttab('Receivedetailsabout')">更多</view>
 					<view class="allimg" v-if="Thetapeidisshow">
-						<view @click="eqLog()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志</view>
+						<view v-if="eqLog!=-1" @click="eqLog()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志</view>
 						<view @click="Receivetap()" style="line-height: 70rpx;margin-top: 10rpx;">接待信息</view>
 						<view @click="alllogo()" style="line-height:70rpx;">{{userlistobj.validInvalidName}}</view>
 					</view>
@@ -541,6 +541,7 @@
 				isPageHide: false, // 是否息屏
 				duration: '', // 总时长
 				isBand: false, // 阻止二次提交
+				eqLog:0
 			};
 		},
 		computed: {
@@ -551,6 +552,9 @@
 			},
 		},
 		onLoad(options) {
+			let menu = uni.getStorageSync('weapp_session_Menu_data');
+			this.eqLog = menu.findIndex(item=>item.name=='设备日志');
+			
 			this.status = options.status;
 			this.customerId = options.customerId;
 			this.itemobj = uni.getStorageSync('searchobj');