From b6b881de22886e4f32339b75e53acc2a13262b9c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 31 Mar 2023 09:24:14 +0800
Subject: [PATCH 1/7] =?UTF-8?q?1.=E6=96=B0=E6=B7=BB=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=88=90=E5=9C=B0=E5=9B=BE=E5=8F=AF=E8=A7=86=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                            |   36 +-
 index.html                         |    2 +-
 pages/tabBar/category/category.vue |  780 +++--------
 pages/tabBar/home/home.vue         | 1996 ++++++++++++++--------------
 pages/user/coupon/coupon.vue       |    2 +-
 5 files changed, 1177 insertions(+), 1639 deletions(-)
diff --git a/App.vue b/App.vue
index fca60c6..b210216 100644
--- a/App.vue
+++ b/App.vue
@@ -99,25 +99,25 @@
 			// #endif
 			// #ifdef H5
 			let that = this;
-			that.globalData.url = 'https://hsgcs.dctpay.com/crest';
-			that.globalData.v1url = 'https://hsgcs.dctpay.com/v1';
-			that.globalData.payurl = 'https://gratia-pay.dctpay.com/crest';
-			that.globalData.orderurl = 'https://hsgcs.dctpay.com/order';
-			that.globalData.userurl = 'https://hsgcs.dctpay.com/user';
-			that.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest';
-			that.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/';
-			that.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/';
-			that.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/';
+			// that.globalData.url = 'https://hsgcs.dctpay.com/crest';
+			// that.globalData.v1url = 'https://hsgcs.dctpay.com/v1';
+			// that.globalData.payurl = 'https://gratia-pay.dctpay.com/crest';
+			// that.globalData.orderurl = 'https://hsgcs.dctpay.com/order';
+			// that.globalData.userurl = 'https://hsgcs.dctpay.com/user';
+			// that.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest';
+			// that.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/';
+			// that.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/';
+			// that.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/';
 
-			// that.globalData.url = 'https://hsg.dctpay.com/crest';
-			// that.globalData.v1url = 'https://hsg.dctpay.com/v1';
-			// that.globalData.payurl = 'https://pay.dctpay.com/crest';
-			// that.globalData.orderurl = 'https://hsg.dctpay.com/order';
-			// that.globalData.userurl = 'https://hsg.dctpay.com/user';
-			// that.globalData.brestUrl = 'https://hsg.dctpay.com/brest';
-			// that.globalData.imgUrl = 'https://hsg.dctpay.com/filesystem/';
-			// that.globalData.imageWxImg = 'https://hsg.dctpay.com/filesystem/wxApplets/';
-			// that.globalData.imageqrImg = 'https://hsg.dctpay.com/filesystem/temporary/';
+			that.globalData.url = 'https://hsg.dctpay.com/crest';
+			that.globalData.v1url = 'https://hsg.dctpay.com/v1';
+			that.globalData.payurl = 'https://pay.dctpay.com/crest';
+			that.globalData.orderurl = 'https://hsg.dctpay.com/order';
+			that.globalData.userurl = 'https://hsg.dctpay.com/user';
+			that.globalData.brestUrl = 'https://hsg.dctpay.com/brest';
+			that.globalData.imgUrl = 'https://hsg.dctpay.com/filesystem/';
+			that.globalData.imageWxImg = 'https://hsg.dctpay.com/filesystem/wxApplets/';
+			that.globalData.imageqrImg = 'https://hsg.dctpay.com/filesystem/temporary/';
 			uni.getStorage({
 				key: 'openId',
 				success(e) {
diff --git a/index.html b/index.html
index 86f2ca8..3d7f592 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
 		<script src="https://unpkg.com/video.js/dist/video.min.js"></script>
 		<script src="https://cdn.bootcss.com/socket.io/2.1.1/socket.io.js"></script>
 		<script src="https://open.95516.com/s/open/js/upsdk.js"></script>
-		<script src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script>
+		<!-- <script src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script> -->
 	</head>
 	<body>
 		<noscript>
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 5450264..9e13eb1 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,603 +1,177 @@
-<template>
-	<view>
-		<!-- 状态栏 -->
-		<view class="status" :style="{position:headerPosition}"></view>
-		<view class="header" :style="{position:headerPosition}">
-			<view class="addr" @click="goPostion">
-				<!-- <view class="icon location"></view> -->
-				{{city}}
-				<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres"></image>
-			</view>
-			<view class="input-box">
-				<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
-				<view class="icon search"></view>
-			</view>
-		</view>
-		<!-- 占位 -->
-		<view class="place"></view>
-		<!-- <view class="category-list"> -->
-		<view class="width100 height45l backcorfff" v-if="MerchantList != ''">
-			<view class="width90">
-				<!-- <view class="stuMenu flleft fotct" @click="showPopup()	">{{showCategoryIndex}}
-					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
-				</view> -->
-				<picker mode="selector" :range="MerchantList" range-key="merchantName" @change="showCategory">
-					<view class="font14">{{showCategoryIndex}}
-						<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
-					</view>
-				</picker>
-			</view>
-		</view>
-
-		<view v-if="categoryList == '' " class="mart60 fotct font14 fcor666 fotct width100">
-			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
-		</view>
-
-		<view class="width96 height100p backcorfff border-r mart10" v-for="(box,i) in categoryList" :key="i">
-			<image mode="widthFix" :src="imageUrl+box.ext1" class="recontleft flleft mart10 border-r"
-				style="max-height: 80px;" @click="toCategory(box)">
-			</image>
-			<view class="recontright">
-				<view class="text2 width100 font18 fontwig6  paddtop15" @click="toCategory(box)">
-					{{box.storeName}}
-				</view>
-				<view class="width100 mart10 height22">
-					<view class="width70 flleft text1 font13 fcor999" @click="toCategory(box)">
-						{{box.address}}
-					</view>
-					<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
-						<image mode="widthFix" :src="imagewxUrl+imgadres4" style="width: 10px;"></image>
-						{{box.distance}}km
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <wybPopup ref="popup" type="top" height="800" width="500" radius="6" :showCloseIcon="false">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30">筛选门店</view>
-			<view class="mart15">
-				<view :class="item.merchantName ==  showCategoryIndex?'activeRefuel':'refuel'"
-					v-for="(item,index) in MerchantList" :key="index" @click="showCategory(item.merchantName,item.id)">
-					{{item.merchantName}}
-				</view>
-			</view>
-		</wybPopup> -->
-		<!-- #ifdef MP-->
-		<button open-type="contact">
-			<image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image>
-		</button>
-		<!-- #endif -->
-		<!-- #ifdef H5-->
-		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
-		<!-- #endif -->
-	</view>
-</template>
-<script>
-	import {
-		getCouponList,
-		getStoreListByMerchant,
-		getMerchantList,
-		findByLatAndLng
-	} from "../../../Utils/Api.js";
-	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
-	let app = getApp();
-	export default {
-		components: {
-			wybPopup
-		},
-		data() {
-			return {
-				showCategoryIndex: '',
-				showCategoryIndexId: '',
-				headerPosition: "fixed",
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'jt.png',
-				imgadres2: 'xiala.png',
-				imgadres1: 'noorder.png',
-				imgadres4: 'dh.png',
-				imgadres3: 'noorder.png',
-				imgadres5: 'cusservice.png',
-				city: "",
-				imageUrl: app.globalData.imgUrl,
-				//分类列表
-				categoryList: [],
-				MerchantList: [],
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false
-				// loadingText: '点击加载更多'
-			}
-		},
-		onPageScroll(e) {
-			//兼容iOS端下拉时顶部漂移
-			if (e.scrollTop >= 0) {
-				this.headerPosition = "fixed";
-			} else {
-				this.headerPosition = "absolute";
-			}
-		},
-		onLoad() {},
-		onShow() {
-			this.pageNum = 1;
-			this.categoryList = [];
-			this.MerchantList = [];
-			if (app.globalData.cityName != '') {
-				this.city = app.globalData.qianzhuCityName;
-				this.getMerchantList();
-			} else {
-				this.postionIng();
-			}
-
-		},
-		//上拉加载，需要自己在page.json文件中配置"onReachBottomDistance"
-		onReachBottom() {
-			this.getStoreListByMerchant();
-		},
-		methods: {
-			//显示弹出
-			showPopup() {
-				this.$refs.popup.show();
-			},
-			postionIng() {
-				let that = this;
-				uni.getLocation({
-					type: 'wgs84',
-					success: function(res) {
-						app.globalData.latitude = res.latitude;
-						app.globalData.longitude = res.longitude;
-						that.findByLatAndLng(res.longitude, res.latitude);
-						// uni.request({
-						// 	url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + res.latitude +
-						// 		',' + res.longitude + '&key=7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB',
-						// 	data: {},
-						// 	success: function(res) {
-						// 		that.city = res.data.result.address_component.city.replace(/市/g,
-						// 			'');
-						// 		app.globalData.cityId = res.data.result.ad_info.adcode;
-						// 		// app.globalData.cityId =  '500100';
-						// 		that.getMerchantList();
-						// 	}
-						// })
-					}
-				})
-			},
-			//金纬度转
-			findByLatAndLng(item, item1) {
-				let datas = {
-					lng: item,
-					lat: item1
-				}
-				findByLatAndLng(datas).then(res => {
-					if (res.return_code == '000000') {
-						this.city = res.return_data.provinceName;
-						app.globalData.cityName = res.return_data.provinceName;
-						app.globalData.qianzhuCityName = res.return_data.cityName;
-						app.globalData.cityId = res.return_data.regionId;
-						// app.globalData.cityId = '500100';
-						if (res.return_data.result.addressComponent.adcode) {
-							this.getMerchantList();
-						}
-					}
-				});
-			},
-			// 商户列表
-			getMerchantList() {
-				let params = {
-					regionId: app.globalData.cityId
-				}
-				getMerchantList(params).then(res => {
-					if (res.return_code == '000000' && res.return_data != '') {
-						this.MerchantList = res.return_data;
-						this.showCategoryIndex = res.return_data[0].merchantName;
-						this.showCategoryIndexId = res.return_data[0].id;
-						this.pageNum = 1;
-						this.pageSize = 10;
-						this.isNoMoreData = false;
-						this.categoryList = [];
-						this.getStoreListByMerchant();
-
-					} else {
-						this.MerchantList = [];
-						uni.showToast({
-							title: '暂无数据',
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				})
-			},
-			//跳转位置
-			goPostion() {
-				uni.navigateTo({
-					url: '/pages/user/positioning/positioning'
-				})
-			},
-			//门店列表
-			getStoreListByMerchant() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					merchantId: this.showCategoryIndexId,
-					longitude: app.globalData.longitude,
-					latitude: app.globalData.latitude,
-					pageNum: pagenum,
-					pageSize: this.pageSize
-
-				}
-				getStoreListByMerchant(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
-						this.categoryList = this.categoryList.concat(res.return_data.list);
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
-							this.isNoMoreData = true;
-						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.categoryList = [];
-					}
-				})
-
-			},
-			//分类切换显示
-			showCategory(e) {
-				this.showCategoryIndex = this.MerchantList[e.target.value].merchantName;
-				this.showCategoryIndexId = this.MerchantList[e.target.value].id;
-				this.pageNum = 1;
-				this.pageSize = 10;
-				this.isNoMoreData = false;
-				this.categoryList = [];
-				this.getStoreListByMerchant();
-			},
-			toCategory(e) {
-				uni.navigateTo({
-					url: '../../goods/store-list/store-details?id=' + e.id + '&juli=' + e.distance
-				})
-				// uni.navigateTo({
-				// 	url: '../../goods/goods?id=' + e
-				// });
-				uni.setStorage({
-					key: "store_id",
-					data: e.id
-				})
-				uni.setStorage({
-					key: "store_juli",
-					data: e.distance
-				})
-			},
-			//搜索跳转
-			toSearch() {
-				uni.navigateTo({
-					url: '../../goods/HM-search/HM-search'
-				})
-				// uni.showToast({title: "建议跳转到新页面做搜索功能"});
-			},
-			//拨打客服电话
-			playPhone() {
-				let cont = "本服务由惠兑礼品提供\n400-678-0738";
-				let content = cont.replace(/<br>/g,"\n");
-				uni.showModal({
-					title: '客服',
-					content: content,
-					success: function(res) {
-						if (res.confirm) {
-							uni.makePhoneCall({
-								phoneNumber: '4006780738', //电话号码
-								success: function(e) {
-									console.log(e);
-								},
-								fail: function(e) {
-									console.log(e);
-
-								}
-							})
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-<style lang="scss">
-	page {
-		background-color: #f1f3f5;
-	}
-
-	.h5xfimg {
-		width: 80rpx;
-		bottom: 140rpx;
-		position: fixed;
-		right: 40rpx;
-	}
-
-	.xfimg {
-		width: 80rpx;
-		bottom: 60rpx;
-		position: fixed;
-		right: 40rpx;
-	}
-
-	.status {
-		width: 100%;
-		height: 0;
-		position: fixed;
-		z-index: 10;
-		background-color: #fff;
-		top: 0;
-		/*  #ifdef  APP-PLUS  */
-		height: var(--status-bar-height); //覆盖样式
-		/*  #endif  */
-	}
-
-	button::after {
-		border: none
-	}
-
-	.recontleft {
-		width: 80px;
-		margin-left: 10px;
-	}
-
-	.recontright {
-		margin-left: 100px;
-	}
-
-	.refuel {
-		padding: 6px 5px;
-		border-radius: 5px;
-		background-color: #f6f6f6;
-		color: #666666;
-		margin-left: 10px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 13px;
-		width: 18%;
-		text-align: center;
-	}
-
-	.activeRefuel {
-		padding: 6px 5px;
-		border-radius: 5px;
-		border: 1px solid #089bf5;
-		color: #089bf5;
-		margin-left: 10px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 13px;
-		width: 18%;
-		text-align: center;
-	}
-
-	.stuMenu {
-		width: 33.3%;
-		height: 30px;
-		line-height: 30px;
-		font-size: 14px;
-		margin-top: 10px;
-		color: #333333;
-	}
-
-	.stuimg {
-		width: 10px;
-		vertical-align: middle;
-	}
-
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.header {
-		width: 92%;
-		padding: 0 4%;
-		height: 100upx;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		z-index: 10;
-		background-color: #0083f5;
-		/*  #ifdef  APP-PLUS  */
-		top: var(--status-bar-height);
-		/*  #endif  */
-
-		.addr {
-			width: 120upx;
-			height: 60upx;
-			flex-shrink: 0;
-			color: #FFFFFF;
-			display: flex;
-			align-items: center;
-			font-size: 28upx;
-
-			.icon {
-				height: 60upx;
-				margin-right: 5upx;
-				display: flex;
-				align-items: center;
-				font-size: 42upx;
-				color: #ffc50a;
-			}
-		}
-
-		.input-box {
-			width: 100%;
-			height: 70rpx;
-			background-color: #f5f5f5;
-			border-radius: 10rpx;
-			position: relative;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				display: flex;
-				align-items: center;
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 60upx;
-				height: 60upx;
-				font-size: 34upx;
-				color: #c0c0c0;
-			}
-
-			input {
-				padding-left: 28upx;
-				height: 28upx;
-				font-size: 28upx;
-				width: 100%;
-			}
-		}
-
-		.icon-btn {
-			width: 60upx;
-			height: 60upx;
-			flex-shrink: 0;
-			display: flex;
-
-			.icon {
-				width: 60upx;
-				height: 60upx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 42upx;
-				background-color: transparent;
-			}
-		}
-	}
-
-	.place {
-
-		background-color: #ffffff;
-		height: 100upx;
-		/*  #ifdef  APP-PLUS  */
-		margin-top: var(--status-bar-height);
-		/*  #endif  */
-	}
-
-	.category-list {
-		width: 100%;
-		display: flex;
-
-		.left,
-		.right {
-			position: absolute;
-
-			top: 100upx;
-			/*  #ifdef  APP-PLUS  */
-			top: calc(100upx + var(--status-bar-height));
-			/*  #endif  */
-			bottom: 0upx;
-		}
-
-		.left {
-			width: 24%;
-			left: 0upx;
-			background-color: #f2f2f2;
-
-			.row {
-				width: 100%;
-				height: 90upx;
-				display: flex;
-				align-items: center;
-
-				.text {
-					width: 100%;
-					position: relative;
-					font-size: 28upx;
-					display: flex;
-					justify-content: center;
-					color: #3c3c3c;
-
-					.block {
-						position: absolute;
-						width: 0upx;
-						left: 0;
-					}
-				}
-
-				&.on {
-					height: 100upx;
-					background-color: #fff;
-
-					.text {
-						font-size: 30upx;
-						font-weight: 600;
-						color: #2d2d2d;
-
-						.block {
-							width: 10upx;
-							height: 80%;
-							top: 10%;
-							background-color: #0083f5;
-						}
-					}
-				}
-			}
-		}
-
-		.right {
-			width: 76%;
-			left: 24%;
-
-			.category {
-				width: 94%;
-				padding: 20upx 3%;
-
-				.banner {
-					width: 100%;
-					height: 24.262vw;
-					border-radius: 10upx;
-					overflow: hidden;
-					box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.3);
-
-					image {
-						width: 100%;
-						height: 24.262vw;
-					}
-				}
-
-				.list {
-					margin-top: 40upx;
-					width: 100%;
-					display: flex;
-					flex-wrap: wrap;
-
-					.box {
-						width: calc(70vw / 2);
-						margin-bottom: 30upx;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						flex-wrap: wrap;
-
-						image {
-							width: 60%;
-							height: calc(70vw / 2 * 0.6);
-						}
-
-						.text {
-							margin-top: 5upx;
-							width: 80%;
-							display: flex;
-							justify-content: center;
-							font-size: 26upx;
-						}
-					}
-				}
-			}
-		}
-	}
-</style>
+<template>
+	<view class="content">
+		<map style="width: 100%; height: 90vh;" :style="{height:mapheight}" :show-location='true' :latitude="latitude"
+			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
+		</map>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				latitude: 23.106574, //纬度
+				longitude: 113.324587, //经度
+				scale: 13, //缩放级别
+				bottomData: false,
+				marker: [{
+						id: 0,
+						latitude: 23.13065, //纬度
+						longitude: 113.3274, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						//   title:'我在这里',//标注点名
+						alpha: 0.9, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天宝大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 1234597,
+						latitude: 23.106574, //纬度
+						longitude: 113.324587, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						//  title:'我在这里',//标注点名
+						alpha: 0.9, //透明度
+						//      label:{//为标记点旁边增加标签   //因背景颜色H5不支持
+						//   color:'red',//文本颜色
+						//      },
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '广州塔', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 2,
+						latitude: 23.1338, //纬度
+						longitude: 113.33052, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						alpha: 0.9, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '德隆大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 3,
+						latitude: 23.136455, //纬度
+						longitude: 113.329002, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						alpha: 0.9, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '羊城国际商贸中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 4,
+						latitude: 23.224781, //纬度
+						longitude: 113.293911, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						alpha: 0.9, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天瑞广场A座', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 16, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '12',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 5,
+						latitude: 23.072726, //纬度
+						longitude: 113.277921, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 20, //高
+						alpha: 0.9, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '大米和小米儿童康复(广州盈丰)中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 22, //边框圆角
+							borderWidth: '8',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+				],
+			}
+		},
+		onLoad() {
+
+		},
+		computed: {
+			mapheight() {
+				let data = ''
+				if (this.bottomData) {
+					if (this.upTop) {
+						data = '50px'
+					} else {
+						data = '200px'
+					}
+				} else {
+					data = '90vh'
+				}
+				return data
+			},
+			coverbottom() {
+				let data = ''
+				if (this.bottomData) {
+					data = '20rpx'
+				} else {
+					data = '100rpx'
+				}
+				return data
+			}
+		},
+		methods: {
+			//地图点击事件
+			markertap(e) {
+				console.log("===你点击了标记点===", e)
+			},
+			//地图点击事件
+			callouttap(e) {
+				console.log('地图点击事件', e)
+			}
+		}
+	}
+</script>
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 6ef9ef8..791c670 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -1,1017 +1,981 @@
-<template>
-	<view>
-		<!-- 状态栏 -->
-		<view v-if="showHeader && !isdisplay" class="status"
-			:style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view>
-		<!-- 顶部导航栏 -->
-		<view v-if="showHeader && !isdisplay" class="header"
-			:style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }">
-			<!-- 定位城市 -->
-			<view class="addr" @click="goPostion">
-				<!-- <view class="icon location"></view> -->
-				{{ city }}
-				<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres2"></image>
-			</view>
-			<!-- 搜索框 -->
-			<view class="input-box">
-				<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
-				<view class="icon search"></view>
-			</view>
-
-			<!-- 右侧图标按钮 -->
-			<view class="icon-btn">
-				<!-- #ifdef MP-->
-				<button open-type="contact" style="background-color: transparent;padding: 0px;">
-					<image src="../../../static/img/home/cusser.png" mode="widthFix" class="icon30"></image>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef H5-->
-				<image :src="imagewxUrl+imgadres4" mode="widthFix" style="background-color: transparent;padding: 0px;"
-					class="h5xfimg" @click="playPhone"></image>
-				<!-- #endif -->
-			</view>
-		</view>
-		<view v-if="isdisplay">
-			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
-		</view>
-
-		<!-- 顶部菜单 -->
-		<view v-for="(item,index) in homeCateList" :key="index" style="margin-top: -2px;">
-			<view class="height90 backcorltop mart50" v-if="item.type == 1">
-				<view class="category-list">
-					<view class="category" style="width: 25%;" v-for="(row, indexs) in item.childCategory" :key="indexs"
-						@click="toCategory(row)">
-						<view class="img">
-							<image :src="imageUrl+row.imgData"></image>
-						</view>
-						<view class="text fcorfff">{{ row.title }}</view>
-					</view>
-				</view>
-			</view>
-			<!-- 顶部活动图片 -->
-			<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
-
-			<!-- 顶部菜单 -->
-			<view class="category-list backcorfff" style="margin-top: -7px;" v-if="item.type == 7">
-				<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
-					@click="toCategory(row)">
-					<view class="img">
-						<image :src="imageUrl+row.imgData"></image>
-					</view>
-					<view class="text fcor333">{{ row.title }}</view>
-				</view>
-			</view>
-			<!-- 消息 -->
-			<view class="height120 backcorfff" v-if="item.type == 3">
-				<view class="height20 width100"></view>
-				<view class="width92 message alijus">
-					<view class="width100 alijus" style="margin-top: -20px;" @click="test(0)"
-						v-if="item.childDate.length == 1">
-						<view class="width80p paddleft10 alijusstart">
-							<view class="stus"></view>
-							<view class="paddleft10 font14 fcor666 text1 width70">
-								{{item.childDate[0].title}}
-							</view>
-							<view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
-						</view>
-						<view class="width20 alijus">
-							<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
-						</view>
-					</view>
-					<swiper v-else circular="true" autoplay="true" display-multiple-items="2" :vertical="true">
-						<swiper-item class="alijus" v-for="(swipers,index) in item.childDate" :key="swipers.id"
-							@click="test(index)">
-							<view class="width80p paddleft10 alijusstart">
-								<view class="stus"></view>
-								<view class="paddleft10 font14 fcor666 text1 width70">
-									{{swipers.title}}
-								</view>
-								<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
-							</view>
-							<view class="width20 alijus">
-								<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-
-			<!-- 轮播图 -->
-			<view class="swiper mart20" v-if="item.type == 2">
-				<view class="swiper-box">
-					<swiper circular="true" autoplay="true" @change="swiperChange">
-						<swiper-item v-for="swiper in item.childCategory" :key="swiper.id">
-							<image :src="imageUrl+swiper.imgData" @click="jumplottery(swiper)"></image>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-			<!-- 加油专区 ,天天好券-->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9"
-				@click="goGoodsList(item.jumpUrl)">
-				<view class="width70 font18 fcor333">
-					{{item.name}}
-				</view>
-				<view class="width30 font14 fotrt fcor666">更多</view>
-			</view>
-			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
-					@click="toGoods(item.detailJumpUrl,goods.id)">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
-						:src="imageUrl+goods.couponImg"></image>
-					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
-					<!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view> -->
-					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
-				</view>
-			</view>
-			<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
-					@click="toGoods(item.detailJumpUrl,goods.id)">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
-						:src="imageUrl+goods.listImg"></image>
-					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
-					<!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
-						{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view> -->
-					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
-				</view>
-			</view>
-			<!-- 惠享生活 -->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 5">
-				<view class="width70 font18 fcor333">
-					惠享生活
-				</view>
-			</view>
-			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
-				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
-			</image>
-			<view class="width90 alijusstart mart10" v-if="item.type == 5">
-				<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
-				<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[2].jumpUrl)"></image>
-				<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
-			</view>
-		</view>
-		<!-- 弹窗 -->
-		<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
-			<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
-		</wybPopup>
-		<view class="height40"></view>
-	</view>
-</template>
-
-<script>
-	import {
-		getUserInfo,
-		HandleCode,
-		getH5AccessToken,
-		getCmsContent,
-		findByLatAndLng
-	} from "../../../Utils/Api.js"; //您的api路径
-	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
-	let app = getApp();
-	export default {
-		components: {
-			wybPopup
-		},
-		data() {
-			return {
-				showHeader: true,
-				isShowAuth: false,
-				afterHeaderOpacity: 1, //不透明度
-				headerPosition: 'fixed',
-				headerTop: null,
-				statusTop: null,
-				nVueTitle: null,
-				city: '',
-				currentSwiper: 0,
-				imageUrl: app.globalData.imgUrl,
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: '/home/home1.png',
-				imgadres1: '/home/home2.png',
-				imgadres2: 'jt.png',
-				// imgadres5: 'unionarea.png',
-				imgadres3: '',
-				imgadres4: 'cusservice.png',
-				imgadres5: 'loading.gif',
-				webUrl: '',
-				loadingText: '正在加载...',
-				pageNum: 1,
-				pageSize: 6,
-				// 分类菜单
-				homeCateList: [],
-				//切换状态
-				jumpType: '',
-				locationRef: null, // 用于接收定位对象
-				isdisplay: true //是否展示
-			};
-		},
-
+<template>
+	<view>
+		<!-- 状态栏 -->
+		<view v-if="showHeader && !isdisplay" class="status"
+			:style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view>
+		<!-- 顶部导航栏 -->
+		<view v-if="showHeader && !isdisplay" class="header"
+			:style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }">
+			<!-- 定位城市 -->
+			<view class="addr" @click="goPostion">
+				<!-- <view class="icon location"></view> -->
+				{{ city }}
+				<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres2"></image>
+			</view>
+			<!-- 搜索框 -->
+			<view class="input-box">
+				<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
+				<view class="icon search"></view>
+			</view>
+
+			<!-- 右侧图标按钮 -->
+			<view class="icon-btn">
+				<!-- #ifdef MP-->
+				<button open-type="contact" style="background-color: transparent;padding: 0px;">
+					<image src="../../../static/img/home/cusser.png" mode="widthFix" class="icon30"></image>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef H5-->
+				<image :src="imagewxUrl+imgadres4" mode="widthFix" style="background-color: transparent;padding: 0px;"
+					class="h5xfimg" @click="playPhone"></image>
+				<!-- #endif -->
+			</view>
+		</view>
+		<view v-if="isdisplay">
+			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
+		</view>
+
+		<!-- 顶部菜单 -->
+		<view v-for="(item,index) in homeCateList" :key="index" style="margin-top: -2px;">
+			<view class="height90 backcorltop mart50" v-if="item.type == 1">
+				<view class="category-list">
+					<view class="category" style="width: 25%;" v-for="(row, indexs) in item.childCategory" :key="indexs"
+						@click="toCategory(row)">
+						<view class="img">
+							<image :src="imageUrl+row.imgData"></image>
+						</view>
+						<view class="text fcorfff">{{ row.title }}</view>
+					</view>
+				</view>
+			</view>
+			<!-- 顶部活动图片 -->
+			<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
+
+			<!-- 顶部菜单 -->
+			<view class="category-list backcorfff" style="margin-top: -7px;" v-if="item.type == 7">
+				<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
+					@click="toCategory(row)">
+					<view class="img">
+						<image :src="imageUrl+row.imgData"></image>
+					</view>
+					<view class="text fcor333">{{ row.title }}</view>
+				</view>
+			</view>
+			<!-- 消息 -->
+			<view class="height120 backcorfff" v-if="item.type == 3">
+				<view class="height20 width100"></view>
+				<view class="width92 message alijus">
+					<view class="width100 alijus" style="margin-top: -20px;" @click="test(0)"
+						v-if="item.childDate.length == 1">
+						<view class="width80p paddleft10 alijusstart">
+							<view class="stus"></view>
+							<view class="paddleft10 font14 fcor666 text1 width70">
+								{{item.childDate[0].title}}
+							</view>
+							<view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
+						</view>
+						<view class="width20 alijus">
+							<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
+						</view>
+					</view>
+					<swiper v-else circular="true" autoplay="true" display-multiple-items="2" :vertical="true">
+						<swiper-item class="alijus" v-for="(swipers,index) in item.childDate" :key="swipers.id"
+							@click="test(index)">
+							<view class="width80p paddleft10 alijusstart">
+								<view class="stus"></view>
+								<view class="paddleft10 font14 fcor666 text1 width70">
+									{{swipers.title}}
+								</view>
+								<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
+							</view>
+							<view class="width20 alijus">
+								<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+
+			<!-- 轮播图 -->
+			<view class="swiper mart20" v-if="item.type == 2">
+				<view class="swiper-box">
+					<swiper circular="true" autoplay="true" @change="swiperChange">
+						<swiper-item v-for="swiper in item.childCategory" :key="swiper.id">
+							<image :src="imageUrl+swiper.imgData" @click="jumplottery(swiper)"></image>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+			<!-- 加油专区 ,天天好券-->
+			<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9"
+				@click="goGoodsList(item.jumpUrl)">
+				<view class="width70 font18 fcor333">
+					{{item.name}}
+				</view>
+				<view class="width30 font14 fotrt fcor666">更多</view>
+			</view>
+			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
+				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.couponImg"></image>
+					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
+					<!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					</view> -->
+					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
+				</view>
+			</view>
+			<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
+				<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.listImg"></image>
+					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
+					<!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
+						{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					</view> -->
+					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
+				</view>
+			</view>
+			<!-- 惠享生活 -->
+			<view class="width90 mart20 alijusstart" v-if="item.type == 5">
+				<view class="width70 font18 fcor333">
+					惠享生活
+				</view>
+			</view>
+			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
+				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
+			</image>
+			<view class="width90 alijusstart mart10" v-if="item.type == 5">
+				<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31"
+					@click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
+				<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31"
+					@click="goGoodsList(item.childCategory[2].jumpUrl)"></image>
+				<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31"
+					@click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
+			</view>
+		</view>
+		<!-- 弹窗 -->
+		<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
+			<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
+		</wybPopup>
+		<view class="height40"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo,
+		HandleCode,
+		getH5AccessToken,
+		getCmsContent,
+		findByLatAndLng
+	} from "../../../Utils/Api.js"; //您的api路径
+	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
+	let app = getApp();
+	export default {
+		components: {
+			wybPopup
+		},
+		data() {
+			return {
+				showHeader: true,
+				isShowAuth: false,
+				afterHeaderOpacity: 1, //不透明度
+				headerPosition: 'fixed',
+				headerTop: null,
+				statusTop: null,
+				nVueTitle: null,
+				city: '',
+				currentSwiper: 0,
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: '/home/home1.png',
+				imgadres1: '/home/home2.png',
+				imgadres2: 'jt.png',
+				// imgadres5: 'unionarea.png',
+				imgadres3: '',
+				imgadres4: 'cusservice.png',
+				imgadres5: 'loading.gif',
+				webUrl: '',
+				loadingText: '正在加载...',
+				pageNum: 1,
+				pageSize: 6,
+				// 分类菜单
+				homeCateList: [],
+				//切换状态
+				jumpType: '',
+				locationRef: null, // 用于接收定位对象
+				isdisplay: true //是否展示
+			};
+		},
 		onShow() {
-			this.homeCateList = [];
-			if (app.globalData.cityName != '') {
-				this.city = app.globalData.qianzhuCityName;
-				this.getCmsContentcmsContent();
-			}
-			// #ifdef H5
-			// uni.getStorage({
-			// 	key: 'accountId',
-			// 	success(e) {
-			// 		if (e.data) {
-			// 			app.globalData.accountId = e.data;
-			// 		}
-			// 	}
-			// })
-			// uni.getStorage({
-			// 	key: 'gasKey',
-			// 	success(e) {
-			// 		if (e.data) {
-			// 			app.globalData.gasKey = e.data;
-			// 		}
-			// 	}
-			// })
-			// uni.getStorage({
-			// 	key: 'staffCode',
-			// 	success(e) {
-			// 		if (e.data) {
-			// 			if (app.globalData.accountId == '000001&key' || app.globalData.accountId ==
-			// 				'000000&gasKey' || app.globalData.accountId == '000009&key' || app.globalData
-			// 				.accountId == '0000010&key') {
-			// 				app.globalData.staffCode = e.data;
-			// 			} else {
-			// 				app.globalData.mchId = e.data;
-			// 			}
-			// 		}
-			// 	}
-			// })
-			// #endif
-		},
-		onLoad(options) {
-			let that = this;
-			// #ifdef MP
-			// 1.wx获取登录用户code
-			uni.login({
-				provider: 'weixin',
-				success: function(loginRes) {
-					app.globalData.code = loginRes.code;
-					// 请求接口
-					let params = {
-						code: app.globalData.code
-					}
-					HandleCode(params).then(res => {
-						if (res.return_code == '000000') {
-							app.globalData.openId = res.return_data.openId;
-						}
-					})
-				},
-			})
-			//定位
-			that.postionIng();
-			// #endif
-			// #ifdef H5
-			// if (app.globalData.h5code) {
-			// 	that.getH5AccessToken();
-			// }
-			uni.showLoading({
-				title: '加载中'
-			})
-			var geolocation = new qq.maps.Geolocation('7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB', "嗨森逛");
-			// 回调的第一次参数为成功后具体的位置信息
-			geolocation.getLocation(
-				res => {
-					uni.hideLoading();
-					app.globalData.latitude = res.lat;
-					app.globalData.longitude = res.lng;
-
-					uni.setStorage({
-						key: "latitude",
-						data: res.lat
-					})
-
-					uni.setStorage({
-						key: "longitude",
-						data: res.lng
-					})
-					that.findByLatAndLng(res.lng, res.lat);
-				},
-				err => {
-					uni.hideLoading();
-					uni.showModal({
-						title: '获取定位权限失败,默认城市重庆市',
-						content: '请确定手机定位已打开，并且当前浏览器允许获取定位，都开启后请刷新页面。'
-					})
-					that.city = '重庆市';
-					app.globalData.cityName = '重庆市';
-					app.globalData.cityId = '500000';
-					that.getCmsContentcmsContent();
-					that.getCmsAactibity();
-				}
-			);
-			// #endif
-			uni.getStorage({
-				key: "user",
-				success(e) {
-					app.globalData.userInfo = e.data //这就是你想要取的token
-					uni.getStorage({
-						key: 'token',
-						success(e) {
-							app.globalData.token = e.data;
-						}
-					})
-				},
-				fail: res => {}
-			})
-			if (JSON.stringify(options.id)) {
-				app.globalData.identificationCode = options.id;
-				return;
-			}
-			var arr1mp = decodeURIComponent(options.q);
-			if (arr1mp) {
-				var arr2mp = arr1mp.split('=');
-				if (arr2mp) {
-					app.globalData.identificationCode = arr2mp[2];
-				}
-			}
-
-		},
-		methods: {
-			jumpcdx() {
-				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
-			},
-			//获取首页功能
-			getCmsContentcmsContent() {
-				let code;
-				// #ifdef H5
-				code = '2'
-				// #endif
-				// #ifdef MP
-				code = '1'
-				// #endif
-				let params = {
-					companyId: app.globalData.companyId,
-					platform: code,
-					categoryCode: 'CMS_HOME'
-				}
-				getCmsContent(params).then(res => {
-					this.isdisplay = false;
-					if (res.return_code == '000000') {
-						this.homeCateList = res.return_data;
-					}
-				});
-			},
-			//弹窗
-			getCmsAactibity() {
-				let code;
-				// #ifdef H5
-				code = '2'
-				// #endif
-				// #ifdef MP
-				code = '1'
-				// #endif
-				let params = {
-					companyId: app.globalData.companyId,
-					platform: code,
-					categoryCode: 'CMS_HOME_POPOVER'
-				}
-				getCmsContent(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.childCategory.length != 0) {
-						//弹窗首页广告
-						this.showPopup();
-						this.imgadres3 = res.return_data.childCategory[0].imgData;
-						this.webUrl = res.return_data.childCategory[0].jumpUrl;
-						this.jumpType = res.return_data.childCategory[0].jumpType;
-					}
-				});
-			},
-			//显示弹出
-			showPopup() {
-				this.$refs.popup.show();
-			},
-			close() {
-				this.isShowAuth = false;
-			},
-			//关闭弹窗
-			closePopup() {
-				this.$refs.popup.hide();
-			},
-
-			/**
-			 * 跳转外链
-			 */
-			jumpWeb() {
-				if (this.jumpType == 1) {
-					if (this.webUrl) {
-						uni.navigateTo({
-							url: '../order/webUrl/webUrl?url=' + this.webUrl
-						})
-					}
-				} else {
-					uni.navigateTo({
-						url: this.webUrl
-					})
-				}
-
-				this.closePopup();
-			},
-			/**
-			 * 定位
-			 */
-			postionIng() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let that = this;
-				uni.getLocation({
-					type: 'wgs84',
-					success: function(res) {
-						app.globalData.latitude = res.latitude;
-						app.globalData.longitude = res.longitude;
-						uni.hideLoading();
-						that.findByLatAndLng(res.longitude, res.latitude);
-					},
-					fail: (err) => {
-						if (err.errCode == 2) {
-							uni.showToast({
-								title: '请开启系统定位',
-								duration: 3000,
-								icon: 'none'
-							})
-						} else {
-							uni.showToast({
-								title: '定位失败,请重新进入小程序',
-								duration: 3000,
-								icon: 'none'
-							})
-						}
-					}
-				})
-			},
-			// 获取精准定位
-			getLocation() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let that = this;
-				that.locationRef.getLocation() // 调用 getLocation 方法获取精准定位
-					.then(res => {
-						uni.hideLoading();
-						// res 就是返回的数据
-						app.globalData.latitude = res.lat;
-						app.globalData.longitude = res.lng;
-						that.findByLatAndLng(res.lng, res.lat);
-					})
-			},
-			//经纬度转换
-			findByLatAndLng(item, item1) {
-				let that = this;
-				let datas = {
-					lng: item,
-					lat: item1
-				}
-				findByLatAndLng(datas).then(res => {
-					if (res.return_code == '000000') {
-						that.city = res.return_data.provinceName;
-						app.globalData.cityName = res.return_data.provinceName;
-						app.globalData.qianzhuCityName = res.return_data.cityName;
-						app.globalData.cityId = res.return_data.regionId;
-						app.globalData.companyId = res.return_data.companyId;
-						uni.setStorage({
-							key: "cityId",
-							data: res.return_data.regionId
-						})
-						uni.setStorage({
-							key: "cityName",
-							data: res.return_data.provinceName
-						})
-						uni.setStorage({
-							key: "qianzhuCityName",
-							data: res.return_data.cityName
-						})
-						uni.setStorage({
-							key: "companyId",
-							data: res.return_data.companyId
-						})
-						// app.globalData.cityId = '500103';
-						if (res.return_data.regionId) {
-							that.getCmsAactibity();
-							that.getCmsContentcmsContent();
-						}
-						uni.getStorage({
-							key: 'accountType',
-							success(e) {
-								if (e.data) {
-									app.globalData.accountType = e.data;
-
-									// 000000#/  一健加油
-									// 000000&gasKey  加油员
-									// 000001&key 领取优惠券
-									// 002  积分专区
-									// 003  星巴克
-									// 004  肯德基
-									// 005  会员充值
-									// 006  话费充值
-									// 007  在线加油
-									// 008  工会卡卡券
-									// 009  分销推广优选商品
-									// 0010 只跳首页
-									// 0011 扫码领取优惠券
-									// 0012 分享领取优惠券
-									// 0013 分享界面
-
-									if (e.data == '000000#/' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../goods/refuel-details/refuel-details'
-										})
-									}
-									if (e.data == '000000&gasKey' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../goods/refuel-details/refuel-details'
-										})
-									}
-									if (e.data == '000001&key') {
-										uni.navigateTo({
-											url: '/subPages/scancodeCoupons/scancodeCoupons'
-										})
-									}
-
-									if (e.data == '000002&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '/pages/goods/goods-list/goods-list?id=2'
-										})
-									}
-									if (e.data == '000003&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '/qianzhu-Starbucks/home/home'
-										})
-									}
-									if (e.data == '000004&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../../qianzhu-KFC/home/home'
-										})
-									}
-									if (e.data == '000005&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '/member-Recharge/choicepage/choicepage'
-										})
-									}
-									if (e.data == '000006&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../../subPages/recharge/recharge'
-										})
-									}
-									if (e.data == '000007&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../goods/refuel/refuel'
-										})
-									}
-									if (e.data == '000008&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '../../goods/goods-list/goods-list?id=5'
-										})
-									}
-									if (e.data == '000009&key' && app.globalData.h5code) {
-										uni.navigateTo({
-											url: '/subPages/selectEntry/selectEntry'
-										})
-									}
-									// if (e.data == '0000011&key' && app.globalData.h5code) {
-									// 	uni.navigateTo({
-									// 		url: '../../goods/externalCoupon/externalCoupon'
-									// 	})
-									// }
-									// if (e.data == '0000012&key' && app.globalData.h5code) {
-									// 	uni.navigateTo({
-									// 		url: '/subPages/shareCounpon/shareCounpon'
-									// 	})
-									// }
-									// if (e.data == '0000013&key' && app.globalData.h5code) {
-									// 	uni.navigateTo({
-									// 		url: '/subPages/shareImgage/shareImgage'
-									// 	})
-									// }
-								}
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				});
-			},
-			//H5 获取openId
-			getH5AccessToken() {
-				let params = {
-					code: app.globalData.h5code
-				}
-				getH5AccessToken(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.openid) {
-						app.globalData.openId = res.return_data.openid;
-						uni.setStorage({
-							key: "openId",
-							data: res.return_data.openid
-						})
-					} else {
-						this.jumpcdx();
-					}
-				});
-			},
-			//搜索跳转
-			toSearch() {
-				uni.navigateTo({
-					url: '../../goods/HM-search/HM-search'
-				})
-			},
-			//跳转位置
-			goPostion() {
-				uni.navigateTo({
-					url: '/pages/user/positioning/positioning'
-				})
-			},
-			//商品跳转
-			toGoods(e, id) {
-				uni.navigateTo({
-					url: e + id
-				});
-			},
-
-			//轮播图指示器
-			swiperChange(event) {
-				this.currentSwiper = event.detail.current;
-			},
-			test(item) {
-				let datas = [];
-				for (var i = 0; i < this.homeCateList.length; i++) {
-					if (this.homeCateList[i].type == 3) {
-						datas.push(this.homeCateList[i])
-					}
-				}
-				let jumpid = datas[0].childDate[item].type;
-				uni.navigateTo({
-					url: '../../user/news/news?id=' + jumpid
-				})
-			},
-
-			eheckStu(item) {
-				this.cpStuats = item;
-			},
-			//获取登陆信息
-			getuserinfos() {
-				let that = this;
-				// 获取微信用户信息
-				uni.getUserProfile({
-					desc: '登录中...',
-					success: function(res) {
-						let params = {
-							openId: app.globalData.openId,
-							iv: res.iv,
-							encryptedData: res.encryptedData
-						}
-						getUserInfo(params).then(res => {
-							if (res.return_code == '000000') {
-								uni.hideLoading();
-								uni.showToast({
-									title: '获取信息成功',
-									icon: 'none',
-									duration: 2000
-								})
-								app.globalData.userInfo = res
-									.return_data
-									.object
-									.highUser;
-								app.globalData.token = res
-									.return_data.uniqueCode;
-								uni.setStorage({
-									key: "user",
-									data: res.return_data
-										.object
-										.highUser
-								})
-								uni.setStorage({
-									key: "token",
-									data: res.return_data
-										.uniqueCode
-								})
-							} else {
-								uni.hideLoading();
-								uni.showToast({
-									title: res.return_msg,
-									icon: 'none',
-									duration: 2000
-								})
-							}
-						});
-					},
-					fail: res => {
-						uni.hideLoading();
-						uni.showToast({
-							title: "微信登录授权失败",
-							icon: "none"
-						});
-					}
-				})
-			},
-			//跳转菜单
-			toCategory(item) {
-				uni.navigateTo({
-					url: item.jumpUrl
-				})
-			},
-			//轮播跳转活动
-			jumplottery(item) {
-				if (item.jumpUrl) {
-					uni.navigateTo({
-						url: item.jumpUrl
-					})
-				}
-
-			},
-			//跳转商品列表
-			goGoodsList(item) {
-				uni.navigateTo({
-					url: item
-					// '/pages/goods/goods-list/goods-list?id=' + item
-				})
-			},
-			//拨打客服电话
-			playPhone() {
-				uni.showModal({
-					title: '客服',
-					content: '4006780738',
-					success: function(res) {
-						if (res.confirm) {
-							uni.makePhoneCall({
-								phoneNumber: '4006780738', //电话号码
-								success: function(e) {
-									console.log(e);
-								},
-								fail: function(e) {
-									console.log(e);
-
-								}
-							})
-						}
-					}
-				})
-			}
-		},
-
-	};
-</script>
-<style lang="scss">
-	page {
-		background-color: #F5F5F5;
-	}
-
-	.popImg {
-		width: 100%;
-		height: 430px;
-	}
-
-	.h5xfimg {
-		width: 80rpx;
-		bottom: 140rpx;
-		position: fixed;
-		right: 40rpx;
-	}
-
-	.xfimg {
-		width: 80rpx;
-		bottom: 60rpx;
-		position: fixed;
-		right: 40rpx;
-	}
-
-	@font-face {
-		font-family: 'HMfont-home';
-		src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
-	}
-
-	button::after {
-		border: none
-	}
-
-	.pullDown-effects {
-		position: fixed;
-		//top: calc(100upx - 36vw);
-		top: 0;
-		z-index: 9;
-		width: 100%;
-		height: 36vw;
-		/*  #ifdef  APP-PLUS  */
-		padding-top: var(--status-bar-height);
-
-		/*  #endif  */
-		image {
-			width: 100%;
-			height: 36vw;
-		}
-	}
-
-	.status {
-		width: 100%;
-		height: 0;
-		position: fixed;
-		z-index: 10;
-		background-color: #fff;
-		top: 0;
-		/*  #ifdef  APP-PLUS  */
-		height: var(--status-bar-height); //覆盖样式
-		/*  #endif  */
-	}
-
-	.header {
-		width: 92%;
-		padding: 0 4%;
-		height: 100upx;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		background-color: #3da7e7;
-		top: 0;
-		z-index: 10;
-
-		/*  #ifdef  APP-PLUS  */
-		top: var(--status-bar-height);
-		/*  #endif  */
-
-		.addr {
-			width: 120upx;
-			height: 45rpx;
-			flex-shrink: 0;
-			display: flex;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 1;
-			-webkit-box-orient: vertical;
-			text-overflow: ellipsis;
-			align-items: center;
-			font-size: 28upx;
-			color: #FFFFFF;
-
-			.icon {
-				height: 60upx;
-				margin-right: 5upx;
-				display: flex;
-				align-items: center;
-				font-size: 42upx;
-				color: #ffc50a;
-			}
-		}
-
-		.input-box {
-			width: 100%;
-			height: 70rpx;
-			background-color: #f5f5f5;
-			border-radius: 10rpx;
-			position: relative;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				display: flex;
-				align-items: center;
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 60upx;
-				height: 60upx;
-				font-size: 34upx;
-				color: #c0c0c0;
-			}
-
-			input {
-				padding-left: 28upx;
-				height: 28upx;
-				font-size: 28upx;
-				width: 100%;
-			}
-		}
-
-		.icon-btn {
-			width: 60upx;
-			height: 60upx;
-			flex-shrink: 0;
-			margin-left: 5px;
-			display: flex;
-
-			.icon {
-				width: 60upx;
-				height: 60upx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 42upx;
-				background-color: transparent;
-			}
-		}
-	}
-
-	//弹窗
-	button::after {
-		border: none
-	}
-
-	.category-list {
-		width: 100%;
-		display: flex;
-		justify-content: flex-start;
-		flex-wrap: wrap;
-
-		.category {
-			margin-top: 40upx;
-			display: flex;
-			flex-wrap: wrap;
-
-			.img {
-				width: 100%;
-				display: flex;
-				justify-content: center;
-
-				image {
-					width: 9vw;
-					height: 9vw;
-				}
-			}
-
-			.text {
-				margin-top: 16upx;
-				width: 100%;
-				display: flex;
-				justify-content: center;
-				font-size: 24upx;
-			}
-		}
-	}
-
-
-	.swiper {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-
-		.swiper-box {
-			width: 92%;
-			height: 100px;
-			overflow: hidden;
-			border-radius: 15upx;
-			box-shadow: 0upx 8upx 25upx rgba(0, 0, 0, 0.2);
-			//兼容ios，微信小程序
-			position: relative;
-			z-index: 1;
-
-			swiper {
-				width: 100%;
-				height: 100px;
-
-				swiper-item {
-					image {
-						width: 100%;
-						height: 100px;
-					}
-				}
-			}
-		}
-	}
-
-	.spcarea {
-		width: 31%;
-		margin-left: 2%;
-		padding-bottom: 10px;
-	}
-
-	.message {
-		border: 1px solid #f1f1f1;
-		height: 60px;
-		border-radius: 8px;
-		overflow: hidden;
-		position: relative;
-		z-index: 1;
-		padding-top: 5px;
-		padding-bottom: 5px;
-
-		swiper {
-			width: 100%;
-			height: 60px;
-
-			swiper-item {
-				view {
-					height: 20px;
-				}
-			}
-		}
-
-		.stus {
-			width: 5px;
-			height: 5px;
-			background-color: red;
-			border-radius: 50%;
-		}
-	}
-</style>
+			this.homeCateList = [];
+			if (app.globalData.cityName != '') {
+				this.city = app.globalData.qianzhuCityName;
+				this.getCmsContentcmsContent();
+			}
+		},
+		onLoad(options) {
+			let that = this;
+			// #ifdef MP
+			// 1.wx获取登录用户code
+			uni.login({
+				provider: 'weixin',
+				success: function(loginRes) {
+					app.globalData.code = loginRes.code;
+					// 请求接口
+					let params = {
+						code: app.globalData.code
+					}
+					HandleCode(params).then(res => {
+						if (res.return_code == '000000') {
+							app.globalData.openId = res.return_data.openId;
+						}
+					})
+				},
+			})
+			// #endif
+			//定位
+			that.postionIng();
+			// #ifdef H5
+			// uni.showLoading({
+			// 	title: '加载中'
+			// })
+			// var geolocation = new qq.maps.Geolocation('7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB', "嗨森逛");
+			// // 回调的第一次参数为成功后具体的位置信息
+			// geolocation.getLocation(
+			// 	res => {
+			// 		uni.hideLoading();
+			// 		app.globalData.latitude = res.lat;
+			// 		app.globalData.longitude = res.lng;
+
+			// 		uni.setStorage({
+			// 			key: "latitude",
+			// 			data: res.lat
+			// 		})
+
+			// 		uni.setStorage({
+			// 			key: "longitude",
+			// 			data: res.lng
+			// 		})
+			// 		that.findByLatAndLng(res.lng, res.lat);
+			// 	},
+			// 	err => {
+			// 		uni.hideLoading();
+			// 		uni.showModal({
+			// 			title: '获取定位权限失败,默认城市重庆市',
+			// 			content: '请确定手机定位已打开，并且当前浏览器允许获取定位，都开启后请刷新页面。'
+			// 		})
+			// 		that.city = '重庆市';
+			// 		app.globalData.cityName = '重庆市';
+			// 		app.globalData.cityId = '500000';
+			// 		that.getCmsContentcmsContent();
+			// 		that.getCmsAactibity();
+			// 	}
+			// );
+			// #endif
+			uni.getStorage({
+				key: "user",
+				success(e) {
+					app.globalData.userInfo = e.data //这就是你想要取的token
+					uni.getStorage({
+						key: 'token',
+						success(e) {
+							app.globalData.token = e.data;
+						}
+					})
+				},
+				fail: res => {}
+			})
+			if (JSON.stringify(options.id)) {
+				app.globalData.identificationCode = options.id;
+				return;
+			}
+			var arr1mp = decodeURIComponent(options.q);
+			if (arr1mp) {
+				var arr2mp = arr1mp.split('=');
+				if (arr2mp) {
+					app.globalData.identificationCode = arr2mp[2];
+				}
+			}
+
+		},
+		methods: {
+			jumpcdx() {
+				location.href =
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+			},
+			//获取首页功能
+			getCmsContentcmsContent() {
+				let code;
+				// #ifdef H5
+				code = '2'
+				// #endif
+				// #ifdef MP
+				code = '1'
+				// #endif
+				let params = {
+					companyId: app.globalData.companyId,
+					platform: code,
+					categoryCode: 'CMS_HOME'
+				}
+				getCmsContent(params).then(res => {
+					this.isdisplay = false;
+					if (res.return_code == '000000') {
+						this.homeCateList = res.return_data;
+					}
+				});
+			},
+			//弹窗
+			getCmsAactibity() {
+				let code;
+				// #ifdef H5
+				code = '2'
+				// #endif
+				// #ifdef MP
+				code = '1'
+				// #endif
+				let params = {
+					companyId: app.globalData.companyId,
+					platform: code,
+					categoryCode: 'CMS_HOME_POPOVER'
+				}
+				getCmsContent(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.childCategory.length != 0) {
+						//弹窗首页广告
+						this.showPopup();
+						this.imgadres3 = res.return_data.childCategory[0].imgData;
+						this.webUrl = res.return_data.childCategory[0].jumpUrl;
+						this.jumpType = res.return_data.childCategory[0].jumpType;
+					}
+				});
+			},
+			//显示弹出
+			showPopup() {
+				this.$refs.popup.show();
+			},
+			close() {
+				this.isShowAuth = false;
+			},
+			//关闭弹窗
+			closePopup() {
+				this.$refs.popup.hide();
+			},
+
+			/**
+			 * 跳转外链
+			 */
+			jumpWeb() {
+				if (this.jumpType == 1) {
+					if (this.webUrl) {
+						uni.navigateTo({
+							url: '../order/webUrl/webUrl?url=' + this.webUrl
+						})
+					}
+				} else {
+					uni.navigateTo({
+						url: this.webUrl
+					})
+				}
+
+				this.closePopup();
+			},
+			/**
+			 * 定位
+			 */
+			postionIng() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let that = this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						app.globalData.latitude = res.latitude;
+						app.globalData.longitude = res.longitude;
+						uni.hideLoading();
+						that.findByLatAndLng(res.longitude, res.latitude);
+					},
+					fail: (err) => {
+						if (err.errCode == 2) {
+							uni.showToast({
+								title: '请开启系统定位',
+								duration: 3000,
+								icon: 'none'
+							})
+						} else {
+							uni.showToast({
+								title: '定位失败,请重新进入小程序',
+								duration: 3000,
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+			// 获取精准定位
+			getLocation() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let that = this;
+				that.locationRef.getLocation() // 调用 getLocation 方法获取精准定位
+					.then(res => {
+						uni.hideLoading();
+						// res 就是返回的数据
+						app.globalData.latitude = res.lat;
+						app.globalData.longitude = res.lng;
+						that.findByLatAndLng(res.lng, res.lat);
+					})
+			},
+			//经纬度转换
+			findByLatAndLng(item, item1) {
+				let that = this;
+				let datas = {
+					lng: item,
+					lat: item1
+				}
+				findByLatAndLng(datas).then(res => {
+					if (res.return_code == '000000') {
+						that.city = res.return_data.provinceName;
+						app.globalData.cityName = res.return_data.provinceName;
+						app.globalData.qianzhuCityName = res.return_data.cityName;
+						app.globalData.cityId = res.return_data.regionId;
+						app.globalData.companyId = res.return_data.companyId;
+						uni.setStorage({
+							key: "cityId",
+							data: res.return_data.regionId
+						})
+						uni.setStorage({
+							key: "cityName",
+							data: res.return_data.provinceName
+						})
+						uni.setStorage({
+							key: "qianzhuCityName",
+							data: res.return_data.cityName
+						})
+						uni.setStorage({
+							key: "companyId",
+							data: res.return_data.companyId
+						})
+						// app.globalData.cityId = '500103';
+						if (res.return_data.regionId) {
+							that.getCmsAactibity();
+							that.getCmsContentcmsContent();
+						}
+						uni.getStorage({
+							key: 'accountType',
+							success(e) {
+								if (e.data) {
+									app.globalData.accountType = e.data;
+
+									// 000000#/  一健加油
+									// 000000&gasKey  加油员
+									// 000001&key 领取优惠券
+									// 002  积分专区
+									// 003  星巴克
+									// 004  肯德基
+									// 005  会员充值
+									// 006  话费充值
+									// 007  在线加油
+									// 008  工会卡卡券
+									// 009  分销推广优选商品
+									// 0010 只跳首页
+									// 0011 扫码领取优惠券
+									// 0012 分享领取优惠券
+									// 0013 分享界面
+
+									if (e.data == '000000#/' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/refuel-details/refuel-details'
+										})
+									}
+									if (e.data == '000000&gasKey' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/refuel-details/refuel-details'
+										})
+									}
+									if (e.data == '000001&key') {
+										uni.navigateTo({
+											url: '/subPages/scancodeCoupons/scancodeCoupons'
+										})
+									}
+
+									if (e.data == '000002&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '/pages/goods/goods-list/goods-list?id=2'
+										})
+									}
+									if (e.data == '000003&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '/qianzhu-Starbucks/home/home'
+										})
+									}
+									if (e.data == '000004&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../../qianzhu-KFC/home/home'
+										})
+									}
+									if (e.data == '000005&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '/member-Recharge/choicepage/choicepage'
+										})
+									}
+									if (e.data == '000006&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../../subPages/recharge/recharge'
+										})
+									}
+									if (e.data == '000007&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/refuel/refuel'
+										})
+									}
+									if (e.data == '000008&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '../../goods/goods-list/goods-list?id=5'
+										})
+									}
+									if (e.data == '000009&key' && app.globalData.h5code) {
+										uni.navigateTo({
+											url: '/subPages/selectEntry/selectEntry'
+										})
+									}
+									// if (e.data == '0000011&key' && app.globalData.h5code) {
+									// 	uni.navigateTo({
+									// 		url: '../../goods/externalCoupon/externalCoupon'
+									// 	})
+									// }
+									// if (e.data == '0000012&key' && app.globalData.h5code) {
+									// 	uni.navigateTo({
+									// 		url: '/subPages/shareCounpon/shareCounpon'
+									// 	})
+									// }
+									// if (e.data == '0000013&key' && app.globalData.h5code) {
+									// 	uni.navigateTo({
+									// 		url: '/subPages/shareImgage/shareImgage'
+									// 	})
+									// }
+								}
+							}
+						})
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
+			//H5 获取openId
+			getH5AccessToken() {
+				let params = {
+					code: app.globalData.h5code
+				}
+				getH5AccessToken(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.openid) {
+						app.globalData.openId = res.return_data.openid;
+						uni.setStorage({
+							key: "openId",
+							data: res.return_data.openid
+						})
+					} else {
+						this.jumpcdx();
+					}
+				});
+			},
+			//搜索跳转
+			toSearch() {
+				uni.navigateTo({
+					url: '../../goods/HM-search/HM-search'
+				})
+			},
+			//跳转位置
+			goPostion() {
+				uni.navigateTo({
+					url: '/pages/user/positioning/positioning'
+				})
+			},
+			//商品跳转
+			toGoods(e, id) {
+				uni.navigateTo({
+					url: e + id
+				});
+			},
+
+			//轮播图指示器
+			swiperChange(event) {
+				this.currentSwiper = event.detail.current;
+			},
+			test(item) {
+				let datas = [];
+				for (var i = 0; i < this.homeCateList.length; i++) {
+					if (this.homeCateList[i].type == 3) {
+						datas.push(this.homeCateList[i])
+					}
+				}
+				let jumpid = datas[0].childDate[item].type;
+				uni.navigateTo({
+					url: '../../user/news/news?id=' + jumpid
+				})
+			},
+
+			eheckStu(item) {
+				this.cpStuats = item;
+			},
+			//获取登陆信息
+			getuserinfos() {
+				let that = this;
+				// 获取微信用户信息
+				uni.getUserProfile({
+					desc: '登录中...',
+					success: function(res) {
+						let params = {
+							openId: app.globalData.openId,
+							iv: res.iv,
+							encryptedData: res.encryptedData
+						}
+						getUserInfo(params).then(res => {
+							if (res.return_code == '000000') {
+								uni.hideLoading();
+								uni.showToast({
+									title: '获取信息成功',
+									icon: 'none',
+									duration: 2000
+								})
+								app.globalData.userInfo = res
+									.return_data
+									.object
+									.highUser;
+								app.globalData.token = res
+									.return_data.uniqueCode;
+								uni.setStorage({
+									key: "user",
+									data: res.return_data
+										.object
+										.highUser
+								})
+								uni.setStorage({
+									key: "token",
+									data: res.return_data
+										.uniqueCode
+								})
+							} else {
+								uni.hideLoading();
+								uni.showToast({
+									title: res.return_msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						});
+					},
+					fail: res => {
+						uni.hideLoading();
+						uni.showToast({
+							title: "微信登录授权失败",
+							icon: "none"
+						});
+					}
+				})
+			},
+			//跳转菜单
+			toCategory(item) {
+				uni.navigateTo({
+					url: item.jumpUrl
+				})
+			},
+			//轮播跳转活动
+			jumplottery(item) {
+				if (item.jumpUrl) {
+					uni.navigateTo({
+						url: item.jumpUrl
+					})
+				}
+
+			},
+			//跳转商品列表
+			goGoodsList(item) {
+				uni.navigateTo({
+					url: item
+					// '/pages/goods/goods-list/goods-list?id=' + item
+				})
+			},
+			//拨打客服电话
+			playPhone() {
+				uni.showModal({
+					title: '客服',
+					content: '4006780738',
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '4006780738', //电话号码
+								success: function(e) {
+									console.log(e);
+								},
+								fail: function(e) {
+									console.log(e);
+
+								}
+							})
+						}
+					}
+				})
+			}
+		},
+
+	};
+</script>
+<style lang="scss">
+	page {
+		background-color: #F5F5F5;
+	}
+
+	.popImg {
+		width: 100%;
+		height: 430px;
+	}
+
+	.h5xfimg {
+		width: 80rpx;
+		bottom: 140rpx;
+		position: fixed;
+		right: 40rpx;
+	}
+
+	.xfimg {
+		width: 80rpx;
+		bottom: 60rpx;
+		position: fixed;
+		right: 40rpx;
+	}
+
+	@font-face {
+		font-family: 'HMfont-home';
+		src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+	}
+
+	button::after {
+		border: none
+	}
+
+	.pullDown-effects {
+		position: fixed;
+		//top: calc(100upx - 36vw);
+		top: 0;
+		z-index: 9;
+		width: 100%;
+		height: 36vw;
+		/*  #ifdef  APP-PLUS  */
+		padding-top: var(--status-bar-height);
+
+		/*  #endif  */
+		image {
+			width: 100%;
+			height: 36vw;
+		}
+	}
+
+	.status {
+		width: 100%;
+		height: 0;
+		position: fixed;
+		z-index: 10;
+		background-color: #fff;
+		top: 0;
+		/*  #ifdef  APP-PLUS  */
+		height: var(--status-bar-height); //覆盖样式
+		/*  #endif  */
+	}
+
+	.header {
+		width: 92%;
+		padding: 0 4%;
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		position: fixed;
+		background-color: #3da7e7;
+		top: 0;
+		z-index: 10;
+
+		/*  #ifdef  APP-PLUS  */
+		top: var(--status-bar-height);
+		/*  #endif  */
+
+		.addr {
+			width: 120upx;
+			height: 45rpx;
+			flex-shrink: 0;
+			display: flex;
+			overflow: hidden;
+			display: -webkit-box;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			align-items: center;
+			font-size: 28upx;
+			color: #FFFFFF;
+
+			.icon {
+				height: 60upx;
+				margin-right: 5upx;
+				display: flex;
+				align-items: center;
+				font-size: 42upx;
+				color: #ffc50a;
+			}
+		}
+
+		.input-box {
+			width: 100%;
+			height: 70rpx;
+			background-color: #f5f5f5;
+			border-radius: 10rpx;
+			position: relative;
+			display: flex;
+			align-items: center;
+
+			.icon {
+				display: flex;
+				align-items: center;
+				position: absolute;
+				top: 0;
+				right: 0;
+				width: 60upx;
+				height: 60upx;
+				font-size: 34upx;
+				color: #c0c0c0;
+			}
+
+			input {
+				padding-left: 28upx;
+				height: 28upx;
+				font-size: 28upx;
+				width: 100%;
+			}
+		}
+
+		.icon-btn {
+			width: 60upx;
+			height: 60upx;
+			flex-shrink: 0;
+			margin-left: 5px;
+			display: flex;
+
+			.icon {
+				width: 60upx;
+				height: 60upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 42upx;
+				background-color: transparent;
+			}
+		}
+	}
+
+	//弹窗
+	button::after {
+		border: none
+	}
+
+	.category-list {
+		width: 100%;
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+
+		.category {
+			margin-top: 40upx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.img {
+				width: 100%;
+				display: flex;
+				justify-content: center;
+
+				image {
+					width: 9vw;
+					height: 9vw;
+				}
+			}
+
+			.text {
+				margin-top: 16upx;
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				font-size: 24upx;
+			}
+		}
+	}
+
+
+	.swiper {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+
+		.swiper-box {
+			width: 92%;
+			height: 100px;
+			overflow: hidden;
+			border-radius: 15upx;
+			box-shadow: 0upx 8upx 25upx rgba(0, 0, 0, 0.2);
+			//兼容ios，微信小程序
+			position: relative;
+			z-index: 1;
+
+			swiper {
+				width: 100%;
+				height: 100px;
+
+				swiper-item {
+					image {
+						width: 100%;
+						height: 100px;
+					}
+				}
+			}
+		}
+	}
+
+	.spcarea {
+		width: 31%;
+		margin-left: 2%;
+		padding-bottom: 10px;
+	}
+
+	.message {
+		border: 1px solid #f1f1f1;
+		height: 60px;
+		border-radius: 8px;
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		padding-top: 5px;
+		padding-bottom: 5px;
+
+		swiper {
+			width: 100%;
+			height: 60px;
+
+			swiper-item {
+				view {
+					height: 20px;
+				}
+			}
+		}
+
+		.stus {
+			width: 5px;
+			height: 5px;
+			background-color: red;
+			border-radius: 50%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/coupon/coupon.vue b/pages/user/coupon/coupon.vue
index 65390ec..140eea7 100644
--- a/pages/user/coupon/coupon.vue
+++ b/pages/user/coupon/coupon.vue
@@ -220,7 +220,7 @@
 							        font-size: 16px;
 							        }
 								</style>
-							 <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">立即使用</button>
+							 <button class="download" style="height:40px;line-height: 40PX;width:100%;border:none;">去使用</button>
 						</script>
 				</wx-open-launch-weapp>
 

From 7f395169f82ef53605dea549f066f2207232218c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 4 Apr 2023 11:00:42 +0800
Subject: [PATCH 2/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/category/category.vue | 618 ++++++++++++++++++++---------
 1 file changed, 441 insertions(+), 177 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 9e13eb1..8ddef21 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,177 +1,441 @@
-<template>
-	<view class="content">
-		<map style="width: 100%; height: 90vh;" :style="{height:mapheight}" :show-location='true' :latitude="latitude"
-			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
-		</map>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				latitude: 23.106574, //纬度
-				longitude: 113.324587, //经度
-				scale: 13, //缩放级别
-				bottomData: false,
-				marker: [{
-						id: 0,
-						latitude: 23.13065, //纬度
-						longitude: 113.3274, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						//   title:'我在这里',//标注点名
-						alpha: 0.9, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '天宝大厦', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 1234597,
-						latitude: 23.106574, //纬度
-						longitude: 113.324587, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						//  title:'我在这里',//标注点名
-						alpha: 0.9, //透明度
-						//      label:{//为标记点旁边增加标签   //因背景颜色H5不支持
-						//   color:'red',//文本颜色
-						//      },
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '广州塔', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 2,
-						latitude: 23.1338, //纬度
-						longitude: 113.33052, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						alpha: 0.9, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '德隆大厦', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 3,
-						latitude: 23.136455, //纬度
-						longitude: 113.329002, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						alpha: 0.9, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '羊城国际商贸中心', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 4,
-						latitude: 23.224781, //纬度
-						longitude: 113.293911, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						alpha: 0.9, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '天瑞广场A座', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 16, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '12',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 5,
-						latitude: 23.072726, //纬度
-						longitude: 113.277921, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 20, //高
-						alpha: 0.9, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '大米和小米儿童康复(广州盈丰)中心', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 22, //边框圆角
-							borderWidth: '8',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-				],
-			}
-		},
-		onLoad() {
-
-		},
-		computed: {
-			mapheight() {
-				let data = ''
-				if (this.bottomData) {
-					if (this.upTop) {
-						data = '50px'
-					} else {
-						data = '200px'
-					}
-				} else {
-					data = '90vh'
-				}
-				return data
-			},
-			coverbottom() {
-				let data = ''
-				if (this.bottomData) {
-					data = '20rpx'
-				} else {
-					data = '100rpx'
-				}
-				return data
-			}
-		},
-		methods: {
-			//地图点击事件
-			markertap(e) {
-				console.log("===你点击了标记点===", e)
-			},
-			//地图点击事件
-			callouttap(e) {
-				console.log('地图点击事件', e)
-			}
-		}
-	}
-</script>
+<template>
+	<view class="map-container">
+		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}" :show-location='true' :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>
+				<cover-view>
+					定位
+				</cover-view>
+			</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 marker" :key="index" @click="changeType(item)">全部全部{{index}}</view>
+				</scroll-view>
+				<!-- 二级分类 -->
+				<view class="width100 mart15 backcorfff cover-viewchage alijus fotct" style="border-radius: 22px;">
+					<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']"
+						@click="changeChilerType()">全部
+						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
+					</view>
+					<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']">全部
+						<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">
+				<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">
+						<view class="width90w" :class="[selectFirst == 1? 'onchange' : '']">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
+						<view class="width90w">发生地方是发生地方</view>
+						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					</view>
+				</scroll-view>
+			</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="input-box">
+					<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
+						@input="toSearch()" />
+				</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="input-box">
+					<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
+						@input="toSearch()" />
+				</view>
+				<scroll-view class="scoroll-cont mart10" scroll-y="true">
+					<view class="height45 width100" @click.stop="updateSelected(1)">收到粉丝都是短发舒服</view>
+
+				</scroll-view>
+			</view>
+
+		</map>
+	</view>
+</template>
+<script>
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				latitude: 23.106574, //纬度
+				longitude: 113.324587, //经度
+				scale: 13, //缩放级别
+				bottomData: false,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres2: 'xiala.png',
+				marker: [{
+						id: 0,
+						latitude: 23.13065, //纬度
+						longitude: 113.3274, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						//   title:'我在这里',//标注点名
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天宝大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 1234597,
+						latitude: 23.106574, //纬度
+						longitude: 113.324587, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						//  title:'我在这里',//标注点名
+						alpha: 0.5, //透明度
+						//      label:{//为标记点旁边增加标签   //因背景颜色H5不支持
+						//   color:'red',//文本颜色
+						//      },
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '广州塔', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 2,
+						latitude: 23.1338, //纬度
+						longitude: 113.33052, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '德隆大厦', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 3,
+						latitude: 23.136455, //纬度
+						longitude: 113.329002, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '羊城国际商贸中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '10',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 4,
+						latitude: 23.224781, //纬度
+						longitude: 113.293911, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '天瑞广场A座', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 16, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '12',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+					{
+						id: 5,
+						latitude: 23.072726, //纬度
+						longitude: 113.277921, //经度
+						iconPath: '../../../static/img/user/user5.png', //显示的图标        
+						rotate: 0, // 旋转度数
+						width: 20, //宽
+						height: 30, //高
+						alpha: 0.5, //透明度
+						callout: { //自定义标记点上方的气泡窗口 点击有效  
+							content: '大米和小米儿童康复(广州盈丰)中心', //文本
+							color: '#ffffff', //文字颜色
+							fontSize: 14, //文本大小
+							borderRadius: 15, //边框圆角
+							borderWidth: '8',
+							bgColor: '#e51860', //背景颜色
+							display: 'ALWAYS', //常显
+						},
+					},
+				],
+				typeid: 0, //选择分类
+				isSelected: 1, //是否选择下拉
+				selectFirst: 1, //筛选是否有值
+				selectChiler: 1, // 子菜单筛选
+				
+
+			}
+		},
+		onLoad() {
+
+		},
+		computed: {
+			mapheight() {
+				let data = ''
+				if (this.bottomData) {
+					if (this.upTop) {
+						data = '50px'
+					} else {
+						data = '200px'
+					}
+				} else {
+					data = '100vh'
+				}
+				return data
+			},
+			coverbottom() {
+				let data = ''
+				if (this.bottomData) {
+					data = '20rpx'
+				} else {
+					data = '200rpx'
+				}
+				return data
+			}
+		},
+
+		methods: {
+			//地图点击事件
+			markertap(e) {},
+			//地图点击事件
+			callouttap(e) {
+				console.log('地图点击事件', e)
+			},
+			// 定位点击事件
+			onControltap() {
+
+			},
+			//选择类型
+			changeType(item) {
+				this.typeid = item.id;
+			},
+			//子菜单显示
+			changeChilerType() {
+				if (this.selectChiler == 1) {
+					this.selectChiler = 2;
+				} else {
+					this.selectChiler = 1;
+				}
+			},
+			// 是否选择下拉
+			updateSelected(item) {
+				this.isSelected = item;
+			}
+		}
+	}
+</script>
+<style lang='less' scoped>
+	.map-container {
+		position: relative;
+		overflow: hidden;
+
+		.cover-views {
+			position: absolute;
+			z-index: 99999;
+		}
+
+
+
+		.cover-view-cont {
+			display: flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			white-space: nowrap;
+		}
+
+		.cover-view-head {
+			height: 35px;
+			line-height: 35px;
+			background-color: #fff;
+			display: inline-table;
+			flex-direction: column;
+			text-align: center;
+			position: relative;
+			margin-right: 15px;
+			border-radius: 22px;
+			padding: 0 10px;
+		}
+
+		.cover-viewchage {
+			height: 35px;
+		}
+
+		.onchange {
+			color: #089bf5;
+		}
+
+		.onclick {
+			background-color: #089bf5;
+			color: #fff;
+		}
+
+		.cover-view-loca {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			width: 40px;
+			height: 40px;
+			color: #484848;
+			background-color: #fff;
+			background-size: 60px 60px;
+			background-position: center center;
+			position: absolute;
+			bottom: 100px;
+			right: 16px;
+		}
+
+		.cover-image {
+			display: inline-block;
+			width: 15px;
+			height: 15px;
+		}
+
+		.cover-view-foot {
+			text-align: center;
+			height: 200rpx;
+			background-color: #fff;
+			position: absolute;
+			bottom: 0px;
+			width: 100%;
+			border-radius: 18px 18px 0 0;
+		}
+
+		.change-cont {
+			position: absolute;
+			z-index: 99999999;
+			top: 100px;
+			background-color: #333;
+			width: 100%;
+			opacity: 0.8;
+			height: calc(100% - 100px);
+		}
+
+		.change-optiac {
+			position: absolute;
+			z-index: 99999999;
+			top: 100px;
+			width: 100%;
+			background-color: #fff;
+			height: 260px;
+		}
+
+		.cover-view-foot-behind {
+			text-align: center;
+			height: calc(100% - 110px);
+			background-color: #fff;
+			position: absolute;
+			z-index: 999999;
+			bottom: 0px;
+			width: 100%;
+			border-radius: 18px 18px 0 0;
+		}
+	}
+
+	.scoroll-cont {
+		height: calc(100% - 80px);
+	}
+
+	.line-view {
+		width: 10%;
+		margin-left: 45%;
+		height: 5px;
+		border-radius: 12px;
+		margin-top: 10px;
+		background-color: #f0f0f0;
+	}
+
+	.input-box {
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 5px;
+		text-align: left;
+		height: 70rpx;
+		background-color: #f0f0f0;
+		border-radius: 22px;
+		position: relative;
+		align-items: center;
+		display: flex;
+
+		input {
+			padding-left: 12px;
+			padding-right: 12px;
+			height: 30px;
+			color: #666;
+			font-size: 14px;
+			width: 100%;
+		}
+	}
+
+	.onclick {
+		background-color: #089bf5;
+		color: #fff;
+	}
+</style>
\ No newline at end of file

