Merge pull request '邓洁:删除首页及地图上方搜索框' (#36) from djj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/36

components/InputAndSwiper/InputAndSwiper.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="input-and-swiper-root">
-		<view class="search-box">
+		<view class="search-box" v-if="type!=='0'">
 			<view class="search-box-input">
 				<u-input placeholder="热门搜索" placeholder-style="color: #969696" prefixIcon="search"
 					prefixIconStyle="font-size: 24px;color: #909399;" border="true">
@@ -31,6 +31,10 @@
 						"https://alifei01.cfp.cn/creative/vcg/800/new/VCG41175510742.jpg"
 					]
 				}
+			},
+			type: {
+				type: String,
+				default: '1'
 			}
 		},
 		data() {
@@ -42,7 +46,6 @@
 			styleIsolation: 'shared', // 解除样式隔离
 		},
 		created() {
-			console.log('createsd');
 			this.open()
 		},
 		methods: {
@@ -63,11 +66,11 @@
 							},
 							success: (re) => {
 								console.log("解析地址成功", re);
-								console.log(re.result.ad_info.city,);
+								console.log(re.result.ad_info.city, );
 								console.log(re.result.ad_info.district, );
-								let city=re.result.ad_info.city
+								let city = re.result.ad_info.city
-								let district=re.result.ad_info.district
+								let district = re.result.ad_info.district
-								that.position = city.slice(0,2) + district.slice(0,2)
+								that.position = city.slice(0, 2) + district.slice(0, 2)
 							},
 							fail: (re) => {
 								console.log(re, '失败信息');
@@ -137,6 +140,7 @@
 		position: relative;
 		z-index: 2;
 	}
+
 	.search-box {
 		position: absolute;
 		z-index: 1;

pages/index/index.vue

@@ -1,13 +1,10 @@
 <template>
 	<view class="home-base-bg">
-		<InputAndSwiper></InputAndSwiper>
+		<InputAndSwiper type='0'></InputAndSwiper>
 		<view class="home-content">
-			<view class="service">
-				<u-image src="/static/statistics/sy_icon_lxkf.png" width="108rpx" height="108rpx"/>
-			</view>
 			<HomeNavCard></HomeNavCard>
-			<HomeNoticeBar :text="notice"/>
+			<HomeNoticeBar :text="notice" />
-			<Statistics :data="statisticsNum"/>
+			<Statistics :data="statisticsNum" />
 			<view class="show-and-search">
 				<view class="show-tab list-tab" :class="{ 'tab-activate': chooseIndex === 0 }" @click="this.chooseIndex=0">
 					<text>店铺列表</text>
@@ -16,7 +13,8 @@
 					<text>找店列表</text>
 				</view>
 			</view>
-			<SearchShopList v-if="chooseIndex"/><ShowShopList v-else/>
+			<SearchShopList v-if="chooseIndex" />
+			<ShowShopList v-else />
 		</view>
 		<TabBar :current-page="0"></TabBar>
 	</view>
@@ -55,17 +53,14 @@
 	.home-base-bg {
 		background-color: $uni-bg-color-grey;
 		width: 100%;
+
 		.home-content {
 			margin: 0 10px;
-			.service {
-				position: fixed;
-				right: 17rpx;
-				top: 1109rpx;
-				z-index: 1;
-			}
 		}
-		.show-and-search{
+
+		.show-and-search {
 			display: flex;
+
 			.list-tab {
 				z-index: 2;
 				width: 259rpx;
@@ -80,12 +75,14 @@
 				align-items: center;
 				justify-content: center;
 			}
+
 			.search-tab {
 				z-index: 1;
 				transform: translateX(-61rpx);
 			}
+
 			.tab-activate {
-				background: linear-gradient(#E86262,#CC3333);
+				background: linear-gradient(#E86262, #CC3333);
 				z-index: 3;
 			}
 		}

pages/index/map/map.vue

@@ -1,19 +1,19 @@
 <template>
 	<view>
-		<view class="search-box">
+		<!-- <view class="search-box">
 			<view class="search-box-input">
 				<u-input placeholder="热门店铺" placeholder-style="color: #888888" prefixIcon="search"
 					prefixIconStyle="font-size: 24px;color: #888888;" border="true">
 				</u-input>
 			</view>
-		</view>
+		</view> -->
 		<view class="content">
-			<map id="map" @markertap="markerClick" :markers="marker" :show-location="true" :latitude="lat"
+			<map id="map" @markertap="markerClick" :markers="marker" :show-location="true" :latitude="lat" :longitude="lng"
-				:longitude="lng"></map>
+				:show-scale="true"></map>
 		</view>
-		<view class="down-shop">
+		<!-- <view class="down-shop">
 			<ShowShopListItem :shopInfo="shopList" :is-adshow="true" :show-style="0"></ShowShopListItem>
-		</view>
+		</view> -->
 	</view>
 </template>