diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 30730bf..e936390 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="map-container">
 		<!-- #ifdef H5 -->
-		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}" :latitude="latitude" :longitude="longitude"
-			:markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
+		<map id="myMap" style="width: 100%; height: 10vh;" :style="{height:mapheight}" :latitude="latitude"
+			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
 			<cover-view class="cover-view-loca" :style='{bottom:coverbottom}' @click="onControltap">
 				<cover-image class="cover-image" src="../../../static/img/dispos.png"></cover-image>
 			</cover-view>
@@ -107,8 +107,8 @@
 		<!-- #endif -->
 
 		<!-- #ifdef MP -->
-		<map style="width: 100%; height: 10vh;" :style="{height:mapheight}" :latitude="latitude" :longitude="longitude"
-			:markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
+		<map id="myMap" style="width: 100%; height: 10vh;" :style="{height:mapheight}" :latitude="latitude"
+			:longitude="longitude" :markers="marker" :scale="scale" @markertap="markertap" @callouttap='callouttap'>
 			<cover-view class="cover-view-loca" :style='{bottom:coverbottom}' @click="onControltap">
 				<cover-image class="cover-image" src="../../../static/img/dispos.png"></cover-image>
 			</cover-view>
@@ -123,10 +123,10 @@
 				<view class="width100 mart15 backcorfff cover-viewchage alijus fotct" style="border-radius: 22px;">
 					<!-- :class="[selectFirst == 1? 'onchange' : '']" -->
 					<view class="font14 width30w fotct onchange text1" @click="changeChilerType()">{{selectFirstName}}
-						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
+						<image mode="aspectFit" class="margle" style="width: 8px;height:8px;" :src="imagewxUrl+imgadres2"></image>
 					</view>
 					<view class="font14 width30w onchange" @click="changeChilerdistance()">{{distanceName}}
-						<image mode="widthFix" class="margle" style="width: 8px;" :src="imagewxUrl+imgadres2"></image>
+						<image mode="aspectFit" class="margle" style="width: 8px;height:8px;" :src="imagewxUrl+imgadres2"></image>
 					</view>
 					<view class="font14 width30w">
 						<!-- 全部
@@ -222,13 +222,14 @@
 			return {
 				latitude: '', //纬度
 				longitude: '', //经度
+				mapContext: null,
 				scale: 13, //缩放级别
 				bottomData: false,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres2: 'xiala.png',
 				imgadres3: 'noorder.png',
 				imgadres4: 'dh.png',
-				marker: '', //商户
+				marker: [], //商户
 				typeid: 99999999, //选择分类
 				isSelected: 1, //是否选择下拉
 				selectFirst: '99999999', //筛选是否有值
@@ -282,11 +283,17 @@
 				typeplat: 1 //手机类型
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.onControltap();
+		},
+		onReady() {
+				this.mapContext = uni.createMapContext('myMap');
+				console.log(this.mapContext)
+		},
 		onShow() {
 			// this.latitude = app.globalData.latitude;
 			// this.longitude = app.globalData.longitude;
-			this.onControltap();
+			/* this.onControltap(); */
 		},
 		computed: {
 			mapheight() {
@@ -338,9 +345,9 @@
 				})
 			},
 			//查询商户
-			getMapStore() {
-				uni.showLoading({
-					title: '加载中...'
+			getMapStore() {
+				uni.showLoading({
+					title: '加载中...'
 				})
 				let childId = '';
 				if (this.selectFirst == 99999999) {
@@ -356,13 +363,27 @@
 					longitude: this.longitude,
 					latitude: this.latitude
 				}
-				getMapStore(datas).then(res => {
+				getMapStore(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						this.marker = res.return_data
+						this.marker = res.return_data;
+						// console.log(this.marker,"marker")
 					} else {
 						this.marker = [];
 					}
+
+					this.marker.push({
+						id: 0,
+						latitude: this.latitude,
+						longitude: this.longitude,
+						iconPath: '/static/img/location.png',
+						rotate: 1,
+						alpha: 1,
+						width: 40,
+						height: 40
+
+					})
+
 				})
 			},
 			//选择二级分类数据
@@ -379,27 +400,26 @@
 				this.selectChilerdistance = 2;
 				this.getMapStore();
 			},
-			//地图点击事件
+			//地图点击事件,点击标记点时触发
 			markertap(e) {
-				// #ifdef H5
+				// console.log(e,"点击标记点时触发");
 				let markerId = e.detail.markerId;
+				if(markerId == 0) return; /* 点击当前自己定位的标记点*/
 				for (var i = 0; i < this.marker.length; i++) {
 					if (markerId == this.marker[i].id) {
 						this.seeloaction(this.marker[i]);
 					}
 				}
-				// #endif
 			},
-			//地图点击事件
+			//地图点击事件,点击标记点对应的气泡时触发，
 			callouttap(e) {
-				// #ifdef MP
-				let markerId = e.markerId;
+				// console.log(e, "点击标记点对应的气泡")
+				let markerId = e.detail.markerId;
 				for (var i = 0; i < this.marker.length; i++) {
 					if (markerId == this.marker[i].id) {
 						this.seeloaction(this.marker[i]);
 					}
 				}
-				// #endif
 			},
 
 			postionIng() {
@@ -523,6 +543,18 @@
 						// console.log(res, '获取当前位置')
 						this.longitude = res.longitude;
 						this.latitude = res.latitude;
+						
+						if(this.mapContext){
+						this.mapContext.moveToLocation({
+							latitude: this.latitude,
+							longitude: this.longitude,
+							success(res){
+								// console.log(res,"成功")
+							}
+						})
+						}
+
+						console.log(this.longitude, this.latitude, "this.longitude,this.latitude")
 						this.getIndustry();
 					},
 					fail() {
@@ -550,15 +582,15 @@
 						"ext2": null,
 						"status": 1,
 						"ext1": "642"
-					}];
-					this.selectFirst = '99999999';
+					}];
+					this.selectFirst = '99999999';
 					this.selectFirstName = '全部';
