Commit eb3b68a5 authored by 杨思琦's avatar 杨思琦

Merge branch 'master' into 'devNew'

Master See merge request !38
parents 8ff386b2 b718ebf2
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
"@wisdom-components/empty": "^1.4.1", "@wisdom-components/empty": "^1.4.1",
"@wisdom-components/videoslidermodal": "^1.1.60", "@wisdom-components/videoslidermodal": "^1.1.60",
"@wisdom-map/amap": "1.9.0", "@wisdom-map/amap": "1.9.0",
"@wisdom-map/arcgismap": "1.4.0-337", "@wisdom-map/arcgismap": "1.4.0-338",
"@wisdom-map/basemap": "1.1.0-45", "@wisdom-map/basemap": "1.1.0-45",
"@wisdom-map/util": "1.2.9", "@wisdom-map/util": "1.2.9",
"@wisdom-utils/components": "0.1.364", "@wisdom-utils/components": "0.1.364",
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
position: relative; position: relative;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
background: url('@{imgSrc}/背景.png') center/100% 100% no-repeat; background: url('@{imgSrc}/背景.jpg') center/100% 100% no-repeat;
.iframeExitIcon { .iframeExitIcon {
position: absolute; position: absolute;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment