Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MoeNovaClient

App.vue

@@ -14,7 +14,7 @@
 	// }
 	// // #endif
 
-	const tabbars = ['/pages/message/index', '/pages/make/index', '/pages/index/index']
+	const tabbars = ['/pages/my/my', '/pages/make/index', '/pages/message/mailMessage', '/pages/index/index']
 	export default {
 		globalData: {
 			postHeader: null,

pages/message/mailMessage.scss

@@ -1,8 +1,8 @@
 page {
-	background-color: #161616;
+	background-color: #FFFFFF;
 }
 .page {
-	background-color: #161616;
+	background-color: #FFFFFF;
 }
 .topbg {
 }
@@ -11,7 +11,7 @@ page {
 }
 .mainBody {
 	width:750rpx;padding:1rpx 20rpx;display: flex;flex-direction: column;
-	border-bottom: solid 2rpx #393939;
+	border-bottom: solid 2rpx #EEEEEE;
 	.menu {
 		display: flex;flex-direction: row;justify-content: space-between;padding:20rpx 0rpx 0rpx;
 		.item {
@@ -19,12 +19,12 @@ page {
 			margin:0 20rpx;color:#999999;
 			.line {
 				width: 36rpx;height: 8rpx;margin-top: 20rpx;
-				background: #161616;
+				background: #FFFFFF;
 				border-radius: 4rpx 4rpx 4rpx 4rpx;
 			}
 		}
 		.active {
-			color:#fff;
+			color:#333;
 			.line {
 				width: 36rpx;height: 8rpx;margin-top: 20rpx;
 				background: linear-gradient( 90deg, #FF5869 0%, #F83881 100%);
@@ -35,7 +35,7 @@ page {
 	.scroll-view_H {
 		flex-direction: row;
 		width: 400rpx;
-		color: #fff;
+		color: #333;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -56,14 +56,14 @@ page {
 				width: 36rpx;
 				height: 8rpx;
 				margin-top: 10rpx;
-				background: #161616;
+				background: #FFFFFF;
 				border-radius: 4rpx 4rpx 4rpx 4rpx;
 			}
 		}
 		
 		.active {
-			color: #fff;
-			background: #161616;
+			color: #333;
+			background: #FFFFFF;
 			.line {
 				width: 36rpx;
 				height: 8rpx;
@@ -87,14 +87,14 @@ page {
 	align-items: center;
 	.item {
 		margin-top: 20rpx;
-		color: #fff;
+		color: #333;
 		font-size: 28rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		width: 690rpx;
 		height: 200rpx;
-		border-bottom: 2rpx solid #393939;
+		border-bottom: 2rpx solid #EEEEEE;
 		
 		.avator {
 			width: 100rpx;
@@ -171,7 +171,7 @@ page {
 		flex-direction: column;
 		align-items: center;
 		width: 690rpx;
-		background: #28292D;
+		background: #F0F0F0;
 		border-radius: 28rpx;
 		padding-bottom: 30rpx;
 		
@@ -192,7 +192,7 @@ page {
 			width: 650rpx;
 			margin-top: 30rpx;
 			font-size: 32rpx;
-			color: #fff;
+			color: #333;
 			line-height: 1.4;
 		}
 		
@@ -200,14 +200,14 @@ page {
 			width: 650rpx;
 			margin-top: 20rpx;
 			font-size: 26rpx;
-			color: #999;
+			color: #666;
 			line-height: 1.6;
 		}
 		
 		.divider {
 			width: 650rpx;
 			height: 2rpx;
-			background: #393939;
+			background: #EEEEEE;
 			margin-top: 30rpx;
 		}
 		

pages/message/mailMessage.vue

@@ -52,12 +52,19 @@
 
 		<DialogBox ref="DialogBox"></DialogBox>
 		<ToastW3 ref="ToastW3"></ToastW3>
+		
+		<tabbar-view :tabbars="tabbars" :currentIndex="3" ref="tabbar"></tabbar-view>
 	</view>
 </template>
 
 <script>
+	import tabbarView from "@/components/tabbar/tabbar.vue";
+	import tabbar from "@/mixins/tabbar";
 	export default {
-		components: {},
+		components: {
+			tabbarView,
+		},
+		mixins: [tabbar],
 		data() {
 			return {
 				tab: 1,