Merge branch 'zcwyTeacher' into 'master'

Zcwy teacher

See merge request !44
This commit is contained in:
joshen
2023-09-07 14:31:08 +08:00
4 changed files with 14 additions and 11 deletions

View File

@@ -243,7 +243,7 @@ export default {
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre + "/boe/new-employee/index.html",
six: urlPre + "/web/contributor/index",
seven:this.webBaseUrl + '/grateful'
seven: this.webBaseUrl + '/grateful/index'
};
window.open(obj[val]);
}

View File

@@ -268,7 +268,7 @@ export default {
three: this.webBaseUrl + "/study/index?study=1",
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
five: urlPre + "/boe/new-employee/index.html",
seven: this.webBaseUrl + '/grateful'
seven: this.webBaseUrl + '/grateful/index'
};
window.open(obj[val]);
}

View File

@@ -10,7 +10,7 @@
background: `url(${fileBaseUrl + item.image
}) no-repeat 100% / 100%`,
}"></div>
<img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" />
<img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
</swiper-slide>
</swiper>
</div>
@@ -22,7 +22,7 @@
background: `url(${fileBaseUrl + item.image
}) no-repeat 100% / 100%`,
}"></div>
<img class="banner-img" style="margin: 0 auto;width:100%;" :src="fileBaseUrl + item.image" alt="" />
<img class="banner-img" style="margin: 0 auto;" :src="fileBaseUrl + item.image" alt="" />
</swiper-slide>
<div class="swiper-pagination" slot="pagination"></div>
</swiper>

View File

@@ -23,13 +23,13 @@
<div class="title">{{ name }}</div>
<!--内容列表内容-->
<div class="timeAndAuthor">
<div class="author">发布人{{ createName }}</div>
<!-- <div class="author">发布人{{ createName }}</div> -->
<div class="case-info-date portal-time">
<i class="el-icon-time" style="margin-right: 5px;"></i>
<time-show :time="createTime"></time-show>
</div>
</div>
<div class="topTitle">通知内容</div>
<div class="topTitle"></div>
<!-- <div class="noticeContent" style="white-space: pre;">{{ content }}</div> -->
<div class="noticeContent" v-html="content"></div>
</div>
@@ -120,6 +120,7 @@ export default {
.title {
font-weight: 600;
padding: 20px;
font-size: 28px;
display: flex;
justify-content: space-between;
}
@@ -137,15 +138,17 @@ export default {
}
.topTitle {
display: flex;
justify-content: center;
font-size: 18px;
font-weight: 600;
margin-bottom: 30px;
width: 100%;
height: 50px;
}
.noticeContent {
padding: 0 80px;
::v-deep p {
min-height: 28px !important;
line-height: 28px !important;
}
}
}
</style>