Skip to content

P
pica-professional-exam
提交 7c7cd97b 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

测试没有定义token

上级 890d5a2c
隐藏空白字符变更
内嵌 并排
正在显示 包含 259 行增加 和 242 行删除
src/components/business/coop-list-item.vue
浏览文件 @ 7c7cd97b
......@@ -9,8 +9,9 @@
@click="coopDetails(item)"
>
<div class="coop-item-left">
<img :src="item.imgUrl">
<span v-if="item.projectStatusValue"
<img :src="item.imgUrl" />
<span
v-if="item.projectStatusValue"
class="coop-container-status"
:style="{'background': cBgColor(item)}"
>{{item.projectStatusValue | statusText}}</span>
......@@ -20,10 +21,10 @@
<span class="coop-item-right-other">{{item.level}} | {{item.credit}} | {{item.scope}}</span>
<!-- <span v-if="item.pType == 1"
class="coop-item-right-other"
>起止日期 {{item.oldTime}}</span> -->
>起止日期 {{item.oldTime}}</span>-->
<!-- <span v-else
class="coop-item-right-other"
>起止日期 {{item.projectBegintimeLong | formatTime}}-{{item.projectEndtimeLong | formatTime}}</span> -->
>起止日期 {{item.projectBegintimeLong | formatTime}}-{{item.projectEndtimeLong | formatTime}}</span>-->
<span class="coop-item-right-other">{{item.startDate}}至{{item.endTime}}</span>
</div>
</div>
......@@ -40,7 +41,7 @@
<p class="update-btn v-hairline-top confirm-btn" @click="goUpdateHandler">确定</p>
<p class="update-btn v-hairline-top" @click="showGoUpdate = false">取消</p>
</div>
</van-popup> -->
</van-popup>-->
</section>
</template>
......@@ -51,7 +52,7 @@ import UpdateDialog from "@/components/business/update-dialog";
import { setEventByModuleCode, deepCopy, getWebPageUrl } from "@/utils/index";
import { getAppVersion } from "@/utils";
import { mapActions, mapGetters } from "vuex";
import { Popup } from 'vant';
import { Popup } from "vant";
export default {
name: "coop-list-item",
......@@ -59,7 +60,7 @@ export default {
return {
bgColor: "green",
statusText: "进行中",
showGoUpdate: false,
showGoUpdate: false
};
},
props: {
......@@ -92,7 +93,7 @@ export default {
components: {
NoMoreContent,
NoContent,
UpdateDialog,
UpdateDialog
},
mounted() {},
filters: {
......@@ -109,7 +110,7 @@ export default {
}
},
methods: {
...mapActions(['setProjectTabIndex']),
...mapActions(["setProjectTabIndex"]),
cBgColor(item) {
if (item.projectStatus === 1) {
return "#5890DD";
......@@ -122,23 +123,23 @@ export default {
}
},
coopDetails(item) {
if(this.userMobile) {
if (this.userMobile) {
let paramList = [
{
"key":"pageUrl",
"value": getWebPageUrl(`cme/#/coop?id=${item.id}`),
"type":4,
"seqNo":1
}
];
rocNative.dispatchEventByModuleCode({
modeCode: 'M300',
jsonString: paramList
});
}else {
{
key: "pageUrl",
value: getWebPageUrl(`cme/#/coop?id=${item.id}`),
type: 4,
seqNo: 1
}
];
rocNative.dispatchEventByModuleCode({
modeCode: "M300",
jsonString: paramList
});
} else {
rocNative.gotoLogin();
}
this.$sendBuriedData({
component_tag: `210#210002#${item.id}#${item.projectName}` //'210#210002#0#'+item.projectName
});
......@@ -186,61 +187,61 @@ export default {
// }
},
// 跳转到新项目
showModule(item, coopType, tabTo, courseRequire) {
if (window.__isWeb) {
if(item.parent === false) {
this.$router.push({
path: "/coop",
query: {
id: item.id,
coopType: coopType,
tabTo: tabTo,
courseRequire: courseRequire,
}
});
} else {
this.$router.push({
path: "/parent",
query: {
entryId: item.entryId,
}
});
}
return;
}
let pageUrl = "";
let paramList = [];
if(item.parent === false) {
pageUrl = getWebPageUrl('coopv2/#/coop');
paramList = [
{
key: "pageUrl",
value: pageUrl + `?id=${item.id}&coopType=${coopType}&tabTo=${tabTo}&courseRequire=${courseRequire}`,
type: 4,
seqNo: 1
}
]
} else {
pageUrl = getWebPageUrl('coopv2/#/parent');
paramList = [
{
key: "pageUrl",
value: pageUrl + `?entryId=${item.entryId}`,
type: 4,
seqNo: 1
}
]
}
rocNative.dispatchEventByModuleCode({
modeCode: "M300",
jsonString: paramList
});
},
// showModule(item, coopType, tabTo, courseRequire) {
// if (window.__isWeb) {
// if(item.parent === false) {
// this.$router.push({
// path: "/coop",
// query: {
// id: item.id,
// coopType: coopType,
// tabTo: tabTo,
// courseRequire: courseRequire,
// }
// });
// } else {
// this.$router.push({
// path: "/parent",
// query: {
// entryId: item.entryId,
// }
// });
// }
// return;
// }
// let pageUrl = "";
// let paramList = [];
// if(item.parent === false) {
// pageUrl = getWebPageUrl('coopv2/#/coop');
// paramList = [
// {
// key: "pageUrl",
// value: pageUrl + `?id=${item.id}&coopType=${coopType}&tabTo=${tabTo}&courseRequire=${courseRequire}`,
// type: 4,
// seqNo: 1
// }
// ]
// } else {
// pageUrl = getWebPageUrl('coopv2/#/parent');
// paramList = [
// {
// key: "pageUrl",
// value: pageUrl + `?entryId=${item.entryId}`,
// type: 4,
// seqNo: 1
// }
// ]
// }
// rocNative.dispatchEventByModuleCode({
// modeCode: "M300",
// jsonString: paramList
// });
// },
goToPage(item) {
let _this = this;
// 如果是湖北考试项目，则做相应权限判断 湖北的projectId=3
if( item.id == '3') {
if(!_this.userInfo.userToken) {
if (item.id == "3") {
if (!_this.userInfo.userToken) {
rocNative.gotoLogin();
return;
}
......@@ -249,27 +250,27 @@ export default {
token: _this.userInfo.userToken || _this.token,
setEntry: true
};
this.GET("portal/portalApp/role/3", param).then(
res => {
if (res.code == "000000") {
// {
// "data": 0, // 0就是无权限，1有权限
// "code": "000000",
// "message": "成功"
// }
if(res.data == 0) {
rocNative.showNativeToast({ message: "您不属于该项目，无法查看" });
return;
}
} else {
rocNative.gotoLogin();
this.GET("portal/portalApp/role/3", param).then(res => {
if (res.code == "000000") {
// {
// "data": 0, // 0就是无权限，1有权限
// "code": "000000",
// "message": "成功"
// }
if (res.data == 0) {
rocNative.showNativeToast({
message: "您不属于该项目，无法查看"
});
return;
}
_this.goToPage1(item.contentListModel)
} else {
rocNative.gotoLogin();
return;
}
);
_this.goToPage1(item.contentListModel);
});
} else {
_this.goToPage1(item.contentListModel)
_this.goToPage1(item.contentListModel);
}
},
// 跳转
......@@ -281,7 +282,9 @@ export default {
paramList[0]["value"].indexOf("stroke.js") !== -1;
let strokeUrl = "";
if (isStrokeUrl) {
strokeUrl = paramList[0]["value"] + "&token=" + this.userInfo.userToken || _this.token;
strokeUrl =
paramList[0]["value"] + "&token=" + this.userInfo.userToken ||
_this.token;
paramList[0]["value"] = strokeUrl;
}
rocNative.dispatchEventByModuleCode({
......@@ -297,7 +300,7 @@ export default {
// createdTime: new Date().getTime()
// });
},
goUpdateHandler () {
goUpdateHandler() {
//去更新
rocNative.upGradeVersion();
this.showGoUpdate = false;
......@@ -368,33 +371,33 @@ export default {
}
}
}
.update-dialog-content{
padding: 0 px2rem(15px);
box-sizing: border-box;
.title{
text-align: center;
color: #373839;
font-size: px2rem(18px);
padding: px2rem(15px) 0;
line-height: px2rem(25px);
.update-dialog-content {
padding: 0 px2rem(15px);
box-sizing: border-box;
.title {
text-align: center;
color: #373839;
font-size: px2rem(18px);
padding: px2rem(15px) 0;
line-height: px2rem(25px);
}
.update-btn {
text-align: center;
height: px2rem(55px);
line-height: px2rem(55px);
font-size: px2rem(16px);
color: #979899;
&.confirm-btn {
color: #449284;
}
.update-btn{
text-align: center;
height: px2rem(55px);
line-height: px2rem(55px);
font-size: px2rem(16px);
color: #979899;
&.confirm-btn{
color: #449284;
}
&.v-hairline-top::after{
border-top-width: 1px;
}
&.v-hairline-top::after {
border-top-width: 1px;
}
}
}
</style>
<style>
.van-overlay{
background-color: rgba(0,0,0,0.5);
}
.van-overlay {
background-color: rgba(0, 0, 0, 0.5);
}
</style>
src/components/cme/item-leader.vue
浏览文件 @ 7c7cd97b
<template>
<div class="item-leader-container">
<div class="basic-title">项目负责人</div>
<div class="leader-info">
<img :src="projectLeader.appImageUrl"/>
<div class="leader-text">
<span>{{projectLeader.name}}</span>
<span>{{projectLeader.title}}</span>
<div class="address">{{projectLeader.hospital}}</div>
</div>
</div>
<div class="content">
<div class="text">{{newText}}</div>
<div class="desc" @click="allText">
<span>{{btnText}}</span>
<img v-if="!allTextFlag" src="../../images/down.png"/>
<img v-if="allTextFlag" src="../../images/up.png"/>
</div>
</div>
<div class="item-leader-container">
<div class="basic-title">项目负责人</div>
<div class="leader-info">
<img :src="projectLeader.appImageUrl" />
<div class="leader-text">
<span>{{projectLeader.name}}</span>
<span>{{projectLeader.title}}</span>
<div class="address">{{projectLeader.hospital}}</div>
</div>
</div>
<div class="content">
<div class="text">{{newText}}</div>
<div class="desc" @click="allText">
<span>{{btnText}}</span>
<img v-if="!allTextFlag" src="../../images/down.png" />
<img v-if="allTextFlag" src="../../images/up.png" />
</div>
</div>
</div>
</template>
<script>
export default {
props: {
projectLeader: {
type: Object,
default: () => {}
}
},
data() {
return {
btnText: '详情',
allTextFlag: false
}
},
computed: {
newText: function () {
if(this.projectLeader.info) {
return this.projectLeader.info.length > 66 ? this.projectLeader.info.slice(0,66) + "..." : this.projectLeader.info;
}
}
},
methods: {
allText() {
if(!this.allTextFlag) {
this.newText = this.projectLeader.info;
this.btnText = '收起';
this.allTextFlag = true;
}else {
this.newText =this.projectLeader.info.length > 66 ? this.projectLeader.info.slice(0,66) + "..." : this.projectLeader.info;
this.btnText = '详情';
this.allTextFlag = false;
}
}
props: {
projectLeader: {
type: Object,
default: () => {}
}
}
},
data() {
return {
btnText: "详情",
allTextFlag: false
};
},
computed: {
newText: function() {
if (this.projectLeader.info) {
return this.projectLeader.info.length > 66
? this.projectLeader.info.slice(0, 66) + "..."
: this.projectLeader.info;
}
}
},
methods: {
allText() {
if (!this.allTextFlag) {
this.newText = this.projectLeader.info;
this.btnText = "收起";
this.allTextFlag = true;
} else {
this.newText =
this.projectLeader.info.length > 66
? this.projectLeader.info.slice(0, 66) + "..."
: this.projectLeader.info;
this.btnText = "详情";
this.allTextFlag = false;
}
}
}
};
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.item-leader-container {
padding-bottom: px2rem(20px);
margin: px2rem(30px) px2rem(15px) 0px;
border-bottom: px2rem(1px) solid #E7E8E9;
.basic-title {
font-size: px2rem(18px);
line-height: px2rem(18px);
padding-bottom: px2rem(20px);
margin: px2rem(30px) px2rem(15px) 0px;
border-bottom: px2rem(1px) solid #e7e8e9;
.basic-title {
font-size: px2rem(18px);
line-height: px2rem(18px);
color: #373839;
font-weight: 700;
}
.leader-info {
display: flex;
flex-direction: row;
margin-top: px2rem(16px);
img {
display: inline-block;
width: px2rem(44px);
height: px2rem(44px);
border-radius: 50%;
}
.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;
}
.address {
margin-top: px2rem(5px);
font-size: px2rem(13px);
color: #979899;
}
}
.leader-info {
display: flex;
flex-direction: row;
margin-top: px2rem(16px);
img {
display: inline-block;
width: px2rem(44px);
height: px2rem(44px);
border-radius: 50%;
}
.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;
}
.address {
margin-top: px2rem(5px);
font-size: px2rem(13px);
color: #979899;
}
}
}
.content {
position: relative;
margin-top: px2rem(16px);
.text {
font-size: px2rem(14px);
line-height: px2rem(21px);
color: #676869;
}
.content {
position: relative;
margin-top: px2rem(16px);
.text {
font-size: px2rem(14px);
line-height: px2rem(21px);
color: #676869;
}
.desc {
position: absolute;
right: 0;
bottom: px2rem(1px);
background: #fff;
line-height: px2rem(14px);
z-index: 99;
span {
font-size: px2rem(14px);
color: #449284;
}
img {
width: px2rem(12px);
}
}
.desc {
position: absolute;
right: 0;
bottom: px2rem(1px);
background: #fff;
line-height: px2rem(14px);
z-index: 99;
span {
font-size: px2rem(14px);
color: #449284;
}
img {
width: px2rem(12px);
}
}
}
}
</style>
\ No newline at end of file
src/views/exchange-tips.vue
浏览文件 @ 7c7cd97b
......@@ -9,11 +9,11 @@
<p class="title">一、云鹊医课程的版权归属何方？</p>
<p class="text">云鹊医平台所有的在线课程版权归云鹊医所有，任何以录屏或其它方式进行的盗版或盗版售卖行为均属侵权行为，一经发现，云鹊医将采取最严厉的措施进行打击并维权，包括但不限于：起诉侵权人、发函侵权人学校或单位、云鹊医全平台公示侵权人所有信息、在一定时间内或永久限制该侵权人购买、观看课程的权利。</p>
<p class="title">二、我应该如何兑换课程？</p>
<p class="text">点击课程页面上的“点击兑换”，即可通过啾啾币兑换等值的课程。如果啾啾币不足，可以通过啾啾币中心的任务列表赚取。目前仅支持完整课程的兑换，暂不支持单独章节的兑换。在啾啾币系统上线以前、用户已经加入学习的课程不受影响。</p>
<p class="text">点击课程页面上的“点击兑换”，即可通过云鹊豆兑换等值的课程。如果云鹊豆不足，可以通过云鹊豆中心的任务列表赚取。目前仅支持完整课程的兑换，暂不支持单独章节的兑换。在云鹊豆系统上线以前、用户已经加入学习的课程不受影响。</p>
<p class="title">三、兑换课程以后如何看课？</p>
<p class="text">打开云鹊医app，进入“个人中心”- “我的课程”，在“学习中”即可看到兑换成功的课程。课程兑换成功以后，用户可以永久收看该门课程。</p>
<p class="title">四、我兑换课程以后后悔了，可以退课吗？</p>
<p class="text">目前云鹊医平台不支持通过啾啾币兑换的课程退货，即不支持退回啾啾币的动作，所以请在兑换成功前自行确认是否要用啾啾币兑换该课程。对于用户自主消费啾啾币的行为产生的啾啾币减少，云鹊医平台不作后续处理。</p>
<p class="text">目前云鹊医平台不支持通过云鹊豆兑换的课程退货，即不支持退回云鹊豆的动作，所以请在兑换成功前自行确认是否要用云鹊豆兑换该课程。对于用户自主消费云鹊豆的行为产生的云鹊豆减少，云鹊医平台不作后续处理。</p>
<p class="title">五、其它提示：</p>
<p class="text">由于学员较多，如有问题请直接留言，客服会在24小时以内回复，请谅解。 如果事件过于紧急，请联系云鹊医客服电话：4009208877。</p>
</div>
......
src/views/merge-detail.vue
浏览文件 @ 7c7cd97b
......@@ -116,6 +116,7 @@ import vueFilters from "@/utils/filter";
export default {
data() {
return {
// token: "9B62E5874DA94979A54DB3E9DFC1443F",
pageTitle: "",
isShowShare: true,
premissionFlag: false,
......@@ -207,17 +208,19 @@ export default {
this.courseRequire = this.$route.query.courseRequire;
window.__getUserInfo64Comp = function(param) {
alert(10);
_this.token = param.userToken;
_this.setUserInfo(param);
_this.checkToken();
_this.getProjectParticularsV2();
alert(11);
};
_this.getUserInfo();
// if (__isWeb && process.env.BUILD_ENV == "development") {
// let param = {};
// __getUserInfo64Comp(param);
// }
if(__isWeb) {
if (__isWeb) {
_this.getProjectParticularsV2();
}
window.__refresh = function() {
......@@ -226,7 +229,7 @@ export default {
// 打开页面埋点
this.$sendBuriedData({
action: '打开页面',
action: "打开页面",
component_tag: `211#0#${this.projectId}#0`
});
},
......@@ -246,7 +249,8 @@ export default {
});
},
scrollFun() {
let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
let scrollTop =
document.body.scrollTop || document.documentElement.scrollTop;
const catalogue = document.getElementById("catalogue-content");
const h = catalogue.offsetTop - 600;
if (scrollTop > 20) {
......@@ -264,7 +268,8 @@ export default {
checkToken() {
let _this = this;
let param = {
token: _this.userInfo.userToken,
token: _this.userInfo.userToken || '9B62E5874DA94979A54DB3E9DFC1443F',
// token: _this.userInfo.userToken || _this.token,
setEntry: true
};
this.GET("campaign/admin/task/checkToken", param).then(res => {
......@@ -272,8 +277,8 @@ export default {
//未登录 跳转登录页
console.log("跳登录");
rocNative.gotoLogin();
}else {
if(!_this.premissionFlag) {
} else {
if (!_this.premissionFlag) {
_this.premissionFlag = true;
_this.permission(); // 提示是否有机构和在申请范围内
}
......@@ -312,7 +317,10 @@ export default {
};
_this.NEW_POST("cme/credit/applyCheck", param).then(res => {
if (res.code == "000000") {
gotoPage(_this,`cme/#/credit-edit?creditId=${_this.project.creditId}`);
gotoPage(
_this,
`cme/#/credit-edit?creditId=${_this.project.creditId}`
);
} else if (res.code == "219004" || res.code == "219005") {
// 未加入机构 219004 未身份认证 219005 不在申请范围 219012
let params = {
......@@ -342,9 +350,9 @@ export default {
window.scrollTo(0, h);
this.isBlack = true;
this.bgColor = "#fff";
this.$sendBuriedData({
component_tag: `211#211007#${this.projectId}`
});
this.$sendBuriedData({
component_tag: `211#211007#${this.projectId}`
});
},
// 锚点到目录
jumpCatalogue() {
......@@ -355,15 +363,16 @@ export default {
window.scrollTo(0, h);
this.isBlack = true;
this.bgColor = "#fff";
this.$sendBuriedData({
component_tag: `211#211008#${this.projectId}`
});
this.$sendBuriedData({
component_tag: `211#211008#${this.projectId}`
});
},
// 获取项目详情
getProjectParticularsV2() {
let _this = this;
let param = {
token: _this.userInfo.userToken || "DA2A4E43343E47DEB4C4B708288D02D4",
token: _this.userInfo.userToken || '9B62E5874DA94979A54DB3E9DFC1443F',
// token: _this.userInfo.userToken || this.token,
setEntry: true
};
// _this.showLoading = true;
......@@ -382,7 +391,7 @@ export default {
// 先设置视频URL再显示视频组件 ------------ END
_this.project = res.data;
_this.projectLeader = res.data.projectLeader;
_this.projectLeader = res.data.projectLeader || {};
_this.doctorList = res.data.doctorList;
//_this.projectStatus = res.data.projectStatus;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或