diff --git a/src/components/Introduce/ContactMap.vue b/src/components/Introduce/ContactMap.vue index c073af3..4ee01d9 100644 --- a/src/components/Introduce/ContactMap.vue +++ b/src/components/Introduce/ContactMap.vue @@ -30,12 +30,12 @@ export default { var point = new BMap.Point(112.561731, 37.789483); map.centerAndZoom(point, 18); var marker = new BMap.Marker(point); // 创建标注 - // marker.setTitle('山西维基'); + // marker.setTitle('山西创时代企业孵化器有限公司'); map.addOverlay(marker); // 将标注添加到地图中 var content = ''; - content = content + ''; + content = content + ''; content = content + ''; - content = content + ''; + content = content + ''; content += '
山西维基
山西创时代企业孵化器有限公司
山西省太原市小店区电商街与发展路交叉路口西侧中绿环保五层
山西综改示范区太原学府园区发展路15号中绿大厦503室
'; var infowindow = new BMap.InfoWindow(content); marker.openInfoWindow(infowindow); diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue index 559424d..bac7eb1 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -12,18 +12,25 @@ 讲座 沙龙 - +
- +

{{ item.releaseTime.split(' ')[0].split('-')[2] }}

--> +

{{ item.title }}

{{ item.content }}

-

+

时间:{{ item.releaseTime }} -{{ item.closeTime }} @@ -31,7 +38,10 @@ 地点:{{ item.address }}

- 报名已结束 + 报名已结束

@@ -231,7 +241,7 @@ export default { text-indent: 2em; font-size: 16px; line-height: 36px; - color: rgba(0, 0, 0, 0.35); + color: rgba(0, 0, 0, 0.65); font-family: Microsoft YaHei; overflow: hidden; display: -webkit-box; @@ -302,8 +312,10 @@ export default { .source-time { margin-left: 200px; position: absolute; - bottom: 26px; + bottom: 10px; margin-bottom: 0; + line-height: 30px; + color: rgba(0, 0, 0, 0.45); } .pagination {