From 068b10b4516668cd810caa3fe4c38e082882c06a Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 27 Apr 2023 14:46:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=8F=AF=E8=A7=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/category/category.vue | 63 ++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 4a0fb8c..7469256 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="map-container">
-		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}" :show-location='true' :latitude="latitude"
+		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}"  :latitude="latitude"
 			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
 			<!-- 	<cover-view class="cover-view-loca" :style='{bottom:coverbottom}' @click="onControltap">
 				<cover-image class="cover-image" @click="play" src="../../../static/img/adresw.png"></cover-image>
@@ -58,28 +58,45 @@
 			</view>
 
 			<!-- 未打开筛选前 -->
-			<view class="cover-view-foot" @click="updateSelected(2)" v-if="isSelected == 1">
-				<view class="line-view"></view>
-				<view class="mart10 fcor666 font13 width100">发现更多商户</view>
+			<view class="cover-view-foot" v-if="isSelected == 1">
+				<view class="line-view" @click="updateSelected(2)"></view>
+				<view class="mart10 fcor666 font13 width100" @click="updateSelected(2)">发现更多商户</view>
 				<view class="input-box">
 					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
-						@input="toSearch()" />
+						@click="updateSelected(2)" />
 				</view>
 			</view>
 
 			<!-- 打开筛选后 -->
-			<view class="cover-view-foot-behind" @click="updateSelected(1)" v-if="isSelected == 2">
-				<view class="line-view"></view>
-				<view class="mart10 fcor666 font13 width100">发现更多商户</view>
+			<view class="cover-view-foot-behind" v-if="isSelected == 2">
+				<view class="line-view" @click="updateSelected(1)"></view>
+				<view class="mart10 fcor666 font13 width100" @click="updateSelected(1)">发现更多商户</view>
 				<view class="input-box">
 					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
-						@input="toSearch()" />
+						@input="getMapStore()" />
 				</view>
 				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
-					<view class="width94 alijusstart" @click.stop="updateSelected(1)">
-					
-					
-						
+					<view v-if="marker == '' " class="mart30 fotct font14 fcor666 fotct width100">
+						<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
+					</view>
+					<view class="width96 height80 bor-botm1 alijusstart" v-for="(box,i) in marker" :key="i">
+						<image mode="widthFix" :src="box.logo" class="recontleft flleft border-r"
+							style="max-height: 60px;" @click="toCategory(box)">
+						</image>
+						<view class="fotlt paddleft5">
+							<view class="text2 width100 font18 fontwig6">
+								{{box.callout.content}}
+							</view>
+							<view class="height22">
+								<view class="width70 flleft text1 font13 fcor999">
+									{{box.callout.address}}
+								</view>
+								<view class="width30 flright font13 fcor666 fotct">
+									<image mode="widthFix" :src="imagewxUrl+imgadres4" style="width: 10px;"></image>
+									{{box.distance}}km
+								</view>
+							</view>
+						</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -102,7 +119,9 @@
 				bottomData: false,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres2: 'xiala.png',
-				marker: '',
+				imgadres3: 'noorder.png',
+				imgadres4: 'dh.png',
+				marker: '', //商户
 				typeid: 0, //选择分类
 				isSelected: 1, //是否选择下拉
 				selectFirst: '', //筛选是否有值
@@ -185,6 +204,8 @@
 				getMapStore(datas).then(res => {
 					if (res.return_code == '000000') {
 						this.marker = res.return_data
+					} else {
+						this.marker = [];
 					}
 				})
 			},
@@ -192,13 +213,15 @@
 			changeFirstcont(item) {
 				this.selectFirst = item.id;
 				this.selectFirstName = item.name;
-				this.selectChiler = 2;
+				this.selectChiler = 2;
+				this.getMapStore();
 			},
 			//选择距离
 			changeDistance(item) {
 				this.distance = item.id;
 				this.distanceName = item.title;
-				this.selectChilerdistance = 2;
+				this.selectChilerdistance = 2;
+				this.getMapStore();
 			},
 			//地图点击事件
 			markertap(e) {},
@@ -325,7 +348,8 @@
 				this.typeid = item.id;
 				this.goodsSendotClassList = item.childIndustry;
 				this.selectFirst = item.childIndustry[0].id;
-				this.selectFirstName = item.childIndustry[0].name;
+				this.selectFirstName = item.childIndustry[0].name;
+				this.getMapStore();
 			},
 			//子菜单显示
 			changeChilerType() {
@@ -496,4 +520,9 @@
 		background-color: #089bf5;
 		color: #fff;
 	}
+
+	.recontleft {
+		width: 60px;
+		margin-left: 10px;
+	}
 </style>
\ No newline at end of file