From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js b/bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js
index 0ae906f..16e62a9 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js
@@ -101,7 +101,7 @@
try {
components = {
uPopup: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 255))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 265))
},
}
} catch (e) {
@@ -366,7 +366,7 @@
res.data.forEach(function (item, index) {
_this.markers.push({
id: index,
- width: 30,
+ width: 40,
height: 40,
distance: _this.latitude && _this.longitude ? (0, _utils.distance)(_this.latitude, _this.longitude, item.latitude, item.longitude) : '鏈煡璺濈',
latitude: item.latitude,
@@ -374,8 +374,6 @@
title: item.name,
iconPath: '/static/icon/ic_bike@2x.png',
addr: item.addr,
- clusterId: 1,
- joinCluster: true,
customCallout: {
anchorY: 0,
anchorX: 0,
@@ -393,11 +391,15 @@
if (item.id === e.markerId) {
_this2.rice = item.distance;
item.customCallout.display = 'ALWAYS';
+ item.width = 50;
+ item.height = 50;
setTimeout(function () {
_this2.info = item;
_this2.show = true;
}, 300);
} else {
+ item.width = 40;
+ item.height = 40;
item.customCallout.display = 'BYCLICK';
}
});
--
Gitblit v1.9.3