From 0d643076659cb7ebc30f4b0a390b50ab5289f911 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Tue, 27 Jun 2023 10:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E5=87=BA=E7=8E=B0=E9=A1=B6=E9=83=A8=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A0=8F=E5=8F=A0=E5=8A=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/category/category.vue | 37 +++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index e936390..3679066 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -78,13 +78,13 @@
 						@input="getMapStore()" />
 				</cover-view>
 				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
-					<cover-view v-if="marker == '' " class="mart30 fotct font14 fcor666 fotct width100">
+					<cover-view v-if="marker.length == 0 " class="mart30 fotct font14 fcor666 fotct width100">
 						<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
 					</cover-view>
 					<cover-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 mode="aspectFit" :src="box.logo" class="recontleft flleft border-r"
+							style="width: 50px;height:50px">
 						</image>
 						<cover-view class="fotlt paddleft5">
 							<cover-view class="text2 width100 font16 fontwig6">
@@ -95,7 +95,7 @@
 									{{box.callout.address}}
 								</cover-view>
 								<cover-view class="width30 flright font13 fcor666 fotct">
-									<image mode="widthFix" :src="imagewxUrl+imgadres4" style="width: 10px;"></image>
+									<image mode="aspectFit" :src="imagewxUrl+imgadres4" style="width: 10px;height:10px"></image>
 									{{box.distance}}km
 								</cover-view>
 							</cover-view>
@@ -182,13 +182,14 @@
 						@input="getMapStore()" />
 				</view>
 				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
-					<view v-if="marker == '' " class="mart30 fotct font14 fcor666 fotct width100">
+					<view v-if="marker.length == 0 " 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;">
+						<template v-if="box.id != 0">
+						<image mode="aspectFit" :src="box.logo" class="recontleft flleft border-r"
+							style="width: 50px;height: 50px;">
 						</image>
 						<view class="fotlt paddleft5">
 							<view class="text2 width100 font16 fontwig6">
@@ -199,11 +200,12 @@
 									{{box.callout.address}}
 								</view>
 								<view class="width30 flright font13 fcor666 fotct">
-									<image mode="widthFix" :src="imagewxUrl+imgadres4" style="width: 10px;"></image>
+									<image mode="aspectFit" :src="imagewxUrl+imgadres4" style="width: 10px;height: 10px;"></image>
 									{{box.distance}}km
 								</view>
 							</view>
 						</view>
+						</template>
 					</view>
 				</scroll-view>
 			</view>
@@ -324,6 +326,22 @@
 			//查询商户列表
 			getIndustry() {
 				getIndustry().then(res => {
+					 
+					this.goodsFirstClassList=[{
+						"childIndustry": null,
+						"createTime": 1640252815000,
+						"name": "全部",
+						"id": 99999999,
+						"wechatCompanyCode": "716",
+						"wechatName": "全部",
+						"ext3": null,
+						"parentId": 1,
+						"wechatSelfEmployedCode": "719",
+						"ext2": null,
+						"status": 1,
+						"ext1": "650"
+					}];
+					
 					if (res.return_code == '000000') {
 						for (var i = 0; i < res.return_data.length; i++) {
 							this.goodsFirstClassList.push(res.return_data[i]);
@@ -642,6 +660,9 @@
 	}
 </script>
 <style lang='less' scoped>
+	
+	
+	
 	.map-container {
 		position: relative;
 		overflow: hidden;