Merge branch 'master' of http://git.feashow.cn/odjbin/city-store-transfer

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

pages/index/index.vue

@@ -1,5 +1,11 @@
 <template>
 	<view class="home-base-bg">
+	<view class="search_box">
+		<view class="search_box_border">
+			<!-- <u-input placeholder="搜索优质产品" placeholder-style="color: #969696" prefixIcon="search"
+				prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx" readonly>
+			</u-input> -->
+		</view>
 		<InputAndSwiper></InputAndSwiper>
 		<TabBar :current-page="0"></TabBar>
 		<view class="nav-card">
@@ -69,15 +75,7 @@
 			
 		},
 		methods: {
-			// 头部区域
-			//获取热点搜索词、背景URL
-			getHeaderAreaURL() {
-				this.headerBgList = [];
-				this.hotSearchWord = ''
-			}
-		},
-		computed:{
-			
+		
 		}
 	}
 </script>