Merge branch 'dev' into 'master'

Dev

See merge request !113

pages/lanch/index.vue

 <template>
 <template>
-	<view class="">
-		<view class="loadTxt">Loading...</view>
+	<view class="container">
+		<view class="loadTxt">
+			<image
+			  src="@/static/images/logoLanuch.png"
+			  style="width: 50rpx; height: 50rpx;"
+			  mode="widthFix"
+			/>
+		</view>
 		<restrictedTip ref="restrictedTipRef"/>
 		<restrictedTip ref="restrictedTipRef"/>
 	</view>
 	</view>
 	
 	
@@ -157,10 +163,15 @@
 	}
 	}
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+	.container{
+		min-height: 100vh;
+		background-color: #fff;
+		box-sizing: border-box;
+	}
 	.loadTxt {
 	.loadTxt {
+		margin-top: 100rpx;
 		display: flex;
 		display: flex;
 		align-items: center;
 		align-items: center;
 		justify-content: center;
 		justify-content: center;
-		font-size: 30rpx;
 	}
 	}
 </style>
 </style>
\ No newline at end of file