From 9f216986cbd73499d2db15831dcda5c0bd1e49e0 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 27 Feb 2019 18:21:24 +0800
Subject: [PATCH] 弹窗

---
 src/utils/formatNum.js   |  9 +++++++++
 src/utils/request.js     |  7 +++++--
 src/views/mapsection.vue | 26 ++++++++++++++++----------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/utils/formatNum.js b/src/utils/formatNum.js
index 95164d9..47ee125 100644
--- a/src/utils/formatNum.js
+++ b/src/utils/formatNum.js
@@ -36,4 +36,13 @@ function formatNumArr(str) {
 
 }
 
+function formatChanging(val) {
+  console.log(val)
+  let tmpHtml = '';
+  for(let i=0;i<val.length;i++){
+    tmpHtml += "<li>"+val[i].standard+"</li>"
+  }
+  return tmpHtml
+}
+
 export default {formatNumArr}
diff --git a/src/utils/request.js b/src/utils/request.js
index 0648918..880e9c7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,8 @@ const CancelToken = axios.CancelToken;
 //请求拦截器  // 在发送请求之前做些什么
 axios.interceptors.request.use(config => {
   //发起请求时，取消掉当前正在进行的相同请求
-  config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5'
+  //config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5'
+  config.headers['x-auth-token'] = '6840160c-7c45-42c4-8736-805f13487565' //测试地址
   config.data = {
     ...config.data,
     sysCode: '1001'
@@ -73,7 +74,9 @@ axios.interceptors.response.use(response => {
 })
 //基础url前缀
 //axios.defaults.baseURL = '/api'
-axios.defaults.baseURL = 'http://bcp.service.renniting.cn/';
+
+//axios.defaults.baseURL = 'http://bcp.service.renniting.cn/';
+axios.defaults.baseURL = 'http://test.renniting.cn/bcp/';//测试地址
 //设置默认请求头
 // axios.defaults.withCredentials=true;//让ajax携带cookie
 
diff --git a/src/views/mapsection.vue b/src/views/mapsection.vue
index ae70220..3edbb36 100644
--- a/src/views/mapsection.vue
+++ b/src/views/mapsection.vue
@@ -141,7 +141,6 @@ export default {
 
     },
     baiduMap (data) {
-      console.log(data)
       if(data.length === 0){
         var map = new BMap.Map('allmap', {enableMapClick: false})
         var point = new BMap.Point(111.742579, 40.878675)
@@ -204,12 +203,22 @@ export default {
             map.addOverlay(marker);
             var myLabel;
 
-            marker.addEventListener("click", (e)=> {
+            marker.addEventListener("mouseover", (e)=> {
               map.removeOverlay(myLabel);
               var that = this;
+              let tmpHtml = '';
+              console.log(JSON.parse(data[itemthat].plRate))
+              console.log(typeof JSON.parse(data[itemthat].plRate))
+              for(let i=0;i<JSON.parse(data[itemthat].plRate).length;i++){
+                //console.log(data[itemthat].plRate)
+                tmpHtml += "<li>"+JSON.parse(data[itemthat].plRate)[i].standard+"</li>"
+              }
+
+              // label = null
+              // map.removeOverlay(myLabel);
               myLabel = new BMap.Label(
                 `<div class="dislog-wrap">
-                  <div class="dialog-header" title="${data[itemthat].plAddress}">${data[itemthat].plAddress}</div>
+                  <div class="dialog-header" title="${data[itemthat].plAddress}">${data[itemthat].plName}</div>
                   <div class="dialog-address" title="${data[itemthat].plAddress}">${data[itemthat].plAddress}</div>
                   <ul class="dislog-body">
                     <li><div>${data[itemthat].freeBrethNum}</div><div>空闲</div></li>
@@ -218,10 +227,7 @@ export default {
                   </ul>
                   <div class="dislog-footer">收费标准</div>
                   <ul class="dislog-footer-main">
-                    <li>收费标准收费标准收费标准收费标准</li>
-                    <li>收费标准收费标准收费标准收费标准</li>
-                    <li>收费标准收费标准收费标准收费标准</li>
-                    <li>收费标准收费标准收费标准收费标准</li>
+                    ${tmpHtml}
                   </ul>
                 </div>`,
                 {
@@ -242,9 +248,9 @@ export default {
               marker.setTop(true,27000000);
 
             });
-            // marker.addEventListener("mouseout", function (e) {
-            //   map.removeOverlay(myLabel);
-            // });
+            marker.addEventListener("mouseout", function (e) {
+              map.removeOverlay(myLabel);
+            });
             i++;
           })(i);
         }
--
libgit2 0.21.4