Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into test

yunxing 4 years ago
parent
commit
7305b5fa37
2 changed files with 9 additions and 7 deletions
  1. 1 1
      src/api/login.js
  2. 8 6
      src/views/legendLibrary/index.vue

+ 1 - 1
src/api/login.js

@@ -9,5 +9,5 @@ export function queryFloor(params) {
     return httputils.getJson(`/data/data/plaza/floor`, params)
 }
 export function queryfmapID(params) {
-    return httputils.getJson(`/version`, params)
+    return httputils.getJson(`http://mapapp.wanda.cn/sgmap/mapversion`, params)
 }

+ 8 - 6
src/views/legendLibrary/index.vue

@@ -445,12 +445,14 @@ export default {
                 this.key++
                 // this.tableData = res.Content
                 this.total = res.Total
-                this.tableData = res.Content.map(i => {
-                    if (i.FillColor.length == '9') {
-                        i.FillColor = hexToRgba(i.FillColor)
-                    }
-                    return i
-                })
+                this.tableData =
+                    res.Content &&
+                    res.Content.map(i => {
+                        if (i.FillColor.length == '9') {
+                            i.FillColor = hexToRgba(i.FillColor)
+                        }
+                        return i
+                    })
                 console.log(this.tableData)
             })
         },