Browse Source

细节修改

master
lucky 5 years ago
parent
commit
8d3e3f59db
  1. 6
      src/components/Introduce/ContactMap.vue
  2. 26
      src/views/Activity/Activity.vue

6
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 = '<table>';
content = content + '<tr><td> 山西维基</td></tr>';
content = content + '<tr><td> 山西创时代企业孵化器有限公司</td></tr>';
content = content + '<tr><td></td></tr>';
content = content + '<tr><td> 山西省太原市小店区电商街与发展路交叉路口西侧中绿环保五层</td></tr>';
content = content + '<tr><td> 山西综改示范区太原学府园区发展路15号中绿大厦503室</td></tr>';
content += '</table>';
var infowindow = new BMap.InfoWindow(content);
marker.openInfoWindow(infowindow);

26
src/views/Activity/Activity.vue

@ -12,18 +12,25 @@
<a-checkbox :checked="sta.jz === 1" @click="cSta('jz')">讲座</a-checkbox>
<a-checkbox :checked="sta.sl === 1" @click="cSta('sl')">沙龙</a-checkbox>
</span>
<a-input-search @search="getData" class="search" enter-button="搜索" placeholder="请输入..." style="width: 381px" v-model="iptCon" />
<a-input-search
@search="getData"
class="search"
enter-button="搜索"
placeholder="请输入..."
style="width: 381px"
v-model="iptCon"
/>
</div>
<div class="policy-box">
<div :key="index" class="policy-list" v-for="(item, index) in lists">
<div @click="jumpDetails(item)" class="date-box pointer" v-if="item.releaseTime">
<!-- <p class="date-mon">{{ monthEnglish[item.releaseTime.split('-')[1] - 1] }}.</p>
<p class="date-day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</p> -->
<a-icon type="notification" class="pol-icon" />
<p class="date-day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</p>-->
<a-icon class="pol-icon" type="notification" />
</div>
<p @click="jumpDetails(item)" class="item-title pointer">{{ item.title }}</p>
<p @click="jumpDetails(item)" class="item-content pointer">{{ item.content }}</p>
<p class="source-time">
<p class="source-time d-flex flex-column">
<span class="source">
时间{{ item.releaseTime }}
<span v-if="item.closeTime">-{{ item.closeTime }}</span>
@ -31,7 +38,10 @@
<span class="source">地点{{ item.address }}</span>
</p>
<p class="original">
<a-button disabled v-if="item.releaseTime && Date.parse(item.releaseTime) < Date.parse(nowData)">报名已结束</a-button>
<a-button
disabled
v-if="item.releaseTime && Date.parse(item.releaseTime) < Date.parse(nowData)"
>报名已结束</a-button>
<enroll :act-name="item.title" :activity-id="item.activityId" v-else />
</p>
</div>
@ -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 {

Loading…
Cancel
Save