Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

* 'master' of http://47.98.226.240:3000/twt/operatingCompany:
  shopID
  首页
  权限修改

operatingCompany/pages.json

@@ -5,8 +5,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#FFFFFF"
+				/* "navigationBarTitleText": "首页",
+				"navigationBarBackgroundColor": "#FFFFFF" */
+				"navigationStyle": "custom"
 			}
 		},
 		{

operatingCompany/pages/index/index.vue

@@ -1,5 +1,13 @@
 <template>
 	<view class="content">
+		<view class="zdyNav">
+		  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		  <view class="nav">
+			首页
+		  </view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
 		<!-- 我的待办 -->
 		<view class="modular">
 			<view class="modularTitle">我的待办</view>
@@ -12,28 +20,28 @@
 			</view>
 		</view>
 		<!--录入报告  -->
-		<view class="modular">
+		<view class="modular" v-if="permissionList.indexOf('N001')!=-1||permissionList.indexOf('N002')!=-1">
 			<view class="modularTitle">录入报告</view>
-			<view class="modularCont">
-				<view class="modularLine" @click="goRouter('../entryReport/entryReport')">
+			<view class="modularCont" >
+				<view class="modularLine" @click="goRouter('../entryReport/entryReport')" v-if="permissionList.indexOf('N001')!=-1">
 					<image src="../../static/img/home_icon_2.png" mode="" class="modularImg"></image>
 					<view class="modularName">录入报告</view>
 				</view>
-				<view class="modularLine" @click="goRouter('../reportManage/reportManage')">
+				<view class="modularLine" @click="goRouter('../reportManage/reportManage')" v-if="permissionList.indexOf('N002')!=-1">
 					<image src="../../static/img/home_icon_3.png" mode="" class="modularImg"></image>
 					<view class="modularName">报告管理</view>
 				</view>
 			</view>
 		</view>
 		<!--团队管理  -->
-		<view class="modular">
+		<view class="modular" v-if="permissionList.indexOf('N004')!=-1||permissionList.indexOf('N003')!=-1">
 			<view class="modularTitle">团队管理</view>
 			<view class="modularCont">
-				<view class="modularLine" @click="goRouter('../team/myTeam')">
+				<view class="modularLine" @click="goRouter('../team/myTeam')" v-if="permissionList.indexOf('N003')!=-1">
 					<image src="../../static/img/home_icon_4.png" mode="" class="modularImg"></image>
 					<view class="modularName">我的团队</view>
 				</view>
-				<view class="modularLine" @click="goRouter('../teamStore/teamStore')">
+				<view class="modularLine" @click="goRouter('../teamStore/teamStore')" v-if="permissionList.indexOf('N004')!=-1">
 					<image src="../../static/img/home_icon_5.png" mode="" class="modularImg"></image>
 					<view class="modularName">团队门店</view>
 				</view>
@@ -59,6 +67,7 @@
 			return {
 				uid: '',
 				count: '',
+				permissionList:'',
 			}
 		},
 		onLoad() {
@@ -67,6 +76,8 @@
 		},
 		onShow() {
 			this.uid = uni.getStorageSync("logInData").uid;
+			this.permissionList=uni.getStorageSync("logInData").permissionList
+			//this.permissionList=['N001']
 			console.log(this.uid);
 			if (this.uid) {
 				this.getData()
@@ -114,7 +125,7 @@
 	/* #ifdef H5 */
 	.content {
 		background: #F4F5F7;
-		min-height: calc(100vh - 44px);
+		
 		padding: 24rpx 20rpx;
 	}
 
@@ -170,4 +181,22 @@
 		top: 16rpx;
 
 	}
+	.zdyNav{
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: #FFFFFF;
+		z-index: 11;
+	}
+	.nav{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
+	.status_bar{
+		background: #FFFFFF;
+	}
 </style>

operatingCompany/pages/reportManage/reportDetail.vue

@@ -293,7 +293,7 @@
 			   this.$store.commit('mutationsCategoryList',this.info.categoryList);
 				this.$store.commit('mutationssuggestList',this.info.suggestList)
 				uni.navigateTo({
-					url:'../entryReport/entered?type=3&sheetID='+this.id
+					url:'../entryReport/entered?type=3&sheetID='+this.id+'&shopId='+this.info.shopID+'&ShopName='+this.info.shopName
 				}) 
 			},
 			goaddress(){