Skip to content

T
transport-show-h5
提交 bbf83e78 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

feat: 主题颜色修改

上级 99769095
隐藏空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 143 行删除
.gitignore
浏览文件 @ bbf83e78
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
node_modules node_modules
npm-debug.log npm-debug.log
upload_tmp upload_tmp
node_modules/ *
# code protect - prevent submit code below # code protect - prevent submit code below
\ No newline at end of file /dist
/client-dist
src/components/Card.vue
浏览文件 @ bbf83e78
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
font-weight: bold; font-weight: bold;
line-height: 1; line-height: 1;
color: #333; color: #333;
border-bottom: 0.06rem solid #2b7ce9; border-bottom: 0.06rem solid #c62245;
} }
.card-bd { .card-bd {
padding: 0.2rem 0; padding: 0.2rem 0;
......
src/pages/course/learn/index.vue
浏览文件 @ bbf83e78
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
name: 'Course', name: 'Course',
components: { CourseItem }, components: { CourseItem },
metaInfo: { metaInfo: {
title: '课程学习' title: 'VIP课程'
}, },
data() { data() {
return { return {
......
src/pages/course/tag/home.vue
浏览文件 @ bbf83e78
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
name: 'Course', name: 'Course',
components: { CourseItem }, components: { CourseItem },
metaInfo: { metaInfo: {
title: '课程学习' title: '考点突击'
}, },
data() { data() {
return { return {
......
src/pages/course/tag/item.vue
浏览文件 @ bbf83e78
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
font-size: 13px; font-size: 13px;
color: #fff; color: #fff;
line-height: 35px; line-height: 35px;
background: #2b7ce9; background: #c62245;
border-radius: 6px; border-radius: 6px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
......
src/pages/course/tag/searchTagMessage.vue
浏览文件 @ bbf83e78
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
min-width: 24px; min-width: 24px;
} }
.text { .text {
border-bottom: 1px solid #2b7ce9; border-bottom: 1px solid #c62245;
cursor: pointer; cursor: pointer;
} }
} }
......
src/pages/courseExam/index.vue
浏览文件 @ bbf83e78
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
:key="index" :key="index"
@click="tab(index)" @click="tab(index)"
v-for="(item, index) in tabNav.navText" v-for="(item, index) in tabNav.navText"
> >{{ item }}</li>
{{ item }}
</li>
</ul> </ul>
</div> </div>
<div class="tab-con" id="bottom-view"> <div class="tab-con" id="bottom-view">
...@@ -28,7 +26,7 @@ ...@@ -28,7 +26,7 @@
<div class="comp"> <div class="comp">
<div class="btn" @click="abilityExam">开始测试</div> <div class="btn" @click="abilityExam">开始测试</div>
</div> </div>
</div> --> </div>-->
<div v-show="tabNav.navIndex == 0" class="tab2"> <div v-show="tabNav.navIndex == 0" class="tab2">
<ul class="ul"> <ul class="ul">
<template v-for="(item, index) in CourseChapter"> <template v-for="(item, index) in CourseChapter">
...@@ -36,11 +34,11 @@ ...@@ -36,11 +34,11 @@
<div class="parent"> <div class="parent">
<div class="title">{{ item.course_name }}</div> <div class="title">{{ item.course_name }}</div>
<template v-if="item.isShow"> <template v-if="item.isShow">
<van-icon v-if="item.isShow === false" name="arrow" class="arrow"/> <van-icon v-if="item.isShow === false" name="arrow" class="arrow" />
<van-icon v-else name="arrow-down" class="arrow"/> <van-icon v-else name="arrow-down" class="arrow" />
</template> </template>
<template v-else> <template v-else>
<van-icon name="arrow" class="arrow"/> <van-icon name="arrow" class="arrow" />
</template> </template>
</div> </div>
<div :class="item.isShow === undefined ? 'hide' : item.isShow ? 'show' : 'hide'"> <div :class="item.isShow === undefined ? 'hide' : item.isShow ? 'show' : 'hide'">
...@@ -49,11 +47,27 @@ ...@@ -49,11 +47,27 @@
<li> <li>
<div class="txt">{{ cItem.children[0].name }}</div> <div class="txt">{{ cItem.children[0].name }}</div>
<div class="btn-box"> <div class="btn-box">
<div v-if="cItem.children[0].status == 100" @click="startExam($event, cItem.children[0].id, item.course_id, 1)" class="tag">测试</div> <div
<div v-if="cItem.children[0].status == 0 || cItem.children[0].status == 3" @click="startExam($event, cItem.children[0].id, item.course_id, 0)" class="tag">继续测试</div> v-if="cItem.children[0].status == 100"
<template v-if="cItem.children[0].status == 1 || cItem.children[0].status == 2"> @click="startExam($event, cItem.children[0].id, item.course_id, 1)"
<div @click="startExam($event, cItem.children[0].id, item.course_id, 1)" class="tag">重新测试</div> class="tag"
<div @click="viewReport($event, cItem.children[0].id, item.course_id, 0)" class="tag">报告</div> >测试</div>
<div
v-if="cItem.children[0].status == 0 || cItem.children[0].status == 3"
@click="startExam($event, cItem.children[0].id, item.course_id, 0)"
class="tag"
>继续测试</div>
<template
v-if="cItem.children[0].status == 1 || cItem.children[0].status == 2"
>
<div
@click="startExam($event, cItem.children[0].id, item.course_id, 1)"
class="tag"
>重新测试</div>
<div
@click="viewReport($event, cItem.children[0].id, item.course_id, 0)"
class="tag"
>报告</div>
</template> </template>
</div> </div>
</li> </li>
...@@ -69,7 +83,7 @@ ...@@ -69,7 +83,7 @@
<template v-for="(item, index) in courseList"> <template v-for="(item, index) in courseList">
<li :key="index" @click="courseNodeDetail(item.course_id)"> <li :key="index" @click="courseNodeDetail(item.course_id)">
<div class="tit">{{ item.course_name }}</div> <div class="tit">{{ item.course_name }}</div>
<van-icon name="arrow" class="arr"/> <van-icon name="arrow" class="arr" />
</li> </li>
</template> </template>
</ul> </ul>
...@@ -125,7 +139,7 @@ export default { ...@@ -125,7 +139,7 @@ export default {
return this.$store.state.isWeapp return this.$store.state.isWeapp
} }
}, },
metaInfo () { metaInfo() {
return { return {
title: '课程测验', title: '课程测验',
meta: [ meta: [
...@@ -320,11 +334,11 @@ export default { ...@@ -320,11 +334,11 @@ export default {
const topViewH = document.getElementById('top-view').offsetHeight const topViewH = document.getElementById('top-view').offsetHeight
const clientHeight = document.documentElement.clientHeight const clientHeight = document.documentElement.clientHeight
const bottomView = document.getElementById('bottom-view') const bottomView = document.getElementById('bottom-view')
bottomView.style.height = (clientHeight - topViewH) + 'px' bottomView.style.height = clientHeight - topViewH + 'px'
}, },
listFold(e) { listFold(e) {
if (e.isShow !== undefined) { if (e.isShow !== undefined) {
e.isShow ? e.isShow = false : e.isShow = true e.isShow ? (e.isShow = false) : (e.isShow = true)
} else { } else {
e.isShow = true e.isShow = true
} }
...@@ -340,136 +354,136 @@ export default { ...@@ -340,136 +354,136 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.course-box{ .course-box {
// padding: 0 .4rem; // padding: 0 .4rem;
.tab-nav{ .tab-nav {
height: 1.1rem; height: 1.1rem;
padding: 0 .4rem; padding: 0 0.4rem;
ul{ ul {
border-bottom: .01rem solid #EEEEEE; border-bottom: 0.01rem solid #eeeeee;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
li{ li {
line-height: 1.1rem; line-height: 1.1rem;
font-size: .3rem; font-size: 0.3rem;
color:#999999; color: #999999;
flex: 1; flex: 1;
text-align: center; text-align: center;
} }
li.active{ li.active {
color: #222; color: #222;
font-weight: bold; font-weight: bold;
border-bottom: .02rem solid #2B7CE9; border-bottom: 0.02rem solid #c62245;
} }
} }
} }
.tab-con{ .tab-con {
overflow-y: scroll; overflow-y: scroll;
// padding-bottom: 1rem; // padding-bottom: 1rem;
.tab1{ .tab1 {
// padding-top: .2rem; // padding-top: .2rem;
padding: .2rem .4rem 1rem .4rem; padding: 0.2rem 0.4rem 1rem 0.4rem;
.txt{ .txt {
font-size: .26rem; font-size: 0.26rem;
color: #222; color: #222;
line-height: .26ren; line-height: 0.26ren;
} }
.comp{ .comp {
position: fixed; position: fixed;
bottom: .15rem; bottom: 0.15rem;
left: 50%; left: 50%;
-webkit-transform: translateX(-50%); -webkit-transform: translateX(-50%);
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
} }
.btn{ .btn {
width:6.7rem; width: 6.7rem;
height:.7rem; height: 0.7rem;
background:rgba(255,103,103,1); background: rgba(255, 103, 103, 1);
border-radius:.12rem; border-radius: 0.12rem;
text-align: center; text-align: center;
line-height: .7rem; line-height: 0.7rem;
color: #fff; color: #fff;
font-size: .3rem; font-size: 0.3rem;
} }
.title{ .title {
font-size:.4rem; font-size: 0.4rem;
font-weight:bold; font-weight: bold;
color:rgba(255,103,103,1); color: rgba(255, 103, 103, 1);
line-height: 100%; line-height: 100%;
padding-top: .2rem; padding-top: 0.2rem;
text-align: center; text-align: center;
} }
img{ img {
width: 5.01rem; width: 5.01rem;
height: 3.98rem; height: 3.98rem;
display: block; display: block;
margin: 0.2rem auto 0 auto; margin: 0.2rem auto 0 auto;
} }
p{ p {
line-height: 100%; line-height: 100%;
font-size: .26rem; font-size: 0.26rem;
color: #222; color: #222;
text-align: center; text-align: center;
} }
.tx{ .tx {
margin-top: .2rem; margin-top: 0.2rem;
} }
.ti{ .ti {
font-size: .3rem; font-size: 0.3rem;
margin: .4rem 0 .2rem 0; margin: 0.4rem 0 0.2rem 0;
font-weight: bold; font-weight: bold;
} }
.ti2{ .ti2 {
font-size: .3rem; font-size: 0.3rem;
font-weight: bold; font-weight: bold;
margin-top: .4rem; margin-top: 0.4rem;
} }
} }
.tab2{ .tab2 {
.ul{ .ul {
padding: 0 .4rem; padding: 0 0.4rem;
li{ li {
.parent{ .parent {
display: flex; display: flex;
border-bottom: .01rem solid #EEEEEE; border-bottom: 0.01rem solid #eeeeee;
padding: 0.4rem 0; padding: 0.4rem 0;
align-items: center; align-items: center;
.title{ .title {
font-size: .3rem; font-size: 0.3rem;
color: #222222; color: #222222;
font-weight: bold; font-weight: bold;
} }
.arrow{ .arrow {
margin-left: auto; margin-left: auto;
} }
} }
.hide{ .hide {
display: none; display: none;
} }
.show{ .show {
display: block; display: block;
} }
ul{ ul {
li{ li {
display: flex; display: flex;
border-bottom: .01rem solid #EEEEEE; border-bottom: 0.01rem solid #eeeeee;
padding: 0.4rem 0; padding: 0.4rem 0;
.txt{ .txt {
font-size: .26rem; font-size: 0.26rem;
color: #999999; color: #999999;
} }
.btn-box{ .btn-box {
margin-left: auto; margin-left: auto;
display: flex; display: flex;
.tag{ .tag {
line-height: .46rem; line-height: 0.46rem;
height: .46rem; height: 0.46rem;
font-size: .26rem; font-size: 0.26rem;
color: #fff; color: #fff;
padding: 0 .3rem; padding: 0 0.3rem;
margin-left: .2rem; margin-left: 0.2rem;
background: #67A8FF; background: #67a8ff;
border-radius: .25rem; border-radius: 0.25rem;
white-space: nowrap; white-space: nowrap;
} }
} }
...@@ -478,21 +492,21 @@ export default { ...@@ -478,21 +492,21 @@ export default {
} }
} }
} }
.tab3{ .tab3 {
ul{ ul {
padding:0 .4rem; padding: 0 0.4rem;
li{ li {
display: flex; display: flex;
padding: .4rem 0; padding: 0.4rem 0;
border-bottom: .01rem solid #eee; border-bottom: 0.01rem solid #eee;
align-items: center; align-items: center;
.tit{ .tit {
width: 6.15rem; width: 6.15rem;
color: rgba(34,34,34,1); color: rgba(34, 34, 34, 1);
font-size: .3rem; font-size: 0.3rem;
font-weight: bold; font-weight: bold;
} }
.arr{ .arr {
margin-left: auto; margin-left: auto;
} }
} }
...@@ -500,52 +514,52 @@ export default { ...@@ -500,52 +514,52 @@ export default {
} }
} }
} }
.exam_submit{ .exam_submit {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
z-index: 999999; z-index: 999999;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(0,0,0,0.6); background: rgba(0, 0, 0, 0.6);
.pop{ .pop {
width: 5.9rem; width: 5.9rem;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
-webkit-transform: translate(-50%,-50%); -webkit-transform: translate(-50%, -50%);
background:rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
border-radius:.12rem; border-radius: 0.12rem;
padding: 0.4rem 0; padding: 0.4rem 0;
.tit{ .tit {
font-weight:bold; font-weight: bold;
color:rgba(34,34,34,1); color: rgba(34, 34, 34, 1);
font-size:.3rem; font-size: 0.3rem;
text-align: center; text-align: center;
line-height: 100%; line-height: 100%;
} }
.txt{ .txt {
color:rgba(34,34,34,1); color: rgba(34, 34, 34, 1);
font-size:.3rem; font-size: 0.3rem;
text-align: center; text-align: center;
line-height: 100%; line-height: 100%;
margin-top: .8rem; margin-top: 0.8rem;
} }
.btn_box{ .btn_box {
padding:0 0.2rem; padding: 0 0.2rem;
display: flex; display: flex;
margin-top: .8rem; margin-top: 0.8rem;
.btn{ .btn {
width:2.6rem; width: 2.6rem;
height:.7rem; height: 0.7rem;
background:rgba(43,124,233,1); background: rgba(43, 124, 233, 1);
border-radius:.12rem; border-radius: 0.12rem;
text-align: center; text-align: center;
line-height: .7rem; line-height: 0.7rem;
color: #fff; color: #fff;
font-size: .3rem; font-size: 0.3rem;
} }
.btn2{ .btn2 {
margin-left: auto; margin-left: auto;
} }
} }
......
src/pages/home/index.vue
浏览文件 @ bbf83e78
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
display: inline-block; display: inline-block;
padding: 0 0.05rem; padding: 0 0.05rem;
font-size: 0.2rem; font-size: 0.2rem;
color: #2b7ce9; color: #c62245;
line-height: 0.28rem; line-height: 0.28rem;
background-color: #e9f1fc; background-color: #e9f1fc;
border-radius: 0.06rem; border-radius: 0.06rem;
......
src/pages/login/login.vue
浏览文件 @ bbf83e78
...@@ -229,8 +229,8 @@ export default { ...@@ -229,8 +229,8 @@ export default {
.login-title { .login-title {
display: inline-block; display: inline-block;
font-size: 24px; font-size: 24px;
color: #2b7ce9; color: #c62245;
border-bottom: 5px solid #2b7ce9; border-bottom: 5px solid #c62245;
} }
.login-bd { .login-bd {
margin-top: 20px; margin-top: 20px;
......
src/pages/my/alarm/components/alarmItem.vue
浏览文件 @ bbf83e78
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<van-switch <van-switch
v-model="checked" v-model="checked"
size="18px" size="18px"
active-color="#2B7CE9" active-color="#C62245"
:loading="switchLoading" :loading="switchLoading"
@change="onChange" @change="onChange"
/> />
...@@ -51,9 +51,7 @@ export default { ...@@ -51,9 +51,7 @@ export default {
} else if (type === 3) { } else if (type === 3) {
return '工作日' return '工作日'
} else { } else {
return this.selectedWeek.length return this.selectedWeek.length ? '每周' + this.selectedWeek.join('、') : '永不'
? '每周' + this.selectedWeek.join('、')
: '永不'
} }
}, },
selectedWeek() { selectedWeek() {
......
src/pages/my/alarm/components/update.vue
浏览文件 @ bbf83e78
...@@ -61,9 +61,7 @@ export default { ...@@ -61,9 +61,7 @@ export default {
return return
} }
const weeks = data.week_json ? JSON.parse(data.week_json) : [] const weeks = data.week_json ? JSON.parse(data.week_json) : []
this.defaultIndex = this.timeColumns.findIndex( this.defaultIndex = this.timeColumns.findIndex(item => item === data.time)
item => item === data.time
)
this.ruleForm = Object.assign({}, this.ruleForm, data, { this.ruleForm = Object.assign({}, this.ruleForm, data, {
week_json: weeks week_json: weeks
}) })
...@@ -96,9 +94,7 @@ export default { ...@@ -96,9 +94,7 @@ export default {
} else if (this.selectedResultType === 3) { } else if (this.selectedResultType === 3) {
return '工作日' return '工作日'
} else { } else {
return this.selectedWeek.length return this.selectedWeek.length ? '每周' + this.selectedWeek.join('、') : '永不'
? '每周' + this.selectedWeek.join('、')
: '永不'
} }
}, },
selectedWeek() { selectedWeek() {
...@@ -224,7 +220,7 @@ export default { ...@@ -224,7 +220,7 @@ export default {
} }
} }
::v-deep .van-checkbox[aria-checked='true'] { ::v-deep .van-checkbox[aria-checked='true'] {
background-color: #2b7ce9; background-color: #c62245;
border: 0; border: 0;
.van-checkbox__label { .van-checkbox__label {
color: #fff; color: #fff;
...@@ -242,7 +238,7 @@ export default { ...@@ -242,7 +238,7 @@ export default {
display: block; display: block;
width: 100%; width: 100%;
height: 40px; height: 40px;
background-color: #2b7ce9; background-color: #c62245;
border: 0; border: 0;
border-radius: 6px; border-radius: 6px;
} }
......
src/pages/my/learn/index.vue
浏览文件 @ bbf83e78
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
line-height: 1; line-height: 1;
text-align: center; text-align: center;
&.is-active { &.is-active {
color: #2b7ce9; color: #c62245;
} }
} }
} }
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
height: 35px; height: 35px;
margin: 0 20px; margin: 0 20px;
font-size: 15px; font-size: 15px;
background-color: #2b7ce9; background-color: #c62245;
border-radius: 6px; border-radius: 6px;
border: 0; border: 0;
} }
......
src/pages/search/index.vue
浏览文件 @ bbf83e78
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<van-tabs <van-tabs
class="main-tabs" class="main-tabs"
v-model="tabActive" v-model="tabActive"
color="#2b7ce9" color="#C62245"
:line-height="2" :line-height="2"
:animated="true" :animated="true"
:swipeable="true" :swipeable="true"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论