Skip to content

P
pica-annual-summary
提交 de211d50 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

样式和埋点修改

上级 a9f236e1
隐藏空白字符变更
内嵌 并排
正在显示 包含 97 行增加 和 54 行删除
src/components/cme/cme-step.vue
浏览文件 @ de211d50
......@@ -290,12 +290,12 @@ export default {
content: "";
width: px2rem(0px);
height: px2rem(0px);
border-top: px2rem(5px) solid #449284;
border-left: px2rem(5px) solid transparent;
border-right: px2rem(5px) solid transparent;
border-top: px2rem(7px) solid #449284;
border-left: px2rem(7px) solid transparent;
border-right: px2rem(7px) solid transparent;
position: absolute;
top: px2rem(20px);
left: px2rem(22px);
top: px2rem(18px);
left: px2rem(21px);
}
.step2-text {
left: px2rem(106px);
......@@ -305,12 +305,12 @@ export default {
content: "";
width: px2rem(0px);
height: px2rem(0px);
border-top: px2rem(5px) solid #449284;
border-left: px2rem(5px) solid transparent;
border-right: px2rem(5px) solid transparent;
border-top: px2rem(7px) solid #449284;
border-left: px2rem(7px) solid transparent;
border-right: px2rem(7px) solid transparent;
position: absolute;
top: px2rem(20px);
left: px2rem(30px);
top: px2rem(18px);
left: px2rem(29px);
}
.step3-text {
left: px2rem(207px);
......@@ -319,12 +319,12 @@ export default {
content: "";
width: px2rem(0px);
height: px2rem(0px);
border-top: px2rem(5px) solid #449284;
border-left: px2rem(5px) solid transparent;
border-right: px2rem(5px) solid transparent;
border-top: px2rem(7px) solid #449284;
border-left: px2rem(7px) solid transparent;
border-right: px2rem(7px) solid transparent;
position: absolute;
top: px2rem(20px);
left: px2rem(22px);
top: px2rem(18px);
left: px2rem(21px);
}
.step4-text {
right: px2rem(20px);
......@@ -333,11 +333,11 @@ export default {
content: "";
width: px2rem(0px);
height: px2rem(0px);
border-top: px2rem(5px) solid #449284;
border-left: px2rem(5px) solid transparent;
border-right: px2rem(5px) solid transparent;
border-top: px2rem(7px) solid #449284;
border-left: px2rem(7px) solid transparent;
border-right: px2rem(7px) solid transparent;
position: absolute;
top: px2rem(20px);
top: px2rem(18px);
right: px2rem(20px);
}
.apply-score-content {
......
src/components/cme/item-intro.vue
浏览文件 @ de211d50
......@@ -3,7 +3,7 @@
<div class="basic-title">项目介绍</div>
<div class="content">
<div class="text">{{textContent}}</div>
<div v-if="textContent.length > 76" class="desc" @click="allText">
<div v-if="textContent.length > 70" class="desc" @click="allText">
<span>{{btnText}}</span>
<img v-if="!allTextFlag" src="../../images/down.png"/>
<img v-if="allTextFlag" src="../../images/up.png"/>
......
src/components/cme/item-leader.vue
浏览文件 @ de211d50
......@@ -4,14 +4,16 @@
<div class="leader-info">
<img :src="projectLeader.appImageUrl" />
<div class="leader-text">
<span>{{projectLeader.name}}</span>
<span>{{projectLeader.title}}</span>
<div class="leader-con">
<span>{{projectLeader.name}}</span>
<span class="leader-title">{{projectLeader.title}}</span>
</div>
<div class="address">{{projectLeader.hospital}}</div>
</div>
</div>
<div class="content">
<div class="text">{{leaderText}}</div>
<div v-if="leaderText.length > 76" class="desc" @click="allText">
<div v-if="leaderText.length > 70" class="desc" @click="allText">
<span>{{btnText}}</span>
<img v-if="!allTextFlag" src="../../images/down.png" />
<img v-if="allTextFlag" src="../../images/up.png" />
......@@ -75,20 +77,38 @@ export default {
}
.leader-text {
margin-left: px2rem(16px);
line-height: px2rem(14px);
span {
font-size: px2rem(16px);
color: #676869;
}
span:first-child {
font-size: px2rem(16px);
color: #373839;
font-weight: 700;
margin-top: px2rem(6px);
.leader-con {
line-height: px2rem(14px);
overflow: hidden;
span {
font-size: px2rem(16px);
color: #676869;
}
span:first-child {
float: left;
font-size: px2rem(16px);
color: #373839;
font-weight: 700;
}
.leader-title {
float: left;
width: px2rem(220px);
overflow : hidden;
text-overflow: ellipsis;
white-space:nowrap;
line-height: px2rem(16px);
margin-left: px2rem(10px);
}
}
.address {
margin-top: px2rem(5px);
font-size: px2rem(13px);
color: #979899;
width: px2rem(240px);
overflow : hidden;
text-overflow: ellipsis;
white-space:nowrap;
}
}
}
......
src/components/cme/teacter-intro.vue
浏览文件 @ de211d50
......@@ -4,8 +4,10 @@
<div class="leader-info" v-for="(item,index) in doctorList" :key="index">
<img :src="item.appImageUrl"/>
<div class="leader-text">
<span>{{item.name}}</span>
<span>{{item.title}}</span>
<div class="leader-con">
<span>{{item.name}}</span>
<span class="leader-title">{{item.title}}</span>
</div>
<div class="address">{{item.hospital}}</div>
</div>
</div>
......@@ -58,20 +60,38 @@ export default {
}
.leader-text {
margin-left: px2rem(16px);
line-height: px2rem(16px);
span {
font-size: px2rem(16px);
color: #676869;
}
span:first-child {
font-size: px2rem(16px);
color: #373839;
font-weight: 700;
margin-top: px2rem(6px);
.leader-con {
line-height: px2rem(14px);
overflow: hidden;
span {
font-size: px2rem(16px);
color: #676869;
}
span:first-child {
float: left;
font-size: px2rem(16px);
color: #373839;
font-weight: 700;
}
.leader-title {
float: left;
width: px2rem(220px);
overflow : hidden;
text-overflow: ellipsis;
white-space:nowrap;
line-height: px2rem(16px);
margin-left: px2rem(10px);
}
}
.address {
margin-top: px2rem(5px);
font-size: px2rem(13px);
color: #979899;
width: px2rem(240px);
overflow : hidden;
text-overflow: ellipsis;
white-space:nowrap;
}
}
}
......
src/utils/env-config.js
浏览文件 @ de211d50
......@@ -9,7 +9,7 @@ export const envConfig = {
// baseUrl: 'http://192.168.140.14:10201/',
apiUrl: 'https://dev-api.yunqueyi.com/',
webPageUrl: 'https://dev-phome.yunqueyi.com/',
baseUrl: 'https://dev-sc.yunqueyi.com/',
baseUrl: 'https://test1-sc.yunqueyi.com/',
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
......
src/views/credit-detail.vue
浏览文件 @ de211d50
......@@ -222,10 +222,13 @@ export default {
// 判断加入机构与学习范围是否一致
// this.permission();
// alert("去学习");
this.$sendBuriedData({
component_tag: `416#212005#${this.creditId}#`
});
} else if (this.formData.status == 2) {
// alert("调用申请学分的接口");
this.$sendBuriedData({
component_tag: `211#211002#${this.projectId}#${this.formData.projectName}`
component_tag: `416#212004#${this.creditId}#`
});
this.applicationCredit();
} else if (this.formData.status == 4) {
......
src/views/merge-detail.vue
浏览文件 @ de211d50
......@@ -19,9 +19,9 @@
<!-- banner图片 -->
<div v-if="bannerType == 1" class="page-content-img-container">
<img class="banner-img" :src="attachmentUrl" />
<img v-show="project.status == 1" class="banner-img-1" src="../images/status-join.png" />
<!-- <img v-show="project.status == 1" class="banner-img-1" src="../images/status-join.png" /> -->
<img v-show="project.status == 5" class="banner-img-5" src="../images/status-keep-on.png" />
<img v-show="project.status == 10" class="banner-img-10" src="../images/status-end.png" />
<img v-show="project.status == 10" class="banner-img-10" src="../images/status-end-cme.png" />
</div>
<!-- banner视频 -->
<CommonTcPlayer v-if="bannerType == 2" style="flex" :options="videoOptions"></CommonTcPlayer>
......@@ -151,7 +151,7 @@ export default {
studyNum: 0, // 学习人数
studyProgress: "0%", // 学习进度
subject: "", // 学科
status: 0, // 项目状态 1是参加中 5是进行中 10是已结束
status: 0, // 项目状态 5是进行中 10是已结束
certificateUrl: "", // 证书url
inScope: 0, // 是否在范围内判断
projectCredit: "", // 学分
......@@ -354,7 +354,7 @@ export default {
if(this.isWeb) {
h = intro.offsetTop - title.offsetHeight;
}else {
h = intro.offsetTop - 50 - title.offsetHeight;
h = intro.offsetTop - 75 - title.offsetHeight;
}
window.scrollTo(0, h);
this.isBlack = true;
......@@ -406,13 +406,13 @@ export default {
_this.project = res.data;
if(_this.project.projectIntro) {
_this.textContent = _this.project.projectIntro.length > 76 ? _this.project.projectIntro.slice(0, 76) + "..." : this.project.projectIntro;
_this.textContent = _this.project.projectIntro.length > 70 ? _this.project.projectIntro.slice(0, 70) + "..." : this.project.projectIntro;
}
_this.project.mustKnow = _this.project.mustKnow.replace(/(\r\n)|\r|\n/g,"<br>");
_this.projectLeader = res.data.projectLeader || {};
if(_this.projectLeader.info) {
_this.leaderText = _this.projectLeader.info.length > 76 ? _this.projectLeader.info.slice(0, 76) + "..." : this.projectLeader.info;
_this.leaderText = _this.projectLeader.info.length > 70 ? _this.projectLeader.info.slice(0, 70) + "..." : this.projectLeader.info;
}
_this.doctorList = res.data.doctorList;
......@@ -434,7 +434,7 @@ export default {
let _this = this;
if(_this.projectLeader.info) {
if(!data.allTextFlag) {
_this.leaderText = _this.projectLeader.info.length > 76 ? _this.projectLeader.info.slice(0, 76) + "..." : this.projectLeader.info;
_this.leaderText = _this.projectLeader.info.length > 70 ? _this.projectLeader.info.slice(0, 70) + "..." : this.projectLeader.info;
}else {
_this.leaderText = _this.projectLeader.info;
}
......@@ -445,7 +445,7 @@ export default {
let _this = this;
if(_this.project.projectIntro) {
if(!data.allTextFlag) {
_this.textContent = _this.project.projectIntro.length > 76 ? _this.project.projectIntro.slice(0, 76) + "..." : this.project.projectIntro;
_this.textContent = _this.project.projectIntro.length > 70 ? _this.project.projectIntro.slice(0, 70) + "..." : this.project.projectIntro;
}else {
_this.textContent = _this.project.projectIntro;
}
......@@ -614,7 +614,7 @@ export default {
position: absolute;
left: 0;
top: px2rem(180px);
width: px2rem(148px);
width: px2rem(76px);
height: px2rem(30px);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或