From 45a546991c37e50c8a3e0d983fc5bf4ca224a2e4 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 6 Apr 2023 10:58:48 +0800
Subject: [PATCH 3/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 8ddef21..138ce20 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -85,9 +85,14 @@
 					<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
 						@input="toSearch()" />
 				</view>
-				<scroll-view class="scoroll-cont mart10" scroll-y="true">
-					<view class="height45 width100" @click.stop="updateSelected(1)">收到粉丝都是短发舒服</view>
-
+				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
+					<view class="width94 alijusstart" @click.stop="updateSelected(1)">
+						<view class="width30">
+							<image src="../../../static/img/jfx.png" class="icon45" mode="widthFix">
+							</image>
+						</view>
+						<view class="width70"></view>
+					</view>
 				</scroll-view>
 			</view>
 
@@ -228,8 +233,8 @@
 				typeid: 0, //选择分类
 				isSelected: 1, //是否选择下拉
 				selectFirst: 1, //筛选是否有值
-				selectChiler: 1, // 子菜单筛选
-				
+				selectChiler: 1, // 子菜单筛选
+
 
 			}
 		},
@@ -301,8 +306,6 @@
 			z-index: 99999;
 		}
 
-
-
 		.cover-view-cont {
 			display: flex;
 			flex-direction: row;

From 14fcb61ffeca7a40716ded7351e64de16a2f815b Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Fri, 21 Apr 2023 13:55:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=8F=90=E4=BA=A42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order_list/order_list.vue | 58 ++++++++++++++++++----------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index cc638a3..55b759d 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -65,43 +65,41 @@
 								</image>
 								<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
 									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<view class="width100 text1" >{{row.title}}</view>
+								<view class="width100 text1">{{row.title}}</view>
 							</view>
 						</view>
-						<view  class="width30 flright fotrt fcor666 font15 fotrt">
+						<view class="width30 flright fotrt fcor666 font15 fotrt">
 							<view class="font14 fcor333">
 								x1
 							</view>
 						</view>
 					</view>
-					<view v-if="row.productType == 12" class="width96 height22 mart10">
-						<view class="width70 flleft fotlt ">
+					<view v-if="row.productType == 12" class="width96  mart10">
+						<view class="width100   ">
 							<view class="font16 fontwig6 fcor333 alijusstart">
-								
-								<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig" style="width: 50rpx;height: 50rpx;">
+								<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig"
+									style="width: 50rpx;height: 50rpx;">
 								</image>
-								<!-- <view class="width100 text1" v-if="row.productType != 12">{{row.title}}</view> -->
-
-								<!-- <view class="po-ra" v-if="row.productType == 12&&row.ext6.split(',').length>1">
-									<scroll-view class="settle-goods" scroll-x="true">
-										<view class="settle-con">
-											<view class="settle-img" v-for="item in row.ext6.split(',')">
-												<image class="st-img" :src="imageUrl+'item'" mode="aspectFill"></image>
-											</view>
-
+								<view class="width100 text1">{{row.title}}</view>
+							</view>
+							<view class="po-ra width100 mart10" v-if="row.productType == 12&&row.ext6.length>1">
+								<scroll-view class="settle-goods" scroll-x="true">
+									<view class="settle-con">
+										<view class="settle-img" v-for="item in row.ext6">
+											<image class="st-img" :src="imageUrl+item" mode="aspectFill"></image>
 										</view>
 
-									</scroll-view>
-									<view class="fix-soon fcor666">
-										<view class="fix-price">
+									</view>
 
-											<text class="icon-ymt to-right font14 fcor666"></text>
+								</scroll-view>
+								<view class="fix-soon fcor666">
+									<view class="fix-price">
 
-										</view>
+										<text class="icon-ymt to-right font14 fcor666"></text>
 
 									</view>
-								</view> -->
 
+								</view>
 							</view>
 						</view>
 						<!-- <view  class="width30 flright fotrt fcor666 font15 fotrt">
@@ -216,6 +214,10 @@
 			}
 			this.list = this.orderList[this.typeId];
 			this.tabbarIndex = tbIndex;