-				}else{
-					this.goodsSendotClassList = item.childIndustry;
-					this.selectFirst = item.childIndustry[0].id;
-					this.selectFirstName = item.childIndustry[0].name;
+				} else {
+					this.goodsSendotClassList = item.childIndustry;
+					this.selectFirst = item.childIndustry[0].id;
+					this.selectFirstName = item.childIndustry[0].name;
 				}
-				
+
 				this.getMapStore();
 			},
 			//子菜单显示
@@ -585,18 +617,26 @@
 				this.isSelected = item;
 			},
 			seeloaction(item) {
-				// #ifdef H5
+				console.log(item,"item");
+				uni.openLocation({
+					latitude: parseFloat(item.latitude), //目的地的定位
+					longitude: parseFloat(item.longitude), //目的地的定位
+					name: item.callout.content,
+					address: item.callout.address
+				})
+				
+
+				/* 
 				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
+				 */
+
 			},
 		}
 	}
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index db33edd..0a1db92 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -50,7 +50,7 @@
 			<view class="title width94">
 				<view class="width70 fontwig6">订单</view>
 				<view class="width30 alijusend font14 fcor999" @click="toOrderList(-1)">全部订单<image class="icon15"
-						mode="widthFix" src="../../../static/img/jt.png">
+						mode="aspectFit" style="width: 15px;height: 15px;" src="../../../static/img/jt.png">
 					</image>
 				</view>
 			</view>
@@ -65,7 +65,7 @@
 						v-if="row.text == '已完成' && whetherCheckNum " :text="whetherCheckNum" type="error" size="normal">
 					</uni-badge>
 					<view class="img">
-						<image :src="row.icon" class="icon40" mode="widthFix"></image>
+						<image :src="row.icon" class="icon40" style="width: 40px;height: 40px;" mode="aspectFit"></image>
 					</view>
 					<view class="text mart10">{{row.text}}</view>
 				</view>
@@ -111,13 +111,13 @@
 		<view class="order">
 			<view class="title width94">
 				<view class="width70 fontwig6 alijusstart">我的资产
-					<image mode="widthFix" class="icon30" v-if="assetsstu == 2" @click="updatestu(2)"
+					<image mode="aspectFit" style="width: 20px;height: 20px;" class="icon20 margle" v-show="assetsstu == 2" @click="updatestu(2)"
 						src="../../../static/img/user/user6.png"></image>
-					<image mode="widthFix" class="icon20 margle" v-if="assetsstu == 1" @click="updatestu(1)"
+					<image mode="aspectFit" style="width: 20px;height: 20px;" class="icon20 margle" v-show="assetsstu == 1" @click="updatestu(1)"
 						src="../../../static/img/user/user14.png"></image>
 				</view>
 				<view class="width30 alijusend font14 fcor999" @click="jumppage(4)">进入卡包<image class="icon15"
-						mode="widthFix" src="../../../static/img/jt.png">
+						mode="aspectFit" style="width: 15px;height: 15px;" src="../../../static/img/jt.png">
 					</image>
 				</view>
 			</view>
diff --git a/physical-merchants/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
index 06ba2db..cb31ec0 100644
--- a/physical-merchants/classify/goodsDetail/goodsDetail.vue
+++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue
@@ -412,7 +412,7 @@
 				} else if (item.type == 3) {
 					/* 分享给好友 */
 					// #ifdef H5 
-					console.log("点击了分享好友")
+					// console.log("点击了分享好友")
 					this.rightTopSrc="../../static/img/rightTop.png"
 					
 					setTimeout(()=>{
@@ -463,7 +463,7 @@
 				}
 
 				if (e.index == 1) {
-					console.log("点击分享")
+					// console.log("点击分享")
 					this.$refs.share.toggleMask();
 
 					return
diff --git a/static/img/location.png b/static/img/location.png
new file mode 100644
index 0000000..619b60a
Binary files /dev/null and b/static/img/location.png differ
diff --git a/static/img/user/user1.png b/static/img/user/user1.png
index b751f33..3faa4bc 100644
Binary files a/static/img/user/user1.png and b/static/img/user/user1.png differ
diff --git a/static/img/user/user14.png b/static/img/user/user14.png
index f8c3bdb..7c55688 100644
Binary files a/static/img/user/user14.png and b/static/img/user/user14.png differ
diff --git a/static/img/user/user2.png b/static/img/user/user2.png
index 98008c8..384e6aa 100644
Binary files a/static/img/user/user2.png and b/static/img/user/user2.png differ
diff --git a/static/img/user/user3.png b/static/img/user/user3.png
index d9f1c95..f206305 100644
Binary files a/static/img/user/user3.png and b/static/img/user/user3.png differ
diff --git a/static/img/user/user4.png b/static/img/user/user4.png
index d9cf6b8..9f5b31d 100644
Binary files a/static/img/user/user4.png and b/static/img/user/user4.png differ
diff --git a/static/img/user/user6.png b/static/img/user/user6.png
index 6450164..d24211f 100644
Binary files a/static/img/user/user6.png and b/static/img/user/user6.png differ