Merge branch 'master' of http://git.liuniu946.com/xuhaolan/hx

components/hxb.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="box-top">
+		<view class="bg3">
+			<image src="../static/index/img14.png" mode=""></image>
+		</view>
+		<view class="bg3 two">
+			<image src="../static/index/img08.png" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		
+		name: "hxb",
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box-top {
+		display: flex;
+		padding: 36rpx 41rpx 72rpx 41rpx;
+		.bg3 {
+			width: 56rpx;
+			height: 62rpx;
+			image:{
+				height: 100%;
+				width: 100%;
+			}
+		}
+	}
+
+	.two {
+		margin-left: 36rpx;
+	}
+</style>

pages.json

@@ -10,6 +10,8 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
 				"navigationBarTitleText":"恒星币"
+<<<<<<< HEAD
+=======
 			}
 		},
 		{
@@ -19,6 +21,7 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
 				"navigationBarTitleText":"恒星币"
+>>>>>>> b38ef8383b6c90e02e27fa83a9f1005de590c615
 			}
 		}
     ],

pages/index/index.vue

@@ -1,6 +1,52 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="bg">
+			<image src="../../static/index/bg01.png" mode=""></image>
+		</view>
+		<view class="bg1">
+			<image src="../../static/index/bg03.png" mode=""></image>
+		</view>
+		<view class="box-top">
+			<view class="bg3">
+				<image src="../../static/index/img14.png" mode=""></image>
+			</view>
+			<view class="bg3 two">
+				<image src="../../static/index/img08.png" mode=""></image>
+			</view>
+		</view>
+		<view class="bg5">
+			<image src="../../static/index/img09.png" mode=""></image>
+		</view>
+		<view class="bg4">
+			<image src="../../static/index/img04.png" mode=""></image>
+		</view>
+		<view class="bg6">
+			<image src="../../static/index/img10.png" mode=""></image>
+		</view>
+		<view class="bg7">
+			<image src="../../static/index/img13.png" mode=""></image>
+		</view>
+		<view class="bg8">
+			<image src="../../static/index/img06.png" mode=""></image>
+		</view>
+		<view class="bg9">
+			<image src="../../static/index/bg05.png" mode=""></image>
+			<view class="bg10">
+				<image src="../../static/index/img01.png" mode=""></image>
+			</view>
+		</view>
+		<view class="bg9">
+			<image src="../../static/index/bg05.png" mode=""></image>
+			<view class="bg10">
+				<image src="../../static/index/img03.png" mode=""></image>
+			</view>
+		</view>
+		<view class="bg9">
+			<image src="../../static/index/bg05.png" mode=""></image>
+			<view class="bg10">
+				<image src="../../static/index/img02.png" mode=""></image>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,12 +54,92 @@
 	export default {
 		data() {
 			return {
-				
+
 			};
 		}
 	}
 </script>
 
 <style lang="scss">
+	page,
+	.content {
+		height: 100%;
+		margin: 0;
+		padding: 0;
+	}
+	image{
+		height: 100%;
+		width: 100%;
+	}
 
+	.bg {
+		position: absolute;
+		width: 750rpx;
+		height: 3117rpx;
+	}
+	.box-top{
+		display: flex;
+		padding: 36rpx 41rpx 72rpx 41rpx;
+	}
+	
+	.bg1 {
+		position: absolute;
+		width: 750rpx;
+		height: 629rpx;
+	}
+	.bg3{
+		width: 56rpx;
+		height: 62rpx;
+	}
+	.two{
+		margin-left: 36rpx;
+	}
+	.bg4{
+		display: flex;
+		margin: 0 auto;
+		width: 680rpx;
+		height: 581rpx;
+	}
+	.bg5{
+	 position: absolute;
+	 right: 0;
+	 top: 105rpx;
+	 width: 68rpx;
+	 height: 108rpx;
+	}
+	.bg6{
+		width: 78rpx;
+		height: 98rpx;
+		margin: 33rpx 22rpx;
+	}
+	.bg7{
+		position: absolute;
+		right: 0;
+		top:660rpx;
+		width: 219rpx;
+		height: 308rpx;
+	}
+	.bg8{
+		width: 546rpx;
+		height: 168rpx;
+		margin: -66rpx auto;
+		
+	}
+	.bg9{
+		
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 680rpx;
+		height: 524rpx;
+		margin: 40rpx auto;
+	}
+	.bg10{
+		position: absolute;
+		z-index: 99999;
+		width:590rpx ;
+		height: 400rpx;
+	}
+	
 </style>