+			// this.getUserOrderList();
+			// this.getDictionaryByCodeType();
+		},
+		onShow(){
 			this.getUserOrderList();
 			this.getDictionaryByCodeType();
 		},
@@ -289,7 +291,21 @@
 						if (res.return_data.total == (this.pageNum * this.pageSize)) {
 							this.isNoMoreData = true;
 						}
+
+						if (res.return_data.list.length > 0) {
+							res.return_data.list.map(item => {
+								if (item.ext6) {
+									item.ext6 = item.ext6.split(",")
+								}
+							})
+						}
+
+
 						this.orderList = this.orderList.concat(res.return_data.list);
+
+						//处理图片
+
+
 						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
 					} else {
 						this.orderList = [];

From 850903d2f184244a78c2ba2b75096db2e7dc610d Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 27 Apr 2023 13:56:59 +0800
Subject: [PATCH 5/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=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

---
 Utils/Api.js                       |   9 +-
 pages/tabBar/category/category.vue | 269 ++++++++++++-----------------
 static/img/changed.png             | Bin 0 -> 489 bytes
 3 files changed, 115 insertions(+), 163 deletions(-)
 create mode 100644 static/img/changed.png

diff --git a/Utils/Api.js b/Utils/Api.js
index b2c6233..4471c21 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -139,7 +139,14 @@ export const getOrderById = params => {
 //获取商户列表
 export const getMerchantList = params => {
 	return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data);
-}
+}
+//查询新的地图商户
+export const getIndustry = params => {
+	return POST('GET', `${base}/common/getIndustry`, params).then(res => res.data);
+}
+export const getMapStore = params => {
+	return POST('GET', `${base}/common/getMapStore`, params).then(res => res.data);
+}
 //首页获取门店
 export const getStoreListByMerchant = params => {
 	return POST('GET', `${base}/highMerchantStore/getStoreListByMerchant`, params).then(res => res.data);
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 379160a..4a0fb8c 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -12,15 +12,16 @@
 			<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 marker" :key="index" @click="changeType(item)">全部全部{{index}}</view>
+						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;">
-					<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']"
-						@click="changeChilerType()">全部
+					<!-- :class="[selectFirst == 1? 'onchange' : '']" -->
+					<view class="font14 width30w onchange text1" @click="changeChilerType()">{{selectFirstName}}
 						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
 					</view>
-					<view class="font14 width30w" :class="[selectFirst == 1? 'onchange' : '']">全部
+					<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">
@@ -36,33 +37,22 @@
 			<!-- //显示内容 -->
 			<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">
-						<view class="width90w" :class="[selectFirst == 1? 'onchange' : '']">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
-					</view>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
-					</view>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
-					</view>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
-					</view>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart"
+						v-for="(item,index) in goodsSendotClassList" :key="item.id" @click="changeFirstcont(item)">
+						<view class="width90w" :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>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
-					</view>
-					<view class="width90 bor-botm1 paddtop15 paddbotm15 alijusstart">
-						<view class="width90w">发生地方是发生地方</view>
-						<image class="icon12" src="../../../static/img/jt.png" mode="widthFix"></image>
+				</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" :class="[ distance== item.id? 'onchange' : '']">{{item.title}}</view>
+						<image class="icon20" src="../../../static/img/changed.png" mode="widthFix"
+							v-if="distance == item"></image>
 					</view>
 				</scroll-view>
 			</view>
@@ -72,7 +62,7 @@
 				<view class="line-view"></view>
 				<view class="mart10 fcor666 font13 width100">发现更多商户</view>
 				<view class="input-box">
-					<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
+					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
 						@input="toSearch()" />
 				</view>
 			</view>
@@ -82,16 +72,14 @@
 				<view class="line-view"></view>
 				<view class="mart10 fcor666 font13 width100">发现更多商户</view>
 				<view class="input-box">
-					<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;"
+					<input placeholder="搜索商品" v-model="searchName" placeholder-style="color:#c0c0c0;"
 						@input="toSearch()" />
 				</view>
 				<scroll-view class="scoroll-cont width94 mart10" scroll-y="true">
 					<view class="width94 alijusstart" @click.stop="updateSelected(1)">
-						<view class="width30">
-							<image src="../../../static/img/jfx.png" class="icon45" mode="widthFix">
-							</image>
-						</view>
-						<view class="width70"></view>
+					
+					
+						
 					</view>
 				</scroll-view>
 			</view>
@@ -100,146 +88,51 @@
 	</view>
 </template>
 <script>
+	import {
+		getIndustry,
+		getMapStore
+	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
 		data() {
 			return {
-				latitude: 23.106574, //纬度
-				longitude: 113.324587, //经度
+				latitude: '', //纬度
+				longitude: '', //经度
 				scale: 13, //缩放级别
 				bottomData: false,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres2: 'xiala.png',
-				marker: [{
-						id: 0,
-						latitude: 23.13065, //纬度
-						longitude: 113.3274, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						//   title:'我在这里',//标注点名
-						alpha: 0.5, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '天宝大厦', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 1234597,
-						latitude: 23.106574, //纬度
-						longitude: 113.324587, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						//  title:'我在这里',//标注点名
-						alpha: 0.5, //透明度
-						//      label:{//为标记点旁边增加标签   //因背景颜色H5不支持
-						//   color:'red',//文本颜色
-						//      },
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '广州塔', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 2,
-						latitude: 23.1338, //纬度
-						longitude: 113.33052, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						alpha: 0.5, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '德隆大厦', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
+				marker: '',
+				typeid: 0, //选择分类
+				isSelected: 1, //是否选择下拉
+				selectFirst: '', //筛选是否有值
+				selectFirstName: '', //筛选值名字
+				selectChiler: 2, // 一级子菜单筛选
+				selectChilerdistance: 2, // 二级子菜单筛选
+				goodsFirstClassList: '', //商品一级分类
+				goodsSendotClassList: '', //商品一级分类
+				distanceList: [{
+						id: 1,
+						title: '1km'
 					},
 					{
 						id: 3,
-						latitude: 23.136455, //纬度
-						longitude: 113.329002, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						alpha: 0.5, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '羊城国际商贸中心', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '10',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
-					},
-					{
-						id: 4,
-						latitude: 23.224781, //纬度
-						longitude: 113.293911, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						alpha: 0.5, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '天瑞广场A座', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 16, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '12',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
+						title: '3km'
 					},
 					{
 						id: 5,
-						latitude: 23.072726, //纬度
-						longitude: 113.277921, //经度
-						iconPath: '../../../static/img/user/user5.png', //显示的图标        
-						rotate: 0, // 旋转度数
-						width: 20, //宽
-						height: 30, //高
-						alpha: 0.5, //透明度
-						callout: { //自定义标记点上方的气泡窗口 点击有效  
-							content: '大米和小米儿童康复(广州盈丰)中心', //文本
-							color: '#ffffff', //文字颜色
-							fontSize: 14, //文本大小
-							borderRadius: 15, //边框圆角
-							borderWidth: '8',
-							bgColor: '#e51860', //背景颜色
-							display: 'ALWAYS', //常显
-						},
+						title: '5km'
 					},
-				],
-				typeid: 0, //选择分类
-				isSelected: 1, //是否选择下拉
-				selectFirst: 1, //筛选是否有值
-				selectChiler: 1, // 子菜单筛选
-
-
+				], //距离
+				distance: '1',
+				distanceName: '1km',
+				searchName: '' //搜索名称
 			}
 		},
 		onLoad() {
-
+			this.getIndustry();
+			this.latitude = app.globalData.latitude;
+			this.longitude = app.globalData.longitude;
 		},
 		computed: {
 			mapheight() {
@@ -267,6 +160,46 @@
 		},
 
 		methods: {
+			//查询商户列表
+			getIndustry() {
+				getIndustry().then(res => {
+					if (res.return_code == '000000') {
+						this.goodsFirstClassList = res.return_data;
+						this.typeid = res.return_data[0].id;
+						this.goodsSendotClassList = res.return_data[0].childIndustry;
+						this.selectFirst = res.return_data[0].childIndustry[0].id;
+						this.selectFirstName = res.return_data[0].childIndustry[0].name;
+						this.getMapStore();
+					}
+				})
+			},
+			//查询商户
+			getMapStore() {
+				let datas = {
+					distance: this.distance,
+					name: this.searchName,
+					childId: this.selectFirst,
+					longitude: app.globalData.longitude,
+					latitude: app.globalData.latitude
+				}
+				getMapStore(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.marker = res.return_data
+					}
+				})
+			},
+			//选择二级分类数据
+			changeFirstcont(item) {
+				this.selectFirst = item.id;
+				this.selectFirstName = item.name;
+				this.selectChiler = 2;
+			},
+			//选择距离
+			changeDistance(item) {
+				this.distance = item.id;
+				this.distanceName = item.title;
+				this.selectChilerdistance = 2;
+			},
 			//地图点击事件
 			markertap(e) {},
 			//地图点击事件
@@ -305,9 +238,9 @@
 				}
 				findByLatAndLng(datas).then(res => {
 					if (res.return_code == '000000') {
-						this.city = res.return_data.provinceName;
-						app.globalData.cityName = res.return_data.provinceName;
-						app.globalData.qianzhuCityName = res.return_data.cityName;
+						this.city = res.return_data.provinceName;
+						app.globalData.cityName = res.return_data.provinceName;
+						app.globalData.qianzhuCityName = res.return_data.cityName;
 						app.globalData.cityId = res.return_data.regionId;
 						// app.globalData.cityId = '500100';
 						if (res.return_data.result.addressComponent.adcode) {
@@ -390,6 +323,9 @@
 			//选择类型
 			changeType(item) {
 				this.typeid = item.id;
+				this.goodsSendotClassList = item.childIndustry;
+				this.selectFirst = item.childIndustry[0].id;
+				this.selectFirstName = item.childIndustry[0].name;
 			},
 			//子菜单显示
 			changeChilerType() {
@@ -399,6 +335,15 @@
 					this.selectChiler = 1;
 				}
 			},
+			//距离显示
+			changeChilerdistance() {
+				if (this.selectChilerdistance == 1) {
+					this.selectChilerdistance = 2;
+				} else {
+					this.selectChilerdistance = 1;
+				}
+
+			},
 			// 是否选择下拉
 			updateSelected(item) {
 				this.isSelected = item;
diff --git a/static/img/changed.png b/static/img/changed.png
new file mode 100644
index 0000000000000000000000000000000000000000..f66c855e3707f171cb6089b4f7778e06963279db
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$qe(<TRCr$PnL$p&Fc3u@R+WG=0f)&sDCg*52xkJMtO|0h2wWv4<IE&~@XxYR
zt$ELX?AU2S<xf*Nf1m&+pmGCjfyx8GMUXAP7O30+TcGj)a2H?;um%2sfy3$jF=F)X
zeJ90n-vSB#<~4zzpQI983&`QextB?BD_|OaknqyCx5uTe;8K7Ve3ax)fF`^<0ow4c
z1X#ek5nu)HLVzVayZ~!>XaQTm!wT369#X)T@NfdQhKCZc2Yj)B!|C%F!nu<kJ?9Q6
zd%+h8Nbupg^!$A(VNZCmfE>Q;{QX<N-tbBS%5Gv1;Kc&sAEr|vlYjzWBw(!sB=}+h
zr4rEKR|$|xK!jf{V5tODcohMENl4q?cyFJ*1&D5M=U$@L{;qZ@I=?$imIwi_mVgm)
zp#&IsbphAgVbBBxZz3Q`_~=4t9`f*iz4h(g@DUT~QCkBpp>heB@Ma14SrcLs;%95T
znICI3O8`>Luhl{UUS`UwPA0(0te0__053CTRVNc*W!B5MOn{e}vZ|8_urljqTqeNF
fOj*@geFDA#)dSi=t?j+T00000NkvXXu0mjfbW_yz

literal 0
HcmV?d00001


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 6/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=9C=B0=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

From b09beafa80409685737a1425703fbe2b164f01f1 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 27 Apr 2023 14:51:17 +0800
Subject: [PATCH 7/7] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=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 | 31 ++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 7469256..a7d0d8a 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="map-container">
-		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}"  :latitude="latitude"
-			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
+		<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>
 				<cover-view>
@@ -79,9 +79,10 @@
 					<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">
+					<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-height: 60px;" @click="toCategory(box)">
+							style="max-height: 60px;">
 						</image>
 						<view class="fotlt paddleft5">
 							<view class="text2 width100 font18 fontwig6">
@@ -213,14 +214,14 @@
 			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();
 			},
 			//地图点击事件
@@ -348,7 +349,7 @@
 				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();
 			},
 			//子菜单显示
@@ -371,7 +372,21 @@
 			// 是否选择下拉
 			updateSelected(item) {
 				this.isSelected = item;
-			}
+			},
+			seeloaction(item) {
+				// #ifdef H5
+				window.location.href =
+					`http://apis.map.qq.com/uri/v1/marker?marker=coord:(${item.latitude},${item.longitude})&addr:${item.address}`;
+				// #endif
+				// #ifdef MP
+				uni.openLocation({
+					latitude: Number(item.latitude), //目的地的定位
+					longitude: Number(item.longitude), //目的地的定位
+					name: item.store_name,
+					address: item.address
+				})
+				// #endif
+			},
 		}
 	}
 </script>
