Skip to content

P
pica-cooperation-cme
提交 b0b04a40 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-compliance-0708' into 'release' 

中华医学会合规改造  code reviewer：杨广俊

中华医学会合规改造  code reviewer：杨广俊

See merge request !14
上级 c66e8792 6d9d2492
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 772 行增加 和 3160 行删除
package-lock.json
浏览文件 @ b0b04a40
此差异已折叠。
src/components/business/cell-list-detail.vue
浏览文件 @ b0b04a40
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<article @click.stop="deleteFlow()" class="cell-container"> <article @click.stop="deleteFlow()" class="cell-container">
<span class="" v-for="(item, index) in portalModule.contentList" :key="index"> <span class="" v-for="(item, index) in portalModule.contentList" :key="index">
<div v-if="index > 0 && portalModule.contentList[index].templetId!= portalModule.contentList[index-1].templetId" class="bottom-line"></div> <div v-if="index > 0 && portalModule.contentList[index].templetId!= portalModule.contentList[index-1].templetId" class="bottom-line"></div>
<div class="cell-container-item" @click="gotoExamOrCourse(item)" > <div class="cell-container-item" >
<div class="name"> <div class="name">
<div class="name-img"> <div class="name-img">
<img v-if="item.type == 1 && item.useFlag == 1" class="img-icon" src="../../images/exam.png"> <img v-if="item.type == 1 && item.useFlag == 1" class="img-icon" src="../../images/exam.png">
...@@ -29,26 +29,17 @@ ...@@ -29,26 +29,17 @@
<img v-if="item.type == 2 && item.useFlag == 1" class="img-icon" src="../../images/learn.png"> <img v-if="item.type == 2 && item.useFlag == 1" class="img-icon" src="../../images/learn.png">
<img v-if="item.type == 2 && item.useFlag == 2" class="img-icon" src="../../images/learn-dark.png"> <img v-if="item.type == 2 && item.useFlag == 2" class="img-icon" src="../../images/learn-dark.png">
</div> </div>
<!-- <div class="name-logo" :class="{'name-learn': item.type == 2, 'name-logo-no': item.useFlag == 2}" >
{{item.type | contentType}}
</div> -->
<p class="name-title" :class="{'name-title-no': item.useFlag == 2}">{{item.name | shortName(30)}}</p> <p class="name-title" :class="{'name-title-no': item.useFlag == 2}">{{item.name | shortName(30)}}</p>
<!-- <span v-if="item.certificateFlag !== 2 && index == 0">
<img class="cert-img" src="../../images/has-owner-cert.png">
</span> -->
</div> </div>
<!-- 'bg-13': item.status == 13 -->
<span <span
@click="gotoExamOrCourse(item)"
v-show="hasBindCard"
class="text-action" class="text-action"
:class="{'text-action-no': item.useFlag == 2}" :class="{'text-action-no': item.useFlag == 2}"
> >
<!-- <img v-show="item.status == 13" class="text-action-dh" src="../../images/icon-dh.png"> -->
{{getActionText(item.status)}} {{getActionText(item.status)}}
</span> </span>
<!-- <div class="connect-line" <img @click="toastToBuy" class="key" v-show="!hasBindCard" src="../../images/cme/phrase2/key.png" alt="">
:class="{'len1': item.height === 1, 'len2': item.height === '1','len3': item.height === 2, 'len4': item.height === '2', 'line-complete': index+1 < portalModule.contentList.length && portalModule.contentList[index+1].useFlag == 1}"
v-if="index+1 < portalModule.contentList.length && portalModule.contentList[index].templetId == portalModule.contentList[index+1].templetId">
</div> -->
<div class="foot-line" <div class="foot-line"
v-if="index+1 < portalModule.contentList.length && portalModule.contentList[index].templetId == portalModule.contentList[index+1].templetId"> v-if="index+1 < portalModule.contentList.length && portalModule.contentList[index].templetId == portalModule.contentList[index+1].templetId">
</div> </div>
...@@ -60,12 +51,7 @@ ...@@ -60,12 +51,7 @@
</article> </article>
</van-collapse-item> </van-collapse-item>
</van-collapse> </van-collapse>
<!-- <Toast ref="toastTitle"></Toast> -->
<!-- <div v-if="index+1 < projectComponent.length" class="line-component"></div> -->
</div> </div>
<!-- <NoMoreContent v-if="detailNum > 9" /> -->
<!-- <NoMoreContent />
<div v-if="detailNum <= 9" class="no-more-bottom"></div> -->
<van-dialog <van-dialog
v-model="dialogState" v-model="dialogState"
title="标题" title="标题"
...@@ -75,11 +61,9 @@ ...@@ -75,11 +61,9 @@
</template> </template>
<script> <script>
// import CommonTitle from "@/components/common/common-title";
import MergeTitle from "@/components/business/merge-title"; import MergeTitle from "@/components/business/merge-title";
import NoMoreContent from "@/components/business/no-more-content"; import NoMoreContent from "@/components/business/no-more-content";
import CertShow from "@/components/business/cert-show"; import CertShow from "@/components/business/cert-show";
// import Toast from "@/components/common/common-toast";
import { Collapse, CollapseItem, Dialog, Toast } from 'vant'; import { Collapse, CollapseItem, Dialog, Toast } from 'vant';
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getAppVersion } from "@/utils"; import { getAppVersion } from "@/utils";
...@@ -114,14 +98,10 @@ export default { ...@@ -114,14 +98,10 @@ export default {
}; };
}, },
props: { props: {
// moduleName: { hasBindCard: {
// type: String, type: Boolean,
// default: "" default: false
// }, },
// paramData: {
// type: Array,
// default: () => []
// },
projectComponent: { projectComponent: {
type: Array, type: Array,
default: () => [] default: () => []
...@@ -144,10 +124,8 @@ export default { ...@@ -144,10 +124,8 @@ export default {
}, },
components: { components: {
MergeTitle, MergeTitle,
// CommonTitle,
CertShow, CertShow,
NoMoreContent, NoMoreContent,
// Toast,
Dialog, Dialog,
}, },
watch:{ watch:{
...@@ -200,7 +178,6 @@ export default { ...@@ -200,7 +178,6 @@ export default {
paramList = [ paramList = [
{ {
key: "className", key: "className",
// value: "com.picahealth.yunque.activitys.courseplaynew.CourseIntroduceActivity###WeexCourseIntroViewController",
value: "com.picahealth.yunque.activitys.courseplaynew.MyTcPlayVideoActivity###CourseMultiMediaPlayController", value: "com.picahealth.yunque.activitys.courseplaynew.MyTcPlayVideoActivity###CourseMultiMediaPlayController",
type: 4, type: 4,
seqNo: 1 seqNo: 1
...@@ -281,6 +258,11 @@ export default { ...@@ -281,6 +258,11 @@ export default {
console.log('item',item); console.log('item',item);
Toast('尚未开始，敬请期待'); Toast('尚未开始，敬请期待');
} }
},
// 弹框提示
toastToBuy() {
Toast('购买后可学习课程');
} }
} }
}; };
...@@ -423,17 +405,11 @@ export default { ...@@ -423,17 +405,11 @@ export default {
position: relative; position: relative;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
// margin: px2rem(6px) px2rem(0px);
// height: px2rem(51px);
margin-bottom: px2rem(39px); margin-bottom: px2rem(39px);
line-height: px2rem(51px); line-height: px2rem(51px);
font-size: px2rem(15px); font-size: px2rem(15px);
// padding: px2rem(0px) px2rem(15px);
// background: rgba(248, 249, 250, 1);
// border-bottom: 1px solid #f0f0f0;
// border-radius: px2rem(6px);
justify-content: space-between; justify-content: space-between;
// align-items: center; align-items: center;
.name { .name {
.name-img { .name-img {
position: relative; position: relative;
...@@ -558,6 +534,10 @@ export default { ...@@ -558,6 +534,10 @@ export default {
color: #c7c8c9; color: #c7c8c9;
} }
} }
.key {
width: px2rem(15px);
height: px2rem(15px);
}
} }
span { span {
.cert-img { .cert-img {
......
src/components/cme/basic-info.vue
浏览文件 @ b0b04a40
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
<!-- <span>{{level}} | {{projectCredit}}</span> --> <!-- <span>{{level}} | {{projectCredit}}</span> -->
</div> </div>
<div class="content"> <div class="content">
<span>申请范围</span> <!-- <span>申请范围</span> -->
<span>学习范围</span>
<span>{{scope}}</span> <span>{{scope}}</span>
</div> </div>
<div class="remind" v-if="remind && cmeType != 2"> <div class="remind" v-if="remind && cmeType != 2">
...@@ -27,8 +28,8 @@ ...@@ -27,8 +28,8 @@
</div> </div>
<div class="content"> <div class="content">
<!-- <span>{{cmeType == 2 ? '主办单位' : '发起机构'}}</span> --> <!-- <span>{{cmeType == 2 ? '主办单位' : '发起机构'}}</span> -->
<span>主办单位</span> <!-- <span>主办单位</span> -->
<!-- <span>发起机构</span> --> <span>申办单位</span>
<span>{{organName}}</span> <span>{{organName}}</span>
</div> </div>
</div> </div>
......
src/components/cme/bind-card-button.vue 0 → 100644
浏览文件 @ b0b04a40
<template>
<section class="bind-cart-wrapper">
<article class="left">
<div class="top">
<span class="discount">￥{{(cardInfo.preferentialPrice || cardInfo.costPrice) | formatMoney}}</span>
<span v-show="cardInfo.preferentialPrice" class="price">
<del>原价￥{{cardInfo.costPrice | formatMoney}}</del>
</span>
</div>
<div class="bottom">
<img src="../../images/cme/phrase2/info.png" />
<span>激活或购买后可学习课程</span>
</div>
</article>
<article class="right">
<span class="left" @click="changeClick">去激活</span>
<span @click="gotoBuy" class="right">去购买</span>
</article>
</section>
</template>
<script>
export default {
props: {
cardInfo: {
type: Object,
default: () => {}
}
},
data() {
return {};
},
methods: {
changeClick(){
this.$emit("changeClick")
},
gotoBuy() {
this.$emit("gotoBuy");
}
}
};
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.bind-cart-wrapper {
position: fixed;
left: 0;
bottom: 0;
z-index: 100;
width: 100%;
display: flex;
flex-direction: row;
height: px2rem(60px);
line-height: 1;
justify-content: space-between;
padding: px2rem(10px) px2rem(15px);
font-size: px2rem(14px);
background: rgba(255, 255, 255, 1);
box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.1);
.left {
display: flex;
flex-direction: column;
height: px2rem(40px);
line-height: 1;
font-size: 12px;
// align-items: ;
.top {
margin-top: px2rem(3px);
height: px2rem(24px);
.discount {
color: #fb5b52;
font-size: px2rem(18px);
font-weight: 700;
margin-right: px2rem(4px);
}
.price {
color: #979899;
}
}
.bottom {
display: flex;
flex-direction: row;
img {
width: px2rem(12px);
height: px2rem(12px);
margin-left: 1px;
margin-right: px2rem(4px);
}
color: #979899;
}
}
.right {
display: flex;
flex-direction: row;
span {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
width: px2rem(80px);
font-size: px2rem(14px);
font-weight: 700;
text-align: center;
&.left {
border-radius: px2rem(20px) 0px 0px px2rem(20px);
border: 1px solid rgba(255, 122, 75, 1);
color: #ff7a4b;
}
&.right {
background: linear-gradient(
137deg,
rgba(255, 166, 95, 1) 0%,
rgba(255, 122, 75, 1) 100%
);
border-radius: 0px px2rem(20px) px2rem(20px) 0px;
color: #fff;
}
}
}
}
</style>
\ No newline at end of file
src/components/cme/card-popup copy.vue 已删除 100644 → 0
浏览文件 @ c66e8792
<template>
<section class="card-popup-wrapper">
<van-popup
v-model="isShow"
position="center"
@click-overlay="clickOverlay"
>
<article class="content">
<p class="title">学分项目必须使用学习卡</p>
<p class="title">请先购买学习卡</p>
<section class="card-info">
<img v-if="cardInfo.cardType == 1" class="icon" src="../../images/cme/phrase2/I-card-icon.png" alt />
<img v-else class="icon" src="../../images/cme/phrase2/II-card-icon.png" alt />
<!-- <div class="info">
<span class="name">{{cardInfo.goodsName}}</span>
<p>
<span class="price">￥{{(cardInfo.preferentialPrice || cardInfo.costPrice) | formatMoney}}</span><span v-show="cardInfo.preferentialPrice" class="discount"><del> 原价￥{{cardInfo.costPrice | formatMoney}}</del></span>
</p>
</div> -->
<div class="info">
<span class="name">已购买去学习已购买去学习买去学习</span>
<p>
<span class="price">￥100</span><span class="discount"><del> 原价￥120</del></span>
</p>
</div>
</section>
<div class="line"></div>
<div class="btn">
<span class="left" @click="cancle">已购买去学习</span>
<span class="vert-line"></span>
<span class="right" @click="confirm">去购买</span>
</div>
</article>
</van-popup>
</section>
</template>
<script>
import { Popup } from "vant";
export default {
data() {
return {
}
},
props: {
isShow: {
type: Boolean,
default: false,
},
cardInfo: {
id: 10031,
goodsVersion: 1,
cardType: 1,
costPrice: 0,
preferentialPrice: 0,
goodsDesc: "",
goodsName: "学习卡",
goodsType: 2,
isSale: 1,
}
},
methods: {
clickOverlay() {
this.$emit('clickOverlay');
},
cancle() {
this.$emit('cancle');
},
confirm() {
this.$emit('confirm');
}
},
}
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.card-popup-wrapper {
.content {
font-size: px2rem(14px);
width: px2rem(300px);
// height: px2rem(245px);
padding-top: px2rem(30px);
.title {
text-align: center;
font-size: px2rem(18px);
font-weight: 700;
}
.card-info {
display: flex;
flex-direction: row;
align-items: center;
height: px2rem(76px);
margin: px2rem(15px);
padding: 0 px2rem(8px);
background: #F8F9FA;
border-radius: px2rem(6px);
font-size: px2rem(14px);
.icon {
width: px2rem(60px);
height: px2rem(60px);
margin-right: px2rem(8px);
}
.info {
width: 100%;
position: relative;
top: 0;
left: 0;
.name {
position: absolute;
top: px2rem(-30px);
left: px2rem(4px);
}
p {
position: absolute;
bottom: px2rem(-34px);
left: 0px;
display: flex;
align-items: center;
.price {
color: #FB5B52;
font-size: px2rem(18px);
font-weight: 700;
margin-right: px2rem(8px);
}
.discount {
color: #979899;
}
}
}
}
.line {
margin-top: px2rem(30px);
height: px2rem(1px);
background: #F0F1F2;
}
.btn {
width: 100%;
display: flex;
flex-direction: row;
// justify-content: space-between;
align-items: center;
height: px2rem(50px);
// margin-top: px2rem(15px);
font-size: px2rem(17px);
.left {
flex: 1;
text-align: center;
color: #979899;
// border-right: 1px solid #F0F1F2;
}
.vert-line {
border-right: 1px solid #F0F1F2;
// width: px2rem(1px);
height: 100%;
}
.right {
flex: 1;
text-align: center;
color: #449284;
}
}
}
.van-popup.van-popup--center {
border-radius: px2rem(4px);
}
}
</style>
src/components/cme/change-card.vue 0 → 100644
浏览文件 @ b0b04a40
<template>
<van-popup
v-model="isShow"
@click-overlay="cancle"
position="bottom"
>
<section class="bind-cart-wrapper">
<article class="title">
<span>激活详情</span>
<img @click="cancle" src="../../images/cme/close.png" />
</article>
<article class="tip">
<div class="left">
<img src="../../images/cme/phrase2/info.png" />
<span>激活码用于兑换课程，您可以从订单详情或已购买到实体卡查看激活码密码。激活码一旦兑换，不可退回。</span>
</div>
</article>
<section class="input-wrapper">
<article class="code">
<van-field
maxlength="26"
v-model="activationCode"
label="激活码"
placeholder="请输入激活码"
/>
</article>
<span class="error">{{errorMsg}}</span>
<img v-show="!!activationCode" @click="clear" src="../../images/cme/phrase2/close.png" />
</section>
<article class="bottom">
<van-button @click="confirm" size="large" round color="#449284">确认激活</van-button>
</article>
</section>
</van-popup>
</template>
<script>
export default {
props: {
isShow: {
type: Boolean,
default: true
},
changeErrorMsg: {
type: String,
default: ''
}
},
data() {
return {
activationCode: '',
errorMsg: ''
};
},
//
watch: {
activationCode(val) {
if(!val) {
this.errorMsg = '请输入激活码';
} else {
this.errorMsg = '';
}
this.$nextTick(() => {
this.activationCode = val.replace(/\s/g,'').replace(/.....(?!$)/g,'$& ');
});
},
changeErrorMsg(val) {
if(val) {
this.errorMsg = val;
}
},
isShow(val) {
this.activationCode = '';
this.errorMsg = '';
}
},
methods: {
cancle() {
this.$emit("cancle");
},
confirm() {
if(!this.activationCode) {
this.errorMsg = '请输入激活码';
return;
};
if(this.activationCode.length != 23) {
this.errorMsg = '请输入正确的激活码';
return;
}
let aCode = JSON.parse(JSON.stringify(this.activationCode));
aCode = aCode.replace(/\s/g,'');
this.$emit("confirm", aCode);
},
clear() {
this.activationCode = ''
}
}
};
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.bind-cart-wrapper {
width: 100%;
display: flex;
line-height: 1;
padding: px2rem(10px) px2rem(15px);
display: flex;
flex-direction: column;
background: rgba(255, 255, 255, 1);
box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.1);
.title {
display: flex;
flex-direction: row;
font-size: 18px;
font-weight: 700;
align-items: center;
justify-content: center;
width: 100%;
margin-top: px2rem(20px);
img {
position: relative;
top: 0;
right: px2rem(-120px);
width: 12px;
}
}
.tip {
display: flex;
margin-top: px2rem(40px);
.left {
display: flex;
line-height: 1.2;
font-size: px2rem(12px);
img {
width: px2rem(12px);
height: px2rem(12px);
margin-left: 1px;
margin-right: px2rem(4px);
}
color: #979899;
}
}
.input-wrapper {
position: relative;
.code {
display: flex;
flex-direction: column;
padding: px2rem(20px) 0;
padding-top: 0;
}
.error {
position: absolute;
top: px2rem(66px);
left: px2rem(56px);
display: inline-block;
color: red;
font-size: px2rem(12px);
}
img {
position: absolute;
top: px2rem(30px);
right: px2rem(12px);
width: px2rem(15px);
height: px2rem(15px);
}
}
.bottom {
display: flex;
margin-bottom: px2rem(40px);
}
}
</style>
\ No newline at end of file
src/components/cme/exjumper-dialog.vue
浏览文件 @ b0b04a40
...@@ -3,8 +3,13 @@ ...@@ -3,8 +3,13 @@
<div class="dialog-mask"></div> <div class="dialog-mask"></div>
<div class="dialog-container"> <div class="dialog-container">
<div class="title" v-html="title"></div> <div class="title" v-html="title"></div>
<div class="dialog-content">{{content}}</div> <!-- <div class="dialog-content">{{content}}</div> -->
<div v-show="needSubContent" class="dialog-sub-content" v-html="subContent"></div> <div class="sub-wrapper">
<div v-show="needSubContent" class="dialog-sub-content">1.跳转后点击“购买学习”，注册登录“中华医学教育在线”平台（首次登录需用手机号注册）</div>
<img class="dialog-img-1" src="https://file.yunqueyi.com/h5/images/tinified/II-tips-1.png" alt="">
<div v-show="needSubContent" class="dialog-sub-content">2.支付方式选择 “学习卡支付”，输入您的学习卡激活码，即可参加考试、申请学分。</div>
<img class="dialog-img-2" src="https://file.yunqueyi.com/h5/images/tinified/II-tips-2.png" alt="">
</div>
<div class="dialog-footer v-hairline-top"> <div class="dialog-footer v-hairline-top">
<span :class="{'single-btn': isSingle}" @click.stop.prevent="handlerAction(1)">{{cancleBtnText}}</span> <span :class="{'single-btn': isSingle}" @click.stop.prevent="handlerAction(1)">{{cancleBtnText}}</span>
<span v-show="!isSingle" class="confirm-btn v-hairline-left" @click.stop.prevent="handlerAction(2)">{{confirmBtnText}}</span> <span v-show="!isSingle" class="confirm-btn v-hairline-left" @click.stop.prevent="handlerAction(2)">{{confirmBtnText}}</span>
...@@ -95,7 +100,7 @@ export default { ...@@ -95,7 +100,7 @@ export default {
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
.title { .title {
margin-top: px2rem(30px); margin: px2rem(30px) 0 px2rem(20px);
text-align: center; text-align: center;
font-size: px2rem(18px); font-size: px2rem(18px);
font-weight: 700; font-weight: 700;
...@@ -103,21 +108,64 @@ export default { ...@@ -103,21 +108,64 @@ export default {
} }
.dialog-content { .dialog-content {
// margin: px2rem(30px) px2rem(22px); // margin: px2rem(30px) px2rem(22px);
margin: px2rem(20px) px2rem(30px) px2rem(30px); margin: px2rem(20px) px2rem(16px) px2rem(30px);
text-align: left; text-align: left;
font-size: px2rem(14px); font-size: px2rem(14px);
font-weight: 400; font-weight: 400;
color: #373839; color: #373839;
} }
.dialog-sub-content { .sub-wrapper {
margin: px2rem(-16px) px2rem(30px) px2rem(20px); margin-right: px2rem(5px);
// margin: px2rem(-16px) px2rem(22px) px2rem(30px); max-height: px2rem(300px);
text-align: left; overflow: auto;
font-size: px2rem(14px); .dialog-sub-content {
line-height: px2rem(24px); margin: 0 px2rem(8px) px2rem(20px) px2rem(16px);
font-weight: 400; text-align: left;
color: #979899; font-size: px2rem(14px);
line-height: px2rem(24px);
font-weight: 400;
color: #979899;
}
.dialog-img-1 {
width: px2rem(268px);
height: px2rem(165px);
margin-left: px2rem(16px);
margin-bottom: px2rem(20px);
}
.dialog-img-2 {
width: px2rem(268px);
height: px2rem(145px);
margin-left: px2rem(16px);
margin-bottom: px2rem(20px);
}
&::-webkit-scrollbar-track-piece {
background-color: rgba(0, 0, 0, 0);
border-left: 1px solid rgba(0, 0, 0, 0);
}
&::-webkit-scrollbar {
width: px2rem(5px);
height: px2rem(13px);
-webkit-border-radius: px2rem(3px);
-moz-border-radius: px2rem(3px);
border-radius: px2rem(3px);
}
&::-webkit-scrollbar-thumb {
background-color: #C7C8C9;
background-clip: padding-box;
-webkit-border-radius: px2rem(3px);
-moz-border-radius: px2rem(3px);
border-radius: px2rem(3px);
min-height: px2rem(28px);
}
&::-webkit-scrollbar-thumb:hover {
background-color: #C7C8C9;
-webkit-border-radius: px2rem(3px);
-moz-border-radius: px2rem(3px);
border-radius: px2rem(3px);
}
} }
.dialog-footer { .dialog-footer {
height: px2rem(50px); height: px2rem(50px);
display: flex; display: flex;
......
src/main.js
浏览文件 @ b0b04a40
...@@ -12,7 +12,9 @@ import VConsole from 'vconsole/dist/vconsole.min.js' ...@@ -12,7 +12,9 @@ import VConsole from 'vconsole/dist/vconsole.min.js'
import BuriedPoint,{ sendBuriedData} from 'web-buried-point'; import BuriedPoint,{ sendBuriedData} from 'web-buried-point';
import Vant from 'vant'; import Vant from 'vant';
import 'vant/lib/index.css'; import 'vant/lib/index.css';
import clipboard from 'clipboard';
//注册到vue原型上
Vue.prototype.clipboard = clipboard;
if(!(process.env.BUILD_ENV === 'uat' || process.env.BUILD_ENV === 'pro')) { if(!(process.env.BUILD_ENV === 'uat' || process.env.BUILD_ENV === 'pro')) {
// if(!(process.env.BUILD_ENV === 'pro')) { // if(!(process.env.BUILD_ENV === 'pro')) {
......
src/style/global.scss
浏览文件 @ b0b04a40
...@@ -109,4 +109,25 @@ ...@@ -109,4 +109,25 @@
// } // }
.van-cell__title span { .van-cell__title span {
font-weight: 700 !important; font-weight: 700 !important;
}
.bind-cart-wrapper .van-field__control {
border-radius: px2rem(4px);
border: 1px solid #C7C8C9;
padding: px2rem(7px);
text-align: left !important;
}
.bind-cart-wrapper .van-cell__title .van-field__label {
span {
font-size: px2rem(15px) !important;
color: #373839 !important;
}
}
.bind-cart-wrapper .van-field__label {
width: px2rem(56px) !important;
padding-top: px2rem(8px);
}
.bind-cart-wrapper .van-cell {
padding: 0.54rem 0 !important;
} }
\ No newline at end of file
src/utils/fetch.js
浏览文件 @ b0b04a40
...@@ -19,7 +19,8 @@ service.interceptors.request.use(config => { ...@@ -19,7 +19,8 @@ service.interceptors.request.use(config => {
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境 if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74'; config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74';
} }
// delete config.data.token; delete config.data.setEntry;
delete config.data.token;
} }
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' }) config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
......
src/utils/mixins.js
浏览文件 @ b0b04a40
...@@ -13,7 +13,7 @@ module.exports = { ...@@ -13,7 +13,7 @@ module.exports = {
query = this.$route.query query = this.$route.query
} }
// alert('this.token' + this.token) // alert('this.token' + this.token)
this.token = this.getUrlKey('token') || (query && query.token) || 'EEF69589911F4D3CAC8700AC11EE8096' this.token = this.getUrlKey('token') || (query && query.token) || '4510A4F7DF72471D82EA3626C43A8696'
}, },
mounted() { mounted() {
......
src/views/I-credit-detail.vue
浏览文件 @ b0b04a40
...@@ -3,18 +3,27 @@ ...@@ -3,18 +3,27 @@
<CommonNavbar <CommonNavbar
:bgColor="bgColor" :bgColor="bgColor"
v-show="showNavBar" v-show="showNavBar"
title="" title
:isFixNavbar="isFixNavbar" :isFixNavbar="isFixNavbar"
borderStyle="0px solid #fff" borderStyle="0px solid #fff"
></CommonNavbar> ></CommonNavbar>
<img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-1.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-2.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-3.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-4.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-5.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-6.png"><img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-7.png"> <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-1.png" />
<ExjumperButton <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-2.png" />
@btnClick="isBuy(1)" <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-3.png" />
btnText="立即学习" <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-4.png" />
type="primary"></ExjumperButton> <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-5.png" />
<img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-6.png" />
<!-- <img class="img" src="https://file.yunqueyi.com/h5/images/tinified/I-detail-7.png" /> -->
<ExjumperButton @btnClick="isBuy(1)" btnText="立即学习" type="primary"></ExjumperButton>
<!-- <img @click="isBuy(1)" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png"> --> <!-- <img @click="isBuy(1)" class="img" src="https://file.yunqueyi.com/h5/images/tinified/i-detail-8.png"> -->
<CardPopup :cardInfo="cardInfo" :isShow="isShowPopup" @clickOverlay="clickOverlay" @cancle="jumpToCardList" @confirm="confirm"></CardPopup> <CardPopup
:cardInfo="cardInfo"
:isShow="isShowPopup"
@clickOverlay="clickOverlay"
@cancle="jumpToCardList"
@confirm="confirm"
></CardPopup>
<Loading v-if="showLoading" /> <Loading v-if="showLoading" />
</section> </section>
</template> </template>
...@@ -23,24 +32,24 @@ import ExjumperButton from "@/components/cme/exjumper-button"; ...@@ -23,24 +32,24 @@ import ExjumperButton from "@/components/cme/exjumper-button";
import CommonNavbar from "@/components/common/common-navbar"; import CommonNavbar from "@/components/common/common-navbar";
import CardPopup from "@/components/cme/card-popup"; import CardPopup from "@/components/cme/card-popup";
import Loading from "@/components/common/common-loading"; import Loading from "@/components/common/common-loading";
import { Toast } from 'vant'; import { Toast } from "vant";
export default { export default {
data() { data() {
return { return {
bgColor: "#fff", bgColor: "#fff",
bgColor: 'none', bgColor: "none",
showNavBar: true, showNavBar: true,
isShowPopup: false, isShowPopup: false,
isFixNavbar: true, isFixNavbar: true,
oneLevelUrl: '', oneLevelUrl: "",
provinceId: 0, provinceId: 0,
organizationId: 0, organizationId: 0,
cardInfo: { cardInfo: {
id: 0 id: 0
}, },
cmeToken: '', cmeToken: "",
showLoading: false, showLoading: false
} };
}, },
components: { components: {
CommonNavbar, CommonNavbar,
...@@ -55,18 +64,21 @@ export default { ...@@ -55,18 +64,21 @@ export default {
// _this.showLoading = false; // _this.showLoading = false;
param.setEntry = true; param.setEntry = true;
_this.getProvinceIdByPosition(param); _this.getProvinceIdByPosition(param);
} };
this.oneLevelUrl = decodeURIComponent(this.$route.query && this.$route.query.oneLevelUrl || ''); this.oneLevelUrl = decodeURIComponent(
this.provinceId = this.$route.query && this.$route.query.provinceId || 0; (this.$route.query && this.$route.query.oneLevelUrl) || ""
this.organizationId = this.$route.query && this.$route.query.organizationId || 0; );
this.cmeToken = this.$route.query && this.$route.query.cmeToken || ''; this.provinceId = (this.$route.query && this.$route.query.provinceId) || 0;
this.organizationId =
(this.$route.query && this.$route.query.organizationId) || 0;
this.cmeToken = (this.$route.query && this.$route.query.cmeToken) || "";
// this.getProvinceIdByPosition(); // this.getProvinceIdByPosition();
}, },
methods: { methods: {
// 点击弹层 // 点击弹层
clickOverlay() { clickOverlay() {
console.log('clickOverlay'); console.log("clickOverlay");
this.isShowPopup = false; this.isShowPopup = false;
}, },
...@@ -79,13 +91,13 @@ export default { ...@@ -79,13 +91,13 @@ export default {
let param = { let param = {
cardType: cardType, cardType: cardType,
token: this.cmeToken, token: this.cmeToken,
setEntry: true, setEntry: true
} };
this.GET("trade/storage/card/isBuy", param).then(res => { this.GET("trade/storage/card/isBuy", param).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
// 如果购买过，则直接跳转到中华医学会页面 // 如果购买过，则直接跳转到中华医学会页面
if(res.data) { if (res.data) {
this.jumpToCardList(); this.jumpToCardList();
} else { } else {
this.preJumper(); this.preJumper();
} }
...@@ -93,12 +105,12 @@ export default { ...@@ -93,12 +105,12 @@ export default {
// else { // else {
// Toast(res.message); // Toast(res.message);
// } // }
}); });
}, },
// 跳转前判断是否有机构，否则使用定位信息 // 跳转前判断是否有机构，否则使用定位信息
preJumper() { preJumper() {
if(this.organizationId != 0 && this.provinceId != 0) { if (this.organizationId != 0 && this.provinceId != 0) {
this.getCardInfoByProvinceId(this.provinceId); this.getCardInfoByProvinceId(this.provinceId);
} else { } else {
this.getPositionData(); this.getPositionData();
...@@ -107,7 +119,7 @@ export default { ...@@ -107,7 +119,7 @@ export default {
// 获取地理位置信息 // 获取地理位置信息
getPositionData() { getPositionData() {
console.log('getPositionData'); console.log("getPositionData");
rocNative.getPositionData({ rocNative.getPositionData({
__funcName: "__getPositionData" __funcName: "__getPositionData"
}); });
...@@ -116,30 +128,32 @@ export default { ...@@ -116,30 +128,32 @@ export default {
// 根据省ID，获取学习卡信息 // 根据省ID，获取学习卡信息
getCardInfoByProvinceId(provinceId) { getCardInfoByProvinceId(provinceId) {
let param = { let param = {
"area": provinceId + '', area: provinceId + "",
"cardType": 1, cardType: 1,
"pageNum": 1, pageNum: 1,
"pageSize": 1 pageSize: 1
} };
this.POST("trade/goods/cardList", param).then(res => { this.POST("trade/goods/cardList", param).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
this.showLoading = false; this.showLoading = false;
this.isShowPopup = true; this.isShowPopup = true;
this.cardInfo = res.data && res.data[0] || {id: 0} ; this.cardInfo = (res.data && res.data[0]) || { id: 0 };
} }
}); });
}, },
// 根据位置信息获取省ID // 根据位置信息获取省ID
getProvinceIdByPosition(param) { getProvinceIdByPosition(param) {
param.setEntry = true; param.setEntry = true;
this.POST("aggregate/cme/convertLocationToProvinceId", param).then(res => { this.POST("aggregate/cme/convertLocationToProvinceId", param).then(
if (res.code == "000000") { res => {
this.getCardInfoByProvinceId(res.data || 0); if (res.code == "000000") {
} else { this.getCardInfoByProvinceId(res.data || 0);
this.getCardInfoByProvinceId(0); } else {
this.getCardInfoByProvinceId(0);
}
} }
}); );
}, },
// 跳转到原生的购买页面 // 跳转到原生的购买页面
...@@ -148,7 +162,8 @@ export default { ...@@ -148,7 +162,8 @@ export default {
let paramList = [ let paramList = [
{ {
key: "className", key: "className",
value: "com.picahealth.yunque.activitys.studycard.StudyCardDetailActivity###PicaDo.LearningCardVC", value:
"com.picahealth.yunque.activitys.studycard.StudyCardDetailActivity###PicaDo.LearningCardVC",
type: 4, type: 4,
seqNo: 1 seqNo: 1
}, },
...@@ -189,24 +204,24 @@ export default { ...@@ -189,24 +204,24 @@ export default {
// 此字段不配置，则用原来的逻辑 // 此字段不配置，则用原来的逻辑
{ {
key: "needCache", key: "needCache",
value: '1', // 0不缓存，其它值都做缓存 value: "1", // 0不缓存，其它值都做缓存
type: 4, type: 4,
seqNo: 1 seqNo: 1
}, }
] ];
rocNative.dispatchEventByModuleCode({ rocNative.dispatchEventByModuleCode({
modeCode: "M300", modeCode: "M300",
jsonString: paramList jsonString: paramList
}); });
} }
} }
}, }
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../style/mixin"; @import "../style/mixin";
.cd-wrapper { .cd-wrapper {
background: #F8F9FA; background: #f8f9fa;
padding-bottom: 80px; padding-bottom: 80px;
.img { .img {
margin-top: -15px; margin-top: -15px;
......
src/views/index copy 2.vue 已删除 100644 → 0
浏览文件 @ c66e8792
此差异已折叠。
src/views/index copy.vue 已删除 100644 → 0
浏览文件 @ c66e8792
<template>
<!-- 专项合作首页: 我参与的，其它项目 -->
<div class="page-container">
<CommonNavbar
:bgColor="bgColor"
v-show="isShowNavbar"
:title="navTitle"
:isFixNavbar="isFixNavbar"
:burialPoint="pointStyle"
borderStyle="1px solid #fff"
></CommonNavbar>
<section class="page-content">
<!-- <button @click="jumpToExamAction" style="margin: 20px;font-size:20px;text-align:center;padding:10px;border-radius:10px;">测试按钮1</button>
<button @click="jumpToExamAction2" style="margin: 20px;font-size:20px;text-align:center;padding:10px;border-radius:10px;">测试按钮2</button> -->
<!-- {{token}} -->
<table class="page-content-table">
<tr>
<td @click="changeTab(1)" :class="{'active': tabIndex === 1}">
<div class="tap-title">
<span :style="{'color': tabIndex === 1 ? '#333' : '#999'}">我的项目</span>
<span></span>
</div>
</td>
<td @click="changeTab(2)" :class="{'active': tabIndex === 2}">
<div class="tap-title">
<!-- <span>其它项目</span> -->
<span :style="{'color': tabIndex === 2 ? '#333' : '#999'}">全部项目</span>
<span></span>
</div>
</td>
</tr>
</table>
<article class="page-content-list">
<section v-if="tabIndex === 1">
<CoopListItem
:paramData="joinProjectList"
:coopType="1"
:tabTo="1"
:isShow="isShow"
:userMobile="userMobile"></CoopListItem>
</section>
<section v-if="tabIndex === 2">
<CoopListItem
:paramData="otherProjectList"
:coopType="1"
:tabTo="2"
:isShow="isShow"
:userMobile="userMobile"></CoopListItem>
</section>
</article>
</section>
<Toast ref="toastTitle"></Toast>
<Loading v-if="showLoading"/>
<!-- <div>
<iframe src="https://www.baidu.com" id="mobsf" frameborder="0" style="width:100%;height:500px;"></iframe>
</div>-->
<!-- <discuss-topic-stencil /> -->
</div>
</template>
<script>
import CommonNavbar from "@/components/common/common-navbar";
import CoopListItem from "@/components/business/coop-list-item";
import Loading from "@/components/common/common-loading";
import Toast from "@/components/common/common-toast";
import { mapGetters, mapActions } from "vuex";
export default {
data() {
return {
showLoading: false,
bgColor: "#fff",
isShow: false,
navTitle: "继教项目",
compTitle: "组件名称",
isShowNavbar: true,
isFixNavbar: false,
pointStyle: "activity",
descTitle: "规定从何处开始选取。如果是负数",
tabIndex: 1,
joinProjectList: [], // 我的项目
otherProjectList: [], // 全部项目
token: "",
toastTitle: "",
userMobile: ""
};
},
computed: {
...mapGetters(["projectTabIndex"])
},
components: {
// DiscussTopicStencil,
CommonNavbar,
CoopListItem,
Loading,
Toast,
},
created() {
var _this = this;
window.__getUserInfo = function(param) {
_this.setUserInfo(param);
_this.token = param.userToken;
_this.userMobile = param.userMobile;
_this.getCoopData();
};
_this.getUserInfo();
if (__isWeb) {
_this.getCoopData();
}
window.__refresh = function() {
//_this.tabIndex = _this.projectTabIndex;
_this.getUserInfo();
// document.documentElement.scrollTop = 0;
// document.body.scrollTop = 0;
};
// 打开页面埋点
this.$sendBuriedData({
component_tag: '210#0#0#0'
});
},
mounted() {
var _this = this;
this.tabIndex = this.projectTabIndex;
// let param = {
// id: 12 };
// this.API_GET("app/certificate/downLoad", param).then(res => {
// });
document.documentElement.scrollTop = 0;
document.body.scrollTop = 0;
},
methods: {
// 跳转到第三方考试页面
//
jumpToExamAction() {
let paramList = [
{
key: "pageUrl",
value: 'http://cmeonline.cma-cmc.com.cn/cms/weixinCourseDetail.htm?courseId=a245b2060ac0495cae440de859321b91&openCourseId=2d9b152a85dc4833892aeaa713362b9f',
type: 4,
seqNo: 1
},
// 此字段不配置，则用原来的逻辑
{
key: "needCache",
value: '1', // 0不缓存，其它值都做缓存
type: 4,
seqNo: 1
}
];
rocNative.dispatchEventByModuleCode({
modeCode: "M300",
jsonString: paramList
});
},
jumpToExamAction2() {
let paramList = [
{
key: "pageUrl",
value: 'http://cmeonline.cma-cmc.com.cn/cms/weixinCourseDetail.htm?courseId=0aeee9f7712b4543ab8eadb0571a78a7&openCourseId=e9e124392d3f4e2494d46e8f990b085e',
type: 4,
seqNo: 1
},
// 此字段不配置，则用原来的逻辑
{
key: "needCache",
value: '1', // 0不缓存，其它值都做缓存
type: 4,
seqNo: 1
}
];
rocNative.dispatchEventByModuleCode({
modeCode: "M300",
jsonString: paramList
});
},
...mapActions(["setUserInfo"]),
//获取版本号
getUserInfo() {
rocNative.getUserInfo({
__funcName: "__getUserInfo"
});
},
changeTab(index) {
let tag = index == 1 ? '210#210001#0' : '210#210001#1';
this.tabIndex = index;
if(index == 1 && !this.userMobile) {
rocNative.gotoLogin();
this.tabIndex = 2;
}
this.$sendBuriedData({
component_tag: tag
});
},
// 获取所有项目：我的项目、其它项目
getCoopData() {
// debugger
let _this = this;
let param = {
token: _this.token,
setEntry: true
};
let cachedJoinProjectList = []
let cachedOtherProjectList = []
_this.otherProjectList = []
_this.showLoading = true;
this.GET("cme/project/list", param).then(
res => {
_this.showLoading = false;
if (res.code == "000000") {
// let oldProjects1 = [];
// let oldProjects2 = [];
// for(let i = 0; i < res.data.oldProjects.length; i++) {
// if(res.data.oldProjects[i].roleFlag == 1) {
// oldProjects1.push(res.data.oldProjects[i]);
// } else if (res.data.oldProjects[i].roleFlag == 0) {
// oldProjects2.push(res.data.oldProjects[i]);
// }
// }
// console.log('项目1',oldProjects1,'项目2',oldProjects2);
cachedJoinProjectList = res.data.myCMEProjectListDtoList;
cachedOtherProjectList = res.data.allCMEProjectListDtoList;
_this.joinProjectList = res.data.myCMEProjectListDtoList;
_this.otherProjectList = res.data.allCMEProjectListDtoList;
// cachedJoinProjectList = _this.handleOldProject(
// oldProjects1,
// res.data.myProjectList
// );
// cachedOtherProjectList = _this.handleOldProject(
// oldProjects2,
// res.data.otherProjectList
// );
// 如果用户已经登陆，则将"至今"的几个项目移到我的列表中
if(_this.userMobile) {
// cachedOtherProjectList.map(item => {
// if(item.projectName && item.projectName.indexOf('国家基本公共卫生服务项目基层高血压管理办公室') >= 0) {
// cachedJoinProjectList.unshift(item);
// } else {
// _this.otherProjectList.push(item);
// }
// })
_this.tabIndex = 1;
} else {
_this.tabIndex = 2;
// _this.otherProjectList = cachedOtherProjectList
}
// _this.joinProjectList = cachedJoinProjectList;
if (_this.joinProjectList && _this.joinProjectList.length === 0) {
_this.tabIndex = 2;
}
_this.isShow = true
// console.log('otherProjectList',_this.otherProjectList);
}
}
);
},
handleOldProject(oldProjects, otherProjectList) {
let oldList = oldProjects.map(item => {
item.pType = 1;
return item;
}),
otherList = otherProjectList.map(item => {
item.pType = 2;
return item;
});
return oldList.concat(otherList);
},
}
};
</script>
<style lang="scss" scoped>
@import "../style/mixin";
.page-content {
&-table {
position: fixed;
z-index: 1;
width: 100%;
text-align: center;
border-bottom: 1px solid #e7e7e7;
background: #fff;
tr {
font-size: px2rem(15px);
font-weight: 700;
height: px2rem(44px);
td {
width: 50%;
padding-top: px2rem(6px);
.tap-title {
display: flex;
flex-direction: column;
align-items: center;
color: #999;
span:nth-child(2) {
position: relative;
left: 0;
bottom: px2rem(-9px);
z-index: 2;
width: px2rem(10px);
height: px2rem(3px);
background: rgba(255, 255, 255, 1);
border-radius: px2rem(3px);
}
}
&.active {
span:nth-child(2) {
background: rgba(68, 146, 132, 1);
}
}
}
}
}
&-list {
padding-top: px2rem(50px);
}
}
</style>
src/views/index.vue
浏览文件 @ b0b04a40
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
</td> </td>
</tr> </tr>
</table> </table>
<article v-show="isShow" class="cb-wrapper" :class="{'padding-top-111': !isWeb}"> <!-- <article v-show="isShow" class="cb-wrapper" :class="{'padding-top-111': !isWeb}">
<CardBanner :userMobile="userMobile"></CardBanner> <CardBanner :userMobile="userMobile"></CardBanner>
</article> </article> -->
<article class="page-content-list"> <article class="page-content-list">
<CommonTitle v-show="tabIndex === 2" title="I类学分继续医学教育项目" :isShowCert="false"></CommonTitle> <CommonTitle title="I类学分继续医学教育项目" :isShowCert="false"></CommonTitle>
<ICardItem v-show="tabIndex === 2" :oneLevelUrl="oneLevelUrl" :provinceId="provinceId" :organizationId="organizationId" :cmeToken="token"></ICardItem> <ICardItem :oneLevelUrl="oneLevelUrl" :provinceId="provinceId" :organizationId="organizationId" :cmeToken="token"></ICardItem>
<CommonTitle class="mt-10" v-show="isShow" title="II类学分继续医学教育项目" :isShowCert="false"></CommonTitle> <CommonTitle class="mt-10" v-show="isShow && tabIndex === 2" title="II类学分继续医学教育项目" :isShowCert="false"></CommonTitle>
<section v-if="tabIndex === 1"> <section v-if="tabIndex === 1">
<CoopListItem <CoopListItem
:paramData="joinProjectList" :paramData="joinProjectList"
...@@ -206,11 +206,9 @@ export default { ...@@ -206,11 +206,9 @@ export default {
_this.otherProjectList = res.data.allCMEProjectListDtoList; _this.otherProjectList = res.data.allCMEProjectListDtoList;
_this.provinceId = res.data.provinceId; _this.provinceId = res.data.provinceId;
_this.organizationId = res.data.organizationId; _this.organizationId = res.data.organizationId;
// _this.organizationInfo.provinceId = res.data.provinceId;
// _this.organizationInfo.organizationId = res.data.organizationId;
_this.oneLevelUrl = res.data.oneLevelUrl; // I类学习卡列表地址 _this.oneLevelUrl = res.data.oneLevelUrl; // I类学习卡列表地址
// _this.setJumpURLForI(res.data.oneLevelUrl);
// _this.setOrganizationInfo(_this.organizationInfo); // 不做相应判断
if (_this.userMobile) { if (_this.userMobile) {
_this.tabIndex = 1; _this.tabIndex = 1;
} else { } else {
...@@ -219,6 +217,7 @@ export default { ...@@ -219,6 +217,7 @@ export default {
if (_this.joinProjectList && _this.joinProjectList.length === 0) { if (_this.joinProjectList && _this.joinProjectList.length === 0) {
_this.tabIndex = 2; _this.tabIndex = 2;
} }
_this.isShow = true; _this.isShow = true;
} }
}); });
...@@ -295,7 +294,7 @@ export default { ...@@ -295,7 +294,7 @@ export default {
} }
} }
&-list { &-list {
padding-top: px2rem(85px); padding-top: px2rem(50px);
.mt-10 { .mt-10 {
margin-bottom: px2rem(-10px); margin-bottom: px2rem(-10px);
} }
......
src/views/merge-detail copy.vue 已删除 100644 → 0
浏览文件 @ c66e8792
此差异已折叠。
src/views/merge-detail.vue
浏览文件 @ b0b04a40
此差异已折叠。
src/views/parent-page copy.vue 已删除 100644 → 0
浏览文件 @ c66e8792
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或