Merge remote-tracking branch 'origin/main'

fuintAdmin/src/components/map/mapComponent.vue

@@ -103,6 +103,8 @@ export default {
         });
         // 搜索提示插件
         this.AutoComplete = new AMap.AutoComplete({ city: "全国" });
+        // 标记点
+        this.setMapMarker();
         //点击获取经纬度;
         this.map.on("click", (e) => {
           // 获取经纬度

fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue

@@ -51,7 +51,7 @@
             <img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>
-          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
+          <span style="margin-right: 10px;" v-if="item.meta.title=='便利店管理'">
             <img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 21px;height: 21px;"/>
             <img src="@/assets/menu_icon/car_b.png" v-else style="width: 21px;height: 21px;"/>
           </span>