Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -13,4 +13,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/h5
-  newTag: c7ef4f20b84d51fd896f7c40c58fbfab3d954f2a
+  newTag: 33034fbb69f1f88afc5eee9265e076952a99c680

src/pages/index/index.vue

@@ -264,9 +264,6 @@ import weChatSDK from 'z-weixin-ts'
 					this.markers.push(labelMarker);
 					labelMarker.on('click', (e) => {
 					  this.currentItem = {...element,...this.networkList[index]};
-					  uni.setNavigationBarTitle({
-              title: this.networkTypeList[this.currentTypeIndex]?.name
-            })
 					  // console.log('执行到此处 --->', {...element,...this.networkList[index]})
 						this.openInfo({...element,...this.networkList[index]});
             this.isclick = true
@@ -301,8 +298,9 @@ import weChatSDK from 'z-weixin-ts'
                             </div>
                             <div class="location">
                                 <span class="location-info">
-                                <span style="color: #fe7512">${this.networkTypeList[this.currentTypeIndex].name}</span>
-                                 | 距你${obj.distance}km </span>
+                                  <span style="color: #fe7512">${this.networkTypeList[this.currentTypeIndex].name}</span>
+                                  | 距你${obj.distance}km
+                                </span>
                             </div>
                         </div>
                         <div class="info-right">
@@ -319,12 +317,10 @@ import weChatSDK from 'z-weixin-ts'
 				infoWindow.open(this.map, obj.position);
 				const navigate = document.querySelector('.navigate');
 				navigate.onclick = () => {
-          weChatSDK.openLocation({
-                    latitude: obj.lat,
-                    longitude: obj.lon,
-                    name: obj.companyName,
-                    address: obj.address
-            })
+          // console.log('执行到此处 --->',obj)
+          weChatSDK.miniProgram.navigateTo({
+            url: `/page-home/address/index?lat=${obj.lat}&lon=${obj.lon}&name=${obj.companyName}&address=${obj.address}`
+          })
 				}
 			},
 			removeAllOverlay() {