罗世杰：首页合并，移除搜索框，App引入了uview.scss

# Conflicts:
#	App.vue
#	pages/index/index.vue
#	pages/my/my.vue

pages/index/index.vue

@@ -1,25 +1,102 @@
 <template>
-	<view>
+	<view class="base-bg-color">
 		<InputAndSwiper></InputAndSwiper>
 		<TabBar :current-page="0"></TabBar>
+		<view class="nav-card">
+			<u-grid :col="4">
+					<u-grid-item>
+						<u-icon name="photo" :size="30"></u-icon>
+						<view class="grid-text">图片</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="lock" :size="30"></u-icon>
+						<view class="grid-text">锁头</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="photo" :size="30"></u-icon>
+						<view class="grid-text">图片</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="lock" :size="30"></u-icon>
+						<view class="grid-text">锁头</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+					<u-grid-item>
+						<u-icon name="hourglass" :size="30"></u-icon>
+						<view class="grid-text">沙漏</view>
+					</u-grid-item>
+				</u-grid>
+		</view>
+		<view class="news-box">
+			<u-notice-bar
+				:text="newsTextLists"
+				:bg-color="$uni-bg-color"
+			></u-notice-bar>
+		</view>
 	</view>
+	
 </template>
 
 <script>
 	export default {
+		components: {
+			
+		},
 		data() {
-			return {}
+			return {
+				newsTextLists: [
+					'寒雨连江夜入吴',
+					'平明送客楚山孤',
+					'洛阳亲友如相问',
+					'一片冰心在玉壶'],
+			}
 		},
 		onLoad() {
-
+			
 		},
 		methods: {
-
+			// 头部区域
+			//获取热点搜索词、背景URL
+			getHeaderAreaURL() {
+				this.headerBgList = [];
+				this.hotSearchWord = ''
+			}
+		},
+		computed:{
+			newsText() {
+				// return "寒雨连江夜入吴 平明送客楚山孤 洛阳亲友如相问 一片冰心在玉壶"
+				return this.newsTextLists.join('')
+			}
 		}
 	}
 </script>
-<style>
-	page {
-		background-color: #F8F8F8;
+
+<style lang="scss">
+	.base-bg-color {
+		background-color: $u-bg-color;
 	}
+	.nav-card {
+		margin: 15px 7px;
+		padding: 10px 0;
+		background-color: $uni-bg-color;
+		
+		border-radius: $uni-border-radius-lg;
+		box-shadow: 0 3px 3px 0 $u-border-color;
+		// border: solid 2px black;
+		.grid-text {
+			font-size: 14px;
+		}
+	}
+	
 </style>