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

operatingCompany/pages.json

@@ -1,6 +1,12 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/logIn/home",
+			"style": {
+				"navigationStyle": "custom"
+			}
 
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -73,7 +79,7 @@
 		}, {
 			"path": "pages/entryReport/entryReport",
 			"style": {
-				"navigationStyle": "custom",
+				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
 
@@ -98,13 +104,13 @@
 					}
 				} */
 			}
-		},
-		{
-			"path": "pages/shop/shopIndex/reviews",
-			"style": {
-				"navigationBarTitleText": "点评运营经理",
-				"navigationBarBackgroundColor": "#FFFFFF"
-			}
+		},
+		{
+			"path": "pages/shop/shopIndex/reviews",
+			"style": {
+				"navigationBarTitleText": "点评运营经理",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		},
 		{
 			"path": "pages/entryReport/entered",
@@ -171,16 +177,15 @@
 				"navigationBarTitleText": "点评",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
-		},
+		},
 		{
-            "path" : "pages/shop/shopIndex/reviewsContent",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "点评",
-				"navigationBarBackgroundColor": "#FFFFFF",
-                "enablePullDownRefresh": false
-            }  
-        },
+			"path": "pages/shop/shopIndex/reviewsContent",
+			"style": {
+				"navigationBarTitleText": "点评",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/shop/shopIndex/reply",
 			"style": {
@@ -201,8 +206,9 @@
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		}
-		
-    ],
+
+
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

operatingCompany/pages/logIn/home.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="content">
+
+		<view class="zdyNav">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="nav">
+				<view>欧洲维修</view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+
+
+		<view class="homePg">
+			<view class="bg">
+				<view class="logIn" @click="logIn">立即登录</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				iStatusBarHeight: '',
+			}
+		},
+		onLoad() {
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+		},
+		methods: {
+
+			logIn() {
+
+				uni.navigateTo({
+					url: '../logIn/logIn'
+				})
+			}
+			
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		background-color: #EB5808;
+		width: 100%;
+		height: 100%;
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background-color: #EB5808;
+		width: 100%;
+		height: 100%;
+	}
+
+	/* #endif */
+
+	.zdyNav {
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: #FFFFFF;
+		z-index: 11;
+	}
+
+	.status_bar {
+		background: #FFFFFF;
+	}
+
+	.nav {
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+		font-weight: bold;
+	}
+
+	.homePg {
+		position: fixed;
+		width: 100vw;
+		height: calc(100vh - 44px);
+		background-color: #EB5808;
+	}
+
+	.bg {
+		width: 100vw;
+		height: calc(100vh - 44px);
+		background: url('http://phone.66km.cn:8088/marketing/home_yypb.png') no-repeat;
+		background-size: 100%;
+		position: relative;
+		
+	}
+	.logIn{
+		width: 442rpx;
+		height: 88rpx;
+		background-color: #FF4F00;
+		border-radius: 44rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		text-align: center;
+		line-height: 88rpx;
+		position: absolute;
+		left: 154rpx;
+		top: 847rpx;
+		
+	}
+</style>