Skip to content

P
pica-cooperation-cme
提交 fa5d1b44 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

添加申请学分提示框

上级 71f0e77a
显示空白字符变更
内嵌 并排
正在显示 包含 343 行增加 和 276 行删除
src/components/cme/cme-step.vue
浏览文件 @ fa5d1b44
...@@ -23,10 +23,21 @@ ...@@ -23,10 +23,21 @@
<span :class="{'actived': step4}">4</span> <span :class="{'actived': step4}">4</span>
<p :class="{'actived': step4}">申请成功</p> <p :class="{'actived': step4}">申请成功</p>
</div> </div>
<!-- 申请学分提示框 -->
<div class="apply-score-content" v-if="showTip">
<div class="lm">
<img src="../../images/cme/hand.png" />
</div>
<div class="title">恭喜您完成该项目学习及考试,快去申请学分</div>
<div class="line"></div>
<div class="rm" @click="closeTip">
<img src="../../images/cme/delete.png" />
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
import { getWebPageUrl } from '@/utils/index'; import { getWebPageUrl } from "@/utils/index";
export default { export default {
props: { props: {
currentProgress: { currentProgress: {
...@@ -56,61 +67,68 @@ export default { ...@@ -56,61 +67,68 @@ export default {
step2: true, step2: true,
step3: false, step3: false,
step4: false, step4: false,
progressText: "审核中" progressText: "审核中",
} showTip: false
};
}, },
watch: { watch: {
currentProgress(n,o) { // currentProgress(n,o) {
if(o == 1) { // 项目学习 // if(n == 1) { // 项目学习
this.step1 = true; // this.step1 = true;
this.step2 = false; // this.step2 = false;
this.step3 = false; // this.step3 = false;
this.step4 = false; // this.step4 = false;
}else if(o == 2) { // 申请学分 // }else if(n == 2) { // 申请学分
this.step1 = false; // this.step1 = false;
this.step2 = true; // this.step2 = true;
this.step3 = false; // this.step3 = false;
this.step4 = false; // this.step4 = false;
}else if(o == 3) { // 学分审核 // this.showTip = true;
this.step1 = false; // setInterval(() => {
this.step2 = false; // this.showTip = false;
this.step3 = true; // },5000)
this.step4 = false; // }else if(n == 3) { // 学分审核
this.progressText = "审核中"; // this.step1 = false;
}else if(o == 4) { // 审核失败 // this.step2 = false;
this.step1 = false; // this.step3 = true;
this.step2 = false; // this.step4 = false;
this.step3 = true; // this.progressText = "审核中";
this.step4 = false; // }else if(n == 4) { // 审核失败
this.progressText = "审核失败"; // this.step1 = false;
}else if(o == 5) { // 申请成功 // this.step2 = false;
this.step1 = false; // this.step3 = true;
this.step2 = false; // this.step4 = false;
this.step3 = false; // this.progressText = "审核失败";
this.step4 = true; // }else if(n == 5) { // 申请成功
} // this.step1 = false;
} // this.step2 = false;
}, // this.step3 = false;
created() { // this.step4 = true;
// }
// }
}, },
created() {},
methods: { methods: {
// 立即申请 // 立即申请
applyFor() { applyFor() {
this.$emit("applicationCredit"); this.$emit("applicationCredit");
}, },
// 关闭提示
closeTip() {
this.showTip = false;
},
// 审核 // 审核
verifyResult() { verifyResult() {
let paramList = [ let paramList = [
{ {
"key":"pageUrl", key: "pageUrl",
"value": getWebPageUrl(`cme/#/credit-detail?id=${this.creditId}`), value: getWebPageUrl(`cme/#/credit-detail?id=${this.creditId}`),
"type":4, type: 4,
"seqNo":1 seqNo: 1
} }
]; ];
rocNative.dispatchEventByModuleCode({ rocNative.dispatchEventByModuleCode({
modeCode: 'M300', modeCode: "M300",
jsonString: paramList jsonString: paramList
}); });
}, },
...@@ -119,7 +137,8 @@ export default { ...@@ -119,7 +137,8 @@ export default {
let paramList = [ let paramList = [
{ {
key: "className", key: "className",
value: "com.picahealth.yunque.activitys.honor.CheckCertificatesActivity###YQWebView", value:
"com.picahealth.yunque.activitys.honor.CheckCertificatesActivity###YQWebView",
type: 4, type: 4,
seqNo: 1 seqNo: 1
}, },
...@@ -154,14 +173,14 @@ export default { ...@@ -154,14 +173,14 @@ export default {
}); });
} }
} }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../style/mixin"; @import "../../style/mixin";
.step-content { .step-content {
position: relative; position: relative;
height: px2rem(110px); height: px2rem(110px);
background:rgba(248,249,250,1); background: rgba(248, 249, 250, 1);
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
...@@ -178,7 +197,7 @@ export default { ...@@ -178,7 +197,7 @@ export default {
line-height: px2rem(17px); line-height: px2rem(17px);
border-radius: 50%; border-radius: 50%;
background: #676869; background: #676869;
border:2px solid rgba(255,255,255,1); border: 2px solid rgba(255, 255, 255, 1);
color: #fff; color: #fff;
font-size: px2rem(12px); font-size: px2rem(12px);
font-weight: 700; font-weight: 700;
...@@ -199,7 +218,7 @@ export default { ...@@ -199,7 +218,7 @@ export default {
top: px2rem(60px); top: px2rem(60px);
width: px2rem(75px); width: px2rem(75px);
height: px2rem(3px); height: px2rem(3px);
background: #DADDE1; background: #dadde1;
} }
.step-one-line { .step-one-line {
left: px2rem(56px); left: px2rem(56px);
...@@ -210,7 +229,9 @@ export default { ...@@ -210,7 +229,9 @@ export default {
.step-three-line { .step-three-line {
right: px2rem(56px); right: px2rem(56px);
} }
.step-one-line.actived, .step-two-line.actived, .step-three-line.actived{ .step-one-line.actived,
.step-two-line.actived,
.step-three-line.actived {
background: #449284; background: #449284;
} }
.step-text { .step-text {
...@@ -240,7 +261,8 @@ export default { ...@@ -240,7 +261,8 @@ export default {
.step2-text { .step2-text {
left: px2rem(106px); left: px2rem(106px);
} }
.step2-text:after, .step3-text:after{ .step2-text:after,
.step3-text:after {
content: ""; content: "";
width: px2rem(0px); width: px2rem(0px);
height: px2rem(0px); height: px2rem(0px);
...@@ -254,7 +276,7 @@ export default { ...@@ -254,7 +276,7 @@ export default {
.step3-text { .step3-text {
left: px2rem(207px); left: px2rem(207px);
} }
.step3-text:after{ .step3-text:after {
content: ""; content: "";
width: px2rem(0px); width: px2rem(0px);
height: px2rem(0px); height: px2rem(0px);
...@@ -268,7 +290,7 @@ export default { ...@@ -268,7 +290,7 @@ export default {
.step4-text { .step4-text {
right: px2rem(20px); right: px2rem(20px);
} }
.step4-text:after{ .step4-text:after {
content: ""; content: "";
width: px2rem(0px); width: px2rem(0px);
height: px2rem(0px); height: px2rem(0px);
...@@ -279,5 +301,44 @@ export default { ...@@ -279,5 +301,44 @@ export default {
top: px2rem(20px); top: px2rem(20px);
right: px2rem(20px); right: px2rem(20px);
} }
.apply-score-content {
display: flex;
position: absolute;
left: px2rem(105px);
top: px2rem(-42px);
background: #000;
opacity: 0.6;
width: px2rem(236px);
height: px2rem(51px);
border-radius: px2rem(6px);
.title {
font-size: px2rem(12px);
color: rgba(255, 255, 255, 1);
margin: px2rem(7px) px2rem(11px) 0 px2rem(0px);
width: px2rem(133px);
}
.lm {
width: px2rem(41px);
img {
display: inline-block;
width: px2rem(20px);
padding: 0 0 px2rem(7px) px2rem(15px);
}
}
.line {
width: px2rem(1px);
height: px2rem(51px);
background: #fff;
opacity: 0.18;
}
.rm {
width: px2rem(41px);
img {
display: inline-block;
width: px2rem(15px);
padding: 0 px2rem(15px) px2rem(7px);
}
}
}
} }
</style> </style>
\ No newline at end of file
src/views/merge-detail.vue
浏览文件 @ fa5d1b44
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
</div> </div>
</div> </div>
<Loading v-show="showLoading" /> <Loading v-show="showLoading" />
<!-- 弹框 -->
<CommonDialog <CommonDialog
:isShowDialog="isShowDialog" :isShowDialog="isShowDialog"
:isSingle="isSingle" :isSingle="isSingle"
...@@ -113,6 +114,7 @@ import vueFilters from "@/utils/filter"; ...@@ -113,6 +114,7 @@ import vueFilters from "@/utils/filter";
export default { export default {
data() { data() {
return { return {
premissionFlag: false,
isSingle: false, isSingle: false,
dialogContent: "", // 弹框内容 dialogContent: "", // 弹框内容
confirmBtnText: "", // 弹框按钮 confirmBtnText: "", // 弹框按钮
...@@ -216,7 +218,6 @@ export default { ...@@ -216,7 +218,6 @@ export default {
// _this.getProjectParticularsV2(); // _this.getProjectParticularsV2();
_this.getUserInfo(); _this.getUserInfo();
}; };
_this.permission(); // 提示是否有机构和在申请范围内
}, },
mounted() { mounted() {
window.addEventListener("scroll", this.scrollFun); window.addEventListener("scroll", this.scrollFun);
...@@ -256,6 +257,26 @@ export default { ...@@ -256,6 +257,26 @@ export default {
this.tabFlag = true; this.tabFlag = true;
} }
}, },
// token是否失效校验
checkToken() {
let _this = this;
let param = {
token: _this.userInfo.userToken,
setEntry: true
};
this.GET("campaign/admin/task/checkToken", param).then(res => {
if (res.code !== "000000") {
//未登录 跳转登录页
console.log("跳登录");
rocNative.gotoLogin();
}else {
if(!_this.premissionFlag) {
_this.premissionFlag = true;
_this.permission(); // 提示是否有机构和在申请范围内
}
}
});
},
//(判断是否加入机构，是否为认证用户，是否在申请范围内) //(判断是否加入机构，是否为认证用户，是否在申请范围内)
permission() { permission() {
let _this = this; let _this = this;
...@@ -346,21 +367,6 @@ export default { ...@@ -346,21 +367,6 @@ export default {
this.isBlack = true; this.isBlack = true;
this.bgColor = "#fff"; this.bgColor = "#fff";
}, },
// token是否失效校验
checkToken() {
let _this = this;
let param = {
token: _this.userInfo.userToken,
setEntry: true
};
this.GET("campaign/admin/task/checkToken", param).then(res => {
if (res.code !== "000000") {
//未登录 跳转登录页
console.log("跳登录");
rocNative.gotoLogin();
}
});
},
// 获取项目详情 // 获取项目详情
getProjectParticularsV2() { getProjectParticularsV2() {
let _this = this; let _this = this;
...@@ -387,10 +393,10 @@ export default { ...@@ -387,10 +393,10 @@ export default {
_this.projectLeader = res.data.projectLeader; _this.projectLeader = res.data.projectLeader;
_this.doctorList = res.data.doctorList; _this.doctorList = res.data.doctorList;
if (_this.project.currentProgress == 2) { if (_this.project.currentProgress == 2) {
this.dialogContent = // this.dialogContent =
"恭喜您已经完成该项目学习及考试，快去申请学分吧"; // "恭喜您已经完成该项目学习及考试，快去申请学分吧";
this.confirmBtnText = "立即申请"; // this.confirmBtnText = "立即申请";
this.isShowDialog = true; // this.isShowDialog = true;
} }
//_this.projectStatus = res.data.projectStatus; //_this.projectStatus = res.data.projectStatus;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或