登录修改

operatingCompany/common/request.js

@@ -47,7 +47,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 				 });
 				uni.clearStorageSync()
 				 uni.navigateTo({
-					url:'../login/login'
+					url:'../logIn/logIn'
 				 })
 			}else if(res.data.code==0){
 				// 正常

operatingCompany/pages.json

@@ -85,8 +85,30 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"enablePullDownRefresh": true
 			}
-
+		},
+	   {
+	   	"path": "pages/shop/shopIndex/index",
+	   	"style": {
+	   		"navigationBarTitleText": "运营陪伴",
+			 "navigationStyle": "custom" 
+	   		/* "navigationBarBackgroundColor": "#FFFFFF",
+	   		"enablePullDownRefresh": true, */
+			/* "app-plus":{
+				"titleNView":{
+					"autoBackButton":false
+				}
+			} */
+	   	}
+        },
+		{
+			"path": "pages/entryReport/entered",
+			"style": {
+				"navigationBarTitleText": "录入报告",
+				"navigationBarBackgroundColor": "#FFFFFF"
+				/* "enablePullDownRefresh": true */
+			}
 		}
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

operatingCompany/pages/entryReport/entered.vue

@@ -0,0 +1,48 @@
+<template>
+	<view class="content">
+		
+	  
+	   
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				 
+			}
+		},
+		onLoad() {
+          //页面加载初始化生命周期函数
+		   
+		},
+		methods: {
+			//自己定义的方法函数
+            goRouter(url){
+				//uni.navigateTo  路由跳转 url 是地址 路由还分为uni.redirectTo switchTab navigateBackreLaunch
+				this.$common.isUserId()
+				
+				uni.navigateTo({
+					url:url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content{
+		 background: #F4F5F7;
+		 min-height: 100vh;
+		
+	}
+	/* #ifdef H5 */
+		.content{
+			 background: #F4F5F7;
+			 min-height:calc(100vh - 44px);
+			
+		}
+	/* #endif */
+	
+</style>

operatingCompany/pages/entryReport/entryReport.vue

@@ -66,7 +66,7 @@
 					<view class="btns">
 						<view class="lishi">历史记录</view>
 						<view class="qiandao">签到</view>
-						<view class="baogao">录入报告</view>
+						<view class="baogao" @click="goEntered()">录入报告</view>
 					</view>
 				</view>
 			</view>
@@ -109,11 +109,16 @@
 					that.lat = res.latitude
 					
 					that.page = 1
-					// that.getShopData()
+					 //that.getShopData()
 				}
 			})
 		},
 		methods: {
+			goEntered(){
+				uni.navigateTo({
+					url:'entered'
+				})
+			},
 			searchDone() {
 				this.searchValue = e.target.value;
 				this.page = 1

operatingCompany/pages/logIn/logIn.vue

@@ -120,10 +120,16 @@
 
 						}
 					})
-
-					uni.navigateTo({
-						url: '../index/index'
-					})
+                    if(this.roleType==1){
+						uni.navigateTo({
+							url: '../index/index'
+						})
+					}else{
+						uni.navigateTo({
+							url: '../shop/shopIndex/index'
+						})
+					}
+					
 				})
 			}
 			

operatingCompany/pages/shop/shopIndex/index.vue

@@ -0,0 +1,61 @@
+<template>
+	<view class="content">
+		<view>
+			  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			  <view class="nav">运营陪伴</view>
+		</view>
+	  
+	   <view>店主运营陪伴主页</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				 iStatusBarHeight:'',
+			}
+		},
+		onLoad() {
+          //页面加载初始化生命周期函数
+		    this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+		},
+		methods: {
+			//自己定义的方法函数
+            goRouter(url){
+				//uni.navigateTo  路由跳转 url 是地址 路由还分为uni.redirectTo switchTab navigateBackreLaunch
+				this.$common.isUserId()
+				
+				uni.navigateTo({
+					url:url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content{
+		 background: #F4F5F7;
+		 min-height: 100vh;
+		
+	}
+	/* #ifdef H5 */
+		.content{
+			 background: #F4F5F7;
+			 min-height:calc(100vh - 44px);
+			
+		}
+	/* #endif */
+	.status_bar{
+		background: #FFFFFF;
+	}
+	.nav{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		line-height: 44px;
+		font-size: 34rpx;
+	}
+</style>