diff --git a/admin-web-master/public/index.html b/admin-web-master/public/index.html
index 9d32d9f..8a685b4 100644
--- a/admin-web-master/public/index.html
+++ b/admin-web-master/public/index.html
@@ -8,6 +8,9 @@
     <title><%= htmlWebpackPlugin.options.title %></title>
     <!-- 删除: <script src="https://map.qq.com/api/js?v=2.exp&key=YOUR_API_KEY&callback=initMap"></script> -->
     <script src="https://map.qq.com/api/js?v=2.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
+    <script src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
+    <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script>
+    <!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script> -->
   </head>
   <body>
     <noscript>
diff --git a/admin-web-master/src/assets/images/icon1.png b/admin-web-master/src/assets/images/icon1.png
new file mode 100644
index 0000000..86101c8
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon1.png
diff --git a/admin-web-master/src/assets/images/icon2.png b/admin-web-master/src/assets/images/icon2.png
new file mode 100644
index 0000000..0df6f4b
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon2.png
diff --git a/admin-web-master/src/assets/images/icon3.png b/admin-web-master/src/assets/images/icon3.png
new file mode 100644
index 0000000..46dc48f
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon3.png
diff --git a/admin-web-master/src/assets/images/icon4.png b/admin-web-master/src/assets/images/icon4.png
new file mode 100644
index 0000000..db25234
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon4.png
diff --git a/admin-web-master/src/assets/images/icon5.png b/admin-web-master/src/assets/images/icon5.png
new file mode 100644
index 0000000..fac07c8
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon5.png
diff --git a/admin-web-master/src/assets/images/icon6.png b/admin-web-master/src/assets/images/icon6.png
new file mode 100644
index 0000000..9d2b45e
--- /dev/null
+++ b/admin-web-master/src/assets/images/icon6.png
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index e33b2f5..9c6a709 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -61,10 +61,10 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="详细位置" prop="detailedLocation">
+      <!-- <el-form-item label="详细位置" prop="detailedLocation">
         <el-input v-model="ruleForm.detailedLocation" placeholder="请输入"  maxlength="100">
         </el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="地图标点" prop="mapMarker">
         <div style="width: 100%;height: 300px;">
           <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
@@ -120,7 +120,7 @@
     changadd,
     changedit
   } from '../../api/information'
