Merge branch 'lj'

# Conflicts:
#	manifest.json
#	pages/index/index.vue

pages/index/index.vue

@@ -1,26 +1,20 @@
 <template>
 	<view class="home-base-bg">
-	<view class="search_box">
-		<TabBar :current-page="0"></TabBar>
 		<InputAndSwiper></InputAndSwiper>
+		<TabBar :current-page="0"></TabBar>
 		<HomeNavCard></HomeNavCard>
 		<view class="news-box">
-			<u-notice-bar
-				:text="newsTextLists"
-				:bg-color="$uni-bg-color"
-			></u-notice-bar>
+			<u-notice-bar :text="newsTextLists" :bg-color="$uni-bg-color"></u-notice-bar>
 		</view>
 		
 		<ShowShopList></ShowShopList>
-		
-	</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		components: {
-			
+
 		},
 		data() {
 			return {
@@ -28,14 +22,15 @@
 					'寒雨连江夜入吴',
 					'平明送客楚山孤',
 					'洛阳亲友如相问',
-					'一片冰心在玉壶'],
+					'一片冰心在玉壶'
+				],
 			}
 		},
 		onLoad() {
-			
+
 		},
 		methods: {
-		
+
 		}
 	}
 </script>
@@ -46,5 +41,4 @@
 		width: 100%;
 	}
 	
-	
 </style>