From 68d73b824bc87ef2fd0328a7078178993411fd7c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 11:14:19 +0800
Subject: [PATCH] 个人新闻发布

---
 public/loginMap/js/vueMain.js     |   12 ++++++++++++
 src/views/activitys/activitys.vue |    1 +
 public/loginMap/css/body.css      |    6 +++---
 public/loginMap/loginMap.html     |   13 ++++++++++---
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/public/loginMap/css/body.css b/public/loginMap/css/body.css
index ccc1ccd..e800cfd 100644
--- a/public/loginMap/css/body.css
+++ b/public/loginMap/css/body.css
@@ -23,6 +23,7 @@
 }
 
 #mapVue {
+    position: relative;
     overflow: hidden;
     /* border: solid 1px springgreen; */
 }
@@ -46,12 +47,12 @@
 #seedata {
     bottom: 0;
     width: 100%;
-    height: 50%;
+    height: 40px;
     z-index: 400;
     background-color: #fff;
     display: flex;
     flex-direction: column;
-    border-radius: 60px 60px 0 0;
+    overflow: hidden;
 }
 
 .title {
@@ -88,7 +89,6 @@
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    border-top: 1px solid rgb(138, 138, 138);
 }
 
 .div-alarm-people {
diff --git a/public/loginMap/js/vueMain.js b/public/loginMap/js/vueMain.js
index 68d0db6..61f8ae8 100644
--- a/public/loginMap/js/vueMain.js
+++ b/public/loginMap/js/vueMain.js
@@ -21,8 +21,13 @@
         nowPosition: '',
         resultFeedbackPopupShow: false,
         popupDisplay: "none",
+
+        regionName: ''
     },
     methods: {
+        getLocalPoliceStation () {
+            window.parent.getRegionName(this.regionName)
+        },
         getDataList () {
             var that = this
             that.beginCome()
@@ -39,6 +44,8 @@
             }]
             //url解码
             this.getdata = this.getQueryVariable('data') || data
+
+            console.log(this.getdata, 456)
             this.map = this.beginMap(this.map, this.getdata) //创建并接受map
             this.map.invalidateSize(true) //应用地图高度
         },
@@ -110,6 +117,11 @@
             }
 
             function showPosition (position) {
+
+                that.regionName = position.district || position.city
+
+                console.log(position)
+
                 var adCode = position.adCode //邮政编码
                 var nation = position.nation //中国
                 var city = position.city //城市
diff --git a/public/loginMap/loginMap.html b/public/loginMap/loginMap.html
index a0f9a2e..d2b682c 100644
--- a/public/loginMap/loginMap.html
+++ b/public/loginMap/loginMap.html
@@ -23,7 +23,8 @@
     <!-- <script src="../map/lib/layui/layui.js" charset="utf-8"></script> -->
 
     <!-- 百度地图api -->
-    <script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>
+    <script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js">
+    </script>
 
     <!-- axios支持 -->
     <script src="../map/lib/axios.js"></script>
@@ -56,13 +57,19 @@
 
 <body>
     <div id="mapVue">
+
         <div class="dingwei" @click="locationMap">
             <img style="width: 80%;height: 80%;" src="./img/dingwei.png" alt="">
         </div>
+
         <div id="map">
-          
+
         </div>
-       
+
+        <button
+            style="position: absolute; bottom: 4px; top: auto; left: 0; right: 0; margin: auto; z-index: 111; width: 106px; height: 30px; background: #409eff; border: 1px solid #fff; color: #fff; border-radius: 4px;"
+            @click="getLocalPoliceStation">获取当前辖区</button>
+
     </div>
     <!-- vue渲染 -->
     <script src="./js/vueMain.js"></script>
diff --git a/src/views/activitys/activitys.vue b/src/views/activitys/activitys.vue
index 2f2fb6c..ec6f95a 100644
--- a/src/views/activitys/activitys.vue
+++ b/src/views/activitys/activitys.vue
@@ -341,6 +341,7 @@
   },
   methods: {
     rowSave(row, done, loading) {
+      row.type = 0;
       add(row).then(
         () => {
           this.onLoad(this.page);

--
Gitblit v1.9.3