-  import newmap from "@/components/newmap/index";
+  import newmap from "@/components/newmap/indexall";
   export default {
     components: {
       upimg,
@@ -238,9 +238,10 @@
       
       updatecenter(e) {
         console.error('-----------', e)
-        this.ruleForm.detailedLocation = e.address
-        this.lat = e.lat
-        this.lng = e.lng
+        this.lat = e[0].lat
+        this.lng = e[0].lng
+        this.ruleForm.detailedLocation = JSON.stringify(e)
+       
       },
       changimg(e, type) {
         this.ruleForm[type] = e
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index e7d3ce4..7aac1e9 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -53,12 +53,12 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="详细位置" prop="detailedLocation">
+                <!-- <el-form-item label="详细位置" prop="detailedLocation">
                     <div  class="duiqi">{{editbgid.detailedLocation  || '无'}}</div>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="地图标点" prop="mapMarker">
                   <div style="width: 100%;height: 300px;">
-                    <newmap :isx="false" :message="editbgid.mapMarker"></newmap>
+                    <newmap :isx="false" :message="editbgid.detailedLocation"></newmap>
                   </div>
                 </el-form-item>
                 <el-form-item label="场地描述" prop="description">
@@ -249,7 +249,7 @@
     cereBusinessOperationqueryByPage,
     cereContractInformation
   } from '@/api/newly';
-  import newmap from "@/components/newmap/index";
+  import newmap from "@/components/newmap/indexall";
   import {
     changedit
   } from '@/api/information'
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
new file mode 100644
index 0000000..762cacd
--- /dev/null
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -0,0 +1,274 @@
+<template>
+  <div>
+    <div id="container"></div>
+    <!-- <div id="toolControl">
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'marker' }"
+        id="marker"
+        title="点标记"
+        @click="setActiveType('marker')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'polyline' }"
+        id="polyline"
+        title="折线"
+        @click="setActiveType('polyline')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'polygon' }"
+        id="polygon"
+        title="多边形"
+        @click="setActiveType('polygon')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'circle' }"
+        id="circle"
+        title="圆形"
+        @click="setActiveType('circle')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'rectangle' }"
+        id="rectangle"
+        title="矩形"
+        @click="setActiveType('rectangle')"
+      ></div>
+      <div
+        class="toolItem"
+        :class="{ active: activeType === 'ellipse' }"
+        id="ellipse"
+        title="椭圆"
+        @click="setActiveType('ellipse')"
+      ></div>
+    </div> -->
+    <!-- <div style="height: 100px;">
+      绘制：鼠标左键点击及移动即可绘制图形
+      <br />
+      结束绘制：鼠标左键双击即可结束绘制折线、多边形会自动闭合；圆形、矩形、椭圆单击即可结束
+      <br />
+      中断：绘制过程中按下esc键可中断该过程
+    </div> -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'IndexAll',
+  data() {
+    return {
+      map: null, // 地图
+      editor: null, // 编辑器
+      activeType: 'marker', // 激活的图形编辑类型
+      marker: null,
+      polyline: null,
+      polygon: null,
+      circle: null,
+      rectangle: null,
+      ellipse: null,
+    };
+  },
+  props: {
+    lat: {
+      type: Number,
+      default: 30.67
+    },
+    lng: {
+      type: Number,
+      default: 104.06
+    },
+    message:{
+      type: String,
+      default: ''
+    },
+  },
+  mounted() {
+    this.initMap();
+    this.setActiveType('polygon')
+  },
+  methods: {
+    setActiveType(type) {
+      this.activeType = type;
+      this.editor.setActiveOverlay(type);
+    },
+    initMap() {
+      // 初始化地图
+      this.map = new TMap.Map('container', {
+        zoom: 12, // 设置地图缩放级别
+        center: new TMap.LatLng(this.lat, this.lng), // 设置地图中心点坐标
+      });
+      var path = [];
+      if(this.message != '') {
+        let listall  = JSON.parse(this.message)
+        for (let index = 0; index < listall.length; index++) {
+          const element = listall[index];
+          const c1 = new TMap.LatLng(element.lat,element.lng)
+          path.push(c1)
+        }
+      }
+      
+      // 初始化几何图形及编辑器
+      this.marker = new TMap.MultiMarker({
+        map: this.map,
+      });
+      this.polyline = new TMap.MultiPolyline({
+        map: this.map,
+      });
+      this.polygon = new TMap.MultiPolygon({
+        map: this.map,
+        geometries: [
+            {
+                'id': 'p1', //该多边形在图层中的唯一标识（删除、更新数据时需要）
+                'styleId': 'polygon', //绑定样式名
+                'paths': path, //多边形轮廓
+            }
+        ]
+      });
+      this.circle = new TMap.MultiCircle({
+        map: this.map,
+      });
+      this.rectangle = new TMap.MultiRectangle({
+        map: this.map,
+      });
+      this.ellipse = new TMap.MultiEllipse({
+        map: this.map,
+      });
+
+      this.editor = new TMap.tools.GeometryEditor({
+        map: this.map, // 编辑器绑定的地图对象
+        overlayList: [
+          {
+            overlay: this.marker,
+            id: 'marker',
+          },
+          {
+            overlay: this.polyline,
+            id: 'polyline',
+          },
+          {
+            overlay: this.polygon,
+            id: 'polygon',
+          },
+          {
+            overlay: this.circle,
+            id: 'circle',
+          },
+          {
+            overlay: this.rectangle,
+            id: 'rectangle',
+          },
+          {
+            overlay: this.ellipse,
+            id: 'ellipse',
+          },
+        ],
+        actionMode: TMap.tools.constants.EDITOR_ACTION.DRAW, // 编辑器的工作模式
+        activeOverlayId: 'marker', // 激活图层
+        snappable: true, // 开启吸附
+      });
+
+      // 监听绘制结束事件，获取绘制几何图形
+      this.editor.on('draw_complete', (geometry) => {
+        const id = geometry.id;
+        if (this.editor.getActiveOverlay().id === 'rectangle') {
+          const geo = this.rectangle.geometries.filter((item) => item.id === id);
+          console.log('绘制的矩形定位的坐标：', geo[0].paths);
+        }
+
+        if (this.editor.getActiveOverlay().id === 'polygon') {
+          // console.error(this.polygon.geometries)
+          const geo = this.polygon.geometries.filter((item) => item.id === id);
+          console.log('绘制的多边形坐标：', geo[0].paths);
+          // var path = [
+          // ];
+          // for (let index = 0; index < geo[0].paths.length; index++) {
+          //   const element = geo[0].paths[index];
+          //   const c1 = new TMap.LatLng(element.lat,element.lng)
+          //   path.push(c1)
+          // }
+          // // 计算多边形形心
+          // var position = TMap.geometry.computeCentroid(path);
+          // console.log('绘制的多边形坐标：',position);
+          this.$emit('updatecenter', geo[0].paths);
+        }
+      });
+    },
+    
+  },
+};
+</script>
+
+<style scoped>
+html,
+body {
+  height: 100%;
+  margin: 0px;
+  padding: 0px;
+}
+
+#container {
+  width: 100%;
+  height: 300px;
+}
+
+#toolControl {
+  position: absolute;
+  top: 10px;
+  left: 0px;
+  right: 0px;
+  margin: auto;
+  width: 252px;
+  z-index: 1001;
+}
+
+.toolItem {
+  width: 30px;
+  height: 30px;
+  float: left;
+  margin: 1px;
+  padding: 4px;
+  border-radius: 3px;
+  background-size: 30px 30px;
+  background-position: 4px 4px;
+  background-repeat: no-repeat;
+  box-shadow: 0 1px 2px 0 #e4e7ef;
+  background-color: #ffffff;
+  border: 1px solid #ffffff;
+}
+
+.toolItem:hover {
+  border-color: #789cff;
+}
+
+.active {
+  border-color: #d5dff2;
+  background-color: #d5dff2;
+}
+
+#marker {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_editor.png');
+}
+
+#polyline {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polyline.png');
+}
+
+#polygon {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polygon.png');
+}
+
+#circle {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/circle.png');
+}
+
+#rectangle {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/rectangle.png');
+}
+
+#ellipse {
+  background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/ellipse.png');
+}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
index f584265..1fc6272 100644
--- a/admin-web-master/src/components/newmap/map.vue
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -70,9 +70,14 @@ export default {
           item.lng = parseFloat(list[1]);
           item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
           const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
+          const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串
+        const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串
+        const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串
+        const icon =  this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
           const marker = new qq.maps.Marker({
             position: markerLatLng,
-            map: this.map
+            map: this.map,
+            icon:icon
           });
 
           // 为标记添加点击事件监听器
@@ -87,10 +92,11 @@ export default {
     showInfoWindow(marker, item) {
       // 设置信息窗口的内容
       const content = `
-        <div>
-          <p style="padding-top:5px;"><strong>资源名称:</strong> ${item.name}</p>
-          <p style="padding-top:5px;"><strong>位置:</strong> ${item.detailedLocation}</p>
-        </div>
+        <div style="padding:10px 0;border-radius: 18px;">
+          <p style="padding-top:10px;">资源名称:${item.name}</p>
+          <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
+          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
+          </div>
       `;
       // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
       //     <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
diff --git a/admin-web-master/src/components/newmap/map2.vue b/admin-web-master/src/components/newmap/map2.vue
new file mode 100644
index 0000000..76d3464
--- /dev/null
+++ b/admin-web-master/src/components/newmap/map2.vue
@@ -0,0 +1,227 @@
+<template>
+  <div style="position: relative;width: 100%;">
+    <div id="mapContainer" class="map"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TencentMap',
+  props: {
+    lat: {
+      type: Number,
+      default: 30.67
+    },
+    lng: {
+      type: Number,
+      default: 104.06
+    },
+    isonloed: {
+      type: Boolean,
+      default: false
+    },
+    isx: {
+      type: Boolean,
+      default: true
+    },
+    ontype: {
+      type: String,
+      default: '1'
+    },
+    message: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      map: null,
+      marker: null,
+      address: '',
+      markers: [],
+      infoWindow: null,
+    };
+  },
+  mounted() {
+    // 初始化地图
+    this.initMap(this.message);
+  },
+  methods: {
+    initMap(e) {
+      // this.message = e
+      e.forEach((item,index) => {
+        let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : [];
+        item.lat = parseFloat(list[0]);
+        item.lng = parseFloat(list[1]);
+        item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
+        // const markerLatLng = new TMap.LatLng(item.lat, item.lng);
+        // let marker =  {
+        //     "id": 'marker'+(index+1),
+        //     "styleId": 'marker',
+        //     "position": new TMap.LatLng(item.lat,item.lng),
+        //     "properties": {
+        //       "title": "marker" +(index+1)
+        //     }
+        // }
+        this.markers.push(item);
+      });
+      // 将经纬度转换为腾讯地图的LatLng对象
+      const centerLatLng = new TMap.LatLng(this.lat, this.lng);
+      console.error(this.lat, this.lng)
+      // 创建地图实例
+      //初始化地图
+
+      this.map = new TMap.Map("mapContainer", {
+          zoom:12,//设置地图缩放级别
+          center: centerLatLng//设置地图中心点坐标
+      });
+      // this.map = new TMap.Map(document.getElementById('mapContainer'), {
+      //   center: centerLatLng,
+      //   zoom: 13
+      // });
+
+      // 创建信息窗口实例
+      // this.infoWindow = new TMap.InfoWindow({
+      //   map: this.map,
+      // });
+      // this.marker = new TMap.MultiMarker({
+      //   map: this.map,
+      //   styles: {
+      //     // 点标记样式
+      //     marker: new TMap.MarkerStyle({
+      //       width: 20, // 样式宽
+      //       height: 30, // 样式高
+      //       anchor: { x: 10, y: 30 }, // 描点位置
+      //       src: 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerNew.png'
+      //     }),
+      //   },
+      //   geometries: [
+      //     // 点标记数据数组
+      //     {
+      //       // 标记位置(纬度，经度，高度)
+      //       position: centerLatLng,
+      //       id: 'marker',
+      //     },
+      //   ],
+      // });
+
+      // 遍历 message 数组，为每个位置创建一个标记
+    
+  
+
+      this.createMarker()
+    },
+    createMarker(e) {
+      let list = [
+        [30.67454811395484,104.00550842285156],
+        [30.67,104.06],
+      ]
+        const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串
+        const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串
+        const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串
+        const icon =  this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
+        this.marker = new TMap.MultiMarker({
+          id: 'marker-layer',
+          map: this.map,
+          styles: {
+              "marker": new TMap.MarkerStyle({
+                  "width": 51,
+                  "height": 53,
+                  "anchor": { x: 16, y: 32 },
+                  "src": icon
+              })
+          },
+          geometries: [
+            {
+              "id": 'marker1',
+              "styleId": 'marker',
+              "position": new TMap.LatLng(list[0][0],list[0][1],),
+              "properties": {
+                "title": "marker1"
+              }
+            },
+            {
+              "id": 'marker2',
+              "styleId": 'marker',
+              "position": new TMap.LatLng(list[1][0],list[1][1],),
+              "properties": {
+                "title": "marker2"
+              }
+            },
+          ]
+        });
+
+        return
+      if (!this.marker) {
+        this.marker = new TMap.MultiMarker({
+            id: 'marker-layer',
+            map: this.map,
+            styles: {
+                "marker": new TMap.MarkerStyle({
+                    "width": 25,
+                    "height": 35,
+                    "anchor": { x: 16, y: 32 },
+                    "src": 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png'
+                })
+            },
+            geometries: e
+        });
+        this.marker = new TMap.MultiMarker({
+            id: 'marker-layer',
+            map: this.map,
+            styles: {
+                "marker": new TMap.MarkerStyle({
+                    "width": 51,
+                    "height": 53,
+                    "anchor": { x: 16, y: 32 },
+                    "src": icon
+                })
+            },
+            geometries: e
+        });
+      }
+  },
+    showInfoWindow(marker, item) {
+      console.error('----------')
+      // 设置信息窗口的内容
+      const content = `
+        <div style="padding:10px 0;border-radius: 18px;">
+          <p style="padding-top:10px;">资源名称:${item.name}</p>
+          <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
+          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
+          </div>
+      `;
+      // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
+      //     <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
+      //       <el-form-item label="资源名称" prop="entityName">
+      //         <div class="duiqi">${item.name}</div>
+      //       </el-form-item>
+      //       <el-form-item label="位置" prop="entityName">
+      //         <div class="duiqi">${item.detailedLocation}</div>
+      //       </el-form-item>
+      //     </el-form>
+      //   </div>
+      // 设置信息窗口的位置和内容
+      this.infoWindow.setPosition(marker.getPosition());
+      this.infoWindow.setContent(content);
+      this.infoWindow.open();
+    }
+  }
+}
+</script>
+
+<style scoped>
+.map {
+  width: 100%;
+  height: 400px;
+  overflow: hidden;
+}
+
+.address-info {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 999999;
+  background: #ffffff;
+}
+</style>
\ No newline at end of file
