Skip to content

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

代码实现

上级 d82402cf
隐藏空白字符变更
内嵌 并排
正在显示 包含 103 行增加 和 114 行删除
src/utils/env-config.js
浏览文件 @ c6cd21ab
......@@ -8,21 +8,22 @@ export const envConfig = {
// baseUrl: 'http://10.177.15.180:10202/',
// baseUrl: 'http://192.168.140.14:10201/',
apiUrl: 'https://test1-api.yunqueyi.com/',
baseUrl: 'https://test1-sc.yunqueyi.com/',
webPageUrl: 'https://test1-phome.yunqueyi.com/',
hactiveUrl: 'https://test1-hactive.yunqueyi.com',
fileUrl: 'https://test1-www.yunqueyi.com',
appId: 'wx08b383d002c73f26', // 用于微信授权登录
baseUrl: 'https://dev-sc.yunqueyi.com/',
apiUrl: 'https://dev-api.yunqueyi.com/',
webPageUrl: 'https://dev-phome.yunqueyi.com/',
hactiveUrl: 'https://dev-hactive.yunqueyi.com',
fileUrl: 'https://dev-www.yunqueyi.com',
appId: 'wx2c577552a2d28550', // 用于微信授权登录
wxType: 15, // 分享、用户信息对应的appid
tradeType: 4,
// appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
// webPageUrl: 'https://test1-phome.yunqueyi.com/',
// hactiveUrl: 'https://dev-hactive.yunqueyi.com',
// hactiveUrl: 'https://test1-hactive.yunqueyi.com',
// fileUrl: 'https://test1-www.yunqueyi.com',
// appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
......@@ -30,7 +31,7 @@ export const envConfig = {
// apiUrl: 'https://uat-api.yunqueyi.com/',
// webPageUrl: 'https://uat-phome.yunqueyi.com/',
// hactiveUrl: 'https://uat-hactive.yunqueyi.com',
// fileUrl: 'https://dev-www.yunqueyi.com',
// fileUrl: 'https://test1-www.yunqueyi.com',
// appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
// apiUrl: 'https://uat-api.yunqueyi.com/',
......
src/views/index-old.vue
浏览文件 @ c6cd21ab
......@@ -45,7 +45,6 @@
v-show="subject.openFlag == 0"
class="time"
>{{formatTime2(subject.predictTime)}}上线</span>
<!-- {{formatTime(subject.predictTime, '{y}年{m}月')}}上线 -->
</li>
</ul>
</li>
......
src/views/index.vue
浏览文件 @ c6cd21ab
......@@ -26,17 +26,17 @@
</td>
</tr>
</table>
<article class="page-content-list">
<article class="page-content-list" style="margin-top: 65px;">
<CommonImgTitle></CommonImgTitle>
<div class="subject">
<p>肾内科学（304955）</p>
<div class="subject" v-for="(item, index) in gjFirstSubjectModelList" :key="index">
<p>{{item.name}} <span v-show="item.titleCode">（{{item.titleCode}}）</span></p>
<ul class="item-wrapper">
<!-- <li v-if="true" class="item">
<li @click="coopDetails(item.secondSubjectModelList[0], 1)" v-if="item.secondSubjectModelList[0].projectId && item.secondSubjectModelList[0].openFlag" class="item">
<img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span>
</li> -->
<li v-if="true" class="item-pre">
<img v-if="item.secondSubjectModelList[0].bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li>
<li v-else class="item-pre">
<div class="pre">
<img src="../images/course/icon-kc-2.png" alt="">
<span class="pre">课程</span>
......@@ -44,63 +44,43 @@
<p>2020年10月上线</p>
</li>
<li v-if="true" class="item tk">
<li @click="coopDetails(item.secondSubjectModelList[0], 2)" v-if="item.secondSubjectModelList[0].directoryList.length" class="item tk">
<img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span>
<img v-if="item.secondSubjectModelList[0].bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li>
</ul>
</div>
<div class="subject">
<p>肾内科学（304955）</p>
</article>
<article ref="zjListRef" class="page-content-list">
<CommonImgTitle imgType=2 title="中级职称"></CommonImgTitle>
<div class="subject" v-for="(item, index) in zjFirstSubjectModelList" :key="index">
<p>{{item.name}} <span v-show="item.titleCode">（{{item.titleCode}}）</span></p>
<ul class="item-wrapper">
<li v-if="true" class="item">
<li @click="coopDetails(item.secondSubjectModelList[0], 1)" v-if="item.secondSubjectModelList[0].projectId && item.secondSubjectModelList[0].openFlag" class="item">
<img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span>
<img class="buy" src="../images/course/icon-buy.png" alt="">
</li>
<li v-if="true" class="item">
<img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span>
<img class="buy" src="../images/course/icon-buy.png" alt="">
<img v-if="item.secondSubjectModelList[0].bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li>
</ul>
</div>
</article>
<article class="page-content-list">
<CommonImgTitle imgType=2></CommonImgTitle>
<div class="subject">
<p>肾内科学（304955）</p>
<ul class="item-wrapper">
<li v-if="true" class="item">
<div class="top">
<img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span>
<li v-else class="item-pre">
<div class="pre">
<img src="../images/course/icon-kc-2.png" alt="">
<span class="pre">课程</span>
</div>
<p>2020年10月上线</p>
</li>
<li v-if="true" class="item">
<img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span>
</li>
</ul>
</div>
<div class="subject">
<p>肾内科学（304955）</p>
<ul class="item-wrapper">
<li v-if="true" class="item">
<img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span>
</li>
<li v-if="true" class="item">
<li @click="coopDetails(item.secondSubjectModelList[0], 2)" v-if="item.secondSubjectModelList[0].directoryList.length" class="item tk">
<img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span>
<img v-if="item.secondSubjectModelList[0].bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li>
</ul>
</div>
</article>
<!-- 修复一个神奇的bug：底部与背景色重叠 -->
<div style="height: 1px;background: #F8F9FA;"></div>
<div style="height: 10px;background: #F8F9FA;"></div>
</section>
<transition name="fade">
......@@ -118,7 +98,8 @@ import CommonImgTitle from "@/components/course/common-img-title";
import { mapGetters, mapActions } from "vuex";
import { getWebPageUrl, parseTime } from "@/utils/index";
import { Toast } from "vant";
let zjListOffsetTop = 0;
let screenHeight = 667;
export default {
data() {
return {
......@@ -141,36 +122,9 @@ export default {
token: "",
userMobile: "",
needShowBackup: false,
listData: [
{
name: "中医",
list: [
{ name: "全科中医", code: 201, bindStatus: 0 },
{ name: "中医内科学中医内科学", code: 201, bindStatus: 0 },
{ name: "全科中医", code: 201, bindStatus: 0 }
]
},
{
name: "妇科",
list: [
{ name: "妇产科学", code: 201, bindStatus: 0 },
{ name: "中医内科学中医内科学", code: 201, bindStatus: 0 },
{ name: "全科中医", code: 201, bindStatus: 0 }
]
},
{
name: "内科",
list: [
{ name: "肾内科学", code: 201, bindStatus: 0 },
{
name: "肾内科学肾内科学肾内科学肾内科学",
code: 201,
bindStatus: 0
},
{ name: "全科中医", code: 201, bindStatus: 0 }
]
}
],
listData: [],
zjFirstSubjectModelList: [],
gjFirstSubjectModelList: [],
isInfresh: false,
hasLogin: false,
hasResetPosition: false
......@@ -210,7 +164,11 @@ export default {
},
mounted() {
this.listData = [];
zjListOffsetTop = this.$refs['zjListRef'].offsetTop;
screenHeight = screen.height;
console.log('zjListOffsetTop, screenHeight', zjListOffsetTop, screenHeight);
// zjListRef
// this.listData = [];
// this.currentModelIndex = 0;
},
......@@ -219,11 +177,16 @@ export default {
// 切换列表, 滚动到列表指定位置
changeTab(index) {
if(index == 1) {
window.scrollTo(0, 0);
} else {
window.scrollTo(0, zjListOffsetTop + screenHeight);
}
this.tabIndex = index;
},
// 跳转到项目页面或课程
coopDetails(item) {
coopDetails(item, type) {
if (item.openFlag == 0) return;
this.$sendBuriedData({
component_tag: `886#8864#${item.id}#${item.name}` //'210#210002#0#'+item.projectName
......@@ -231,12 +194,21 @@ export default {
// 临时添加
if (window.__isWeb) {
this.$router.push({
path: "/coop",
query: {
id: item.projectId
}
});
if(type == 1) {
this.$router.push({
path: "/coop",
query: {
id: item.projectId
}
});
} else {
this.$router.push({
path: "/question-bank",
query: {
secondSubjectId: item.id
}
});
}
return;
}
......@@ -248,10 +220,14 @@ export default {
return;
}
let pageUrl = getWebPageUrl(`profexam/#/coop?id=${item.projectId}`);
if(type == 2) {
pageUrl = getWebPageUrl(`profexam/#/question-bank?secondSubjectId=${item.id}`)
}
let paramList = [
{
key: "pageUrl",
value: getWebPageUrl(`profexam/#/coop?id=${item.projectId}`),
value: pageUrl,
type: 4,
seqNo: 1
}
......@@ -282,19 +258,19 @@ export default {
if (res.code == "000000") {
this.existBind = res.data.existBind || 0;
this.titleTestModelList = res.data.titleTestModelList || [];
let len = this.titleTestModelList.length > 0 ? (this.titleTestModelList.length - 1) : 0;
// 如果有绑定的卡，并且之前没有做定位，则进行定位
if (this.existBind && !this.hasResetPosition) {
this.hasResetPosition = true;
this.resetPosition(this.titleTestModelList);
// 否则直接使用当前的位置信息
} else {
this.listData =
res.data.titleTestModelList[
len
].firstSubjectModelList;
this.currentModelIndex = len;
}
this.zjFirstSubjectModelList = res.data.titleTestModelList[0].firstSubjectModelList || [];
this.gjFirstSubjectModelList = res.data.titleTestModelList[2].firstSubjectModelList || [];
// let len = this.titleTestModelList.length > 0 ? (this.titleTestModelList.length - 1) : 0;
// // 如果有绑定的卡，并且之前没有做定位，则进行定位
// if (this.existBind && !this.hasResetPosition) {
// this.hasResetPosition = true;
// this.resetPosition(this.titleTestModelList);
// // 否则直接使用当前的位置信息
// } else {
// this.listData = res.data.titleTestModelList[len].firstSubjectModelList;
// this.currentModelIndex = len;
// }
} else {
this.$toast(res.message);
}
......@@ -324,8 +300,7 @@ export default {
}
}
this.currentModelIndex = parentIndex;
this.listData =
this.titleTestModelList[parentIndex].firstSubjectModelList || [];
this.listData = this.titleTestModelList[parentIndex].firstSubjectModelList || [];
this.$forceUpdate();
this.resetProjectPosition(fIndex, subIndex);
},
......@@ -345,11 +320,23 @@ export default {
// 监听滚动事件
scrollFun() {
let scrollTop = window.scrollY;
if(scrollTop + screenHeight - 20 > zjListOffsetTop) {
this.tabIndex = 2;
} else {
this.tabIndex = 1;
}
if (scrollTop >= 500) {
this.needShowBackup = true;
} else {
this.needShowBackup = false;
}
this.$nextTick( () => {
if(window.scrollY <= 5) {
this.tabIndex = 1;
}
})
},
// 滚动到顶部
......@@ -407,7 +394,7 @@ export default {
background: #F8F9FA;
.page-content {
// padding-top: 155px;
min-height: 100vh;
// min-height: 100vh;
&-table {
position: fixed;
top: 64px;
......@@ -455,14 +442,16 @@ export default {
}
}
&-list {
margin: 65px 15px 30px;
margin: 0 15px 10px;
padding: 0 15px;
background: #fff;
height: 700px;
padding-bottom: 10px;
border-radius: 6px;
// height: 700px;
.subject {
// padding-bottom: 10px;
& > p {
height: 40px;
line-height: 40px;
padding: 5px 0 10px;
font-size: 16px;
font-weight: 700;
color: #333333;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或