From 662a08cab73dcdc6320b80b7aa9ee7c74df76c7e Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 8 May 2023 09:41:50 +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 | 136 +++++++++++++++++++++++++----
 1 file changed, 120 insertions(+), 16 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index e5ba6e8..bfd4b6b 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="map-container">
+		<!-- #ifdef H5 -->
 		<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">
@@ -102,8 +103,112 @@
 					</cover-view>
 				</scroll-view>
 			</cover-view>
+		</map>
+		<!-- #endif -->
 
+		<!-- #ifdef MP -->
+		<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" src="../../../static/img/dispos.png"></cover-image>
+			</cover-view>
+			<!-- 一级分类 -->
+			<view class="width100 cover-views  mart15">
+				<scroll-view class="width90 cover-view-cont" scroll-x="true">
+					<view class="cover-view-head font14" :class="[typeid == item.id ? 'onclick' : '']"
+						v-for="(item,index) in goodsFirstClassList" :key="index" @click="changeType(item)">{{item.name}}
+					</view>
+				</scroll-view>
+				<!-- 二级分类 -->
+				<view class="width100 mart15 backcorfff cover-viewchage alijus fotct" style="border-radius: 22px;">
+					<!-- :class="[selectFirst == 1? 'onchange' : '']" -->
+					<view class="font14 width30w fotct onchange text1" @click="changeChilerType()">{{selectFirstName}}
+						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
+					</view>
+					<view class="font14 width30w onchange" @click="changeChilerdistance()">{{distanceName}}
+						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
+					</view>
+					<view class="font14 width30w">
+						<!-- 全部
+						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image> -->
+					</view>
+				</view>
+			</view>
+			<!-- //模态框 -->
+			<view class="change-cont" v-if="selectChiler == 1 || selectChilerdistance == 1">
+				<view class="width100 backcorfff"></view>
+			</view>
+			<!-- //显示内容 -->
+			<view class="change-optiac paddbotm20" v-if="selectChiler == 1">
+				<scroll-view scroll-y="true" class="width100 height260">
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart"
+						v-for="(item,index) in goodsSendotClassList" :key="item.id" @click="changeFirstcont(item)">
+						<view class="width90w font14" :class="[selectFirst == item.id? 'onchange' : '']">{{item.name}}
+						</view>
+						<image class="icon20" src="../../../static/img/changed.png" mode="widthFix"
+							v-if="selectFirst == item.id"></image>
+					</view>
+				</scroll-view>
+			</view>
+			<!-- 二级距离 -->
+			<view class="change-optiac paddbotm20" v-if="selectChilerdistance == 1">
+				<scroll-view scroll-y="true" class="width100 height260">
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart"
+						v-for="(item,index) in distanceList" :key="index" @click="changeDistance(item)">
+						<view class="width90w font14" :class="[ distance== item.id? 'onchange' : '']">{{item.title}}
+						</view>
+						<image class="icon20" src="../../../static/img/changed.png" mode="widthFix"
+							v-if="distance == item.id"></image>
+					</view>
+				</scroll-view>
+			</view>
+
+			<!-- 未打开筛选前 -->
+			<view class="cover-view-foot" v-if="isSelected == 1">
+				<view class="line-view" @click="updateSelected(2)"></view>
+				<view class="paddtop10 fcor666 font13 width100" @click="updateSelected(2)">点击发现更多商户</view>
+				<view class="input-box">
+					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
+						@click="updateSelected(2)" />
+				</view>
+			</view>
+
+			<!-- 打开筛选后 -->
+			<view class="cover-view-foot-behind" v-if="isSelected == 2">
+				<view class="line-view" @click="updateSelected(1)"></view>
+				<view class="paddtop10 fcor666 font13 width100" @click="updateSelected(1)">点击发现更多商户</view>
+				<view class="input-box">
+					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
+						@input="getMapStore()" />
+				</view>
+				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
+					<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"
+						@click="seeloaction(box)">
+						<image mode="widthFix" :src="box.logo" class="recontleft flleft border-r"
+							style="max-width: 50px;min-width: 50px;">
+						</image>
+						<view class="fotlt paddleft5">
+							<view class="text2 width100 font16 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>
 		</map>
+		<!-- #endif -->
 	</view>
 </template>
 <script>
@@ -151,11 +256,10 @@
 				typeplat: 1 //手机类型
 			}
 		},
-		onLoad() {
-		},
+		onLoad() {},
 		onShow() {
 			// this.latitude = app.globalData.latitude;
-			// this.longitude = app.globalData.longitude;
+			// this.longitude = app.globalData.longitude;
 			this.onControltap();
 		},
 		computed: {
@@ -194,14 +298,14 @@
 						this.selectFirst = res.return_data[0].childIndustry[0].id;
 						this.selectFirstName = res.return_data[0].childIndustry[0].name;
 						let platform = uni.getSystemInfoSync().platform;
-						// if (platform == 'android') {
-						// 	this.typeplat = 2;
-						this.getMapStore();
-						// }
-						// if (platform == 'ios') {
-						// 	this.typeplat = 1;
-						// 	this.getMapStore();
-						// }
+						if (platform == 'android') {
+							this.typeplat = 2;
+							this.getMapStore();
+						}
+						if (platform == 'ios') {
+							this.typeplat = 1;
+							this.getMapStore();
+						}
 					}
 				})
 			},
@@ -238,25 +342,25 @@
 				this.getMapStore();
 			},
 			//地图点击事件
-			markertap(e) {
+			markertap(e) {
 				// #ifdef H5
 				let markerId = e.detail.markerId;
 				for (var i = 0; i < this.marker.length; i++) {
 					if (markerId == this.marker[i].id) {
 						this.seeloaction(this.marker[i]);
 					}
-				}
+				}
 				// #endif
 			},
 			//地图点击事件
-			callouttap(e) {
+			callouttap(e) {
 				// #ifdef MP
 				let markerId = e.markerId;
 				for (var i = 0; i < this.marker.length; i++) {
 					if (markerId == this.marker[i].id) {
 						this.seeloaction(this.marker[i]);
 					}
-				}
+				}
 				// #endif
 			},
 
@@ -380,7 +484,7 @@
 						uni.hideLoading();
 						console.log(res, '获取当前位置')
 						this.longitude = res.longitude;
-						this.latitude = res.latitude;
+						this.latitude = res.latitude;
 						this.getIndustry();
 					},
 					fail() {