Skip to content

T
transport-show-h5
提交 f04204de authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

上级 b8fc6c3f 09e6f9ca
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 57 行删除
src/pages/course/learn/courseChapter.vue
浏览文件 @ f04204de
......@@ -6,11 +6,10 @@
<van-icon name="arrow-down" />
</template>
<ul>
<li
v-for="subItem in item.children"
:key="subItem.id"
@click="onClick(subItem)"
>{{subItem.name}}</li>
<li v-for="subItem in item.children" :key="subItem.id" @click="onClick(subItem)">
<div class="name">{{subItem.name}}</div>
<div class="progress">{{subItem.video_progress | progressText}}</div>
</li>
</ul>
</van-collapse-item>
</van-collapse>
......@@ -35,6 +34,12 @@ export default {
return this.$store.state.isWeapp
}
},
filters: {
progressText(value) {
value = parseInt(value)
return value === 100 ? '已学完' : `${value}%`
}
},
methods: {
onClick(data) {
if (this.isWeapp) {
......@@ -65,13 +70,21 @@ export default {
display: none;
}
li {
display: flex;
padding: 10px 0;
font-size: 13px;
&:first-child {
padding-top: 0;
}
&:last-child {
padding-bottom: 20px;
}
.name {
flex: 1;
font-size: 13px;
overflow: hidden;
}
.progress {
font-size: 12px;
}
}
</style>
src/pages/course/learn/index.vue
浏览文件 @ f04204de
<template>
<div class="main-container">
<course-item v-for="item in courseList" :data="item" :key="item.course_id"></course-item>
<div class="main-container" v-show="loaded">
<template v-if="list.length">
<course-item v-for="item in list" :data="item" :key="item.course_id" />
</template>
<van-empty description="暂无内容" v-else />
</div>
</template>
......@@ -16,14 +19,20 @@ export default {
},
data() {
return {
courseList: []
loaded: false,
list: []
}
},
methods: {
getCourseList() {
api.getCourseList().then(response => {
this.courseList = response
})
api
.getCourseList()
.then(response => {
this.list = response
})
.finally(() => {
this.loaded = true
})
}
},
beforeMount() {
......
src/pages/course/tag/item.vue
浏览文件 @ f04204de
......@@ -11,7 +11,7 @@
<div class="inner">
<ul>
<li @click="toExamPage">去测试</li>
<li @click="toExamPage" v-if="detail.has_video">相关视频</li>
<li @click="toCourseVideo" v-if="detail.has_video">相关视频</li>
</ul>
<ul>
<li @click="getCourseTag(detail.last)" v-if="detail.last">上一点</li>
......@@ -74,6 +74,16 @@ export default {
} else {
this.$router.push({ path })
}
},
// 去课程视频页面
toCourseVideo() {
if (this.isWeapp) {
wx.miniProgram.navigateTo({
url: `/pages/course/item?id=${this.detail.course_id}&chapter_id=${this.detail.section_id}`
})
} else {
window.alert('请在微信小程序中打开')
}
}
},
beforeMount() {
......
src/pages/course/tag/tagMessage.vue
浏览文件 @ f04204de
......@@ -89,7 +89,7 @@ export default {
toCourseVideo() {
if (this.isWeapp) {
wx.miniProgram.navigateTo({
url: `/pages/course/item?id=${this.courseId}`
url: `/pages/course/item?id=${this.data.course_id}&chapter_id=${this.data.section_id}`
})
} else {
window.alert('请在微信小程序中打开')
......
src/pages/my/alarm/index.vue
浏览文件 @ f04204de
<template>
<div class="list">
<alarm-item
v-for="item in list"
:data="item"
:key="item.id"
@click-edit="onUpdate"
@update="refersh"
></alarm-item>
<div class="main-container" v-show="loaded">
<template v-if="list.length">
<alarm-item
v-for="item in list"
:data="item"
:key="item.id"
@click-edit="onUpdate"
@update="refersh"
></alarm-item>
</template>
<van-empty description="暂无内容" v-else />
<div class="add-button">
<div class="inner" @click="popupVisible = true"></div>
</div>
......@@ -41,6 +44,7 @@ export default {
},
data() {
return {
loaded: false,
list: [],
popupVisible: false,
isUpdate: false,
......@@ -57,9 +61,14 @@ export default {
},
// 获取提醒列表
getAlarmList() {
api.getAlarmList().then(response => {
this.list = response
})
api
.getAlarmList()
.then(response => {
this.list = response
})
.finally(() => {
this.loaded = true
})
},
refersh() {
this.getAlarmList()
......@@ -86,9 +95,8 @@ export default {
</script>
<style lang="scss" scoped>
.list {
.main-container {
padding: 20px 0;
margin: 0 20px;
}
.add-button {
height: 64px;
......
src/pages/my/buyCourses.vue
浏览文件 @ f04204de
<template>
<div class="main-container">
<ul>
<li class="order-item" v-for="(item, index) in order" :key="index">
<div class="main-container" v-show="loaded">
<ul v-if="list.length">
<li class="order-item" v-for="(item, index) in list" :key="index">
<div class="order-info">
<div class="no-c"></div>
<img :src="item.product_image" />
......@@ -22,6 +22,7 @@
</div>
</li>
</ul>
<van-empty description="暂无内容" v-else />
</div>
</template>
<script>
......@@ -32,7 +33,8 @@ export default {
},
data() {
return {
order: [],
loaded: false,
list: [],
orderTime: null,
goFlag: true
}
......@@ -72,11 +74,16 @@ export default {
}
},
getMyOrder() {
api.getMyOrder().then(res => {
if (res.code === 0) {
this.order = res.data.orders
}
})
api
.getMyOrder()
.then(res => {
if (res.code === 0) {
this.list = res.data.orders
}
})
.finally(() => {
this.loaded = true
})
},
goBuy(data) {
if (this.goFlag) {
......@@ -98,8 +105,8 @@ export default {
</script>
<style lang="scss" scoped>
.main-container {
ul{
padding-top: .4rem;
ul {
padding-top: 0.4rem;
padding-bottom: env(safe-area-inset-bottom);
}
.order-item {
......@@ -107,7 +114,7 @@ export default {
}
.order-info {
position: relative;
.no-c{
.no-c {
position: absolute;
top: 0;
left: 0;
......@@ -144,16 +151,16 @@ export default {
margin-left: auto;
font-weight: bold;
}
.invo{
font-size: .3rem;
.invo {
font-size: 0.3rem;
margin-left: auto;
}
.col {
color: #ff6767;
font-size: 0.3rem;
}
.mar{
margin-left: .3rem;
.mar {
margin-left: 0.3rem;
}
}
}
......
src/pages/my/learn/components/buyCourseList.vue
浏览文件 @ f04204de
......@@ -6,9 +6,7 @@
<div class="progress">{{item.video_progress | progressText}}</div>
</li>
</ul>
<template v-else>
<slot name="empty"></slot>
</template>
<van-empty description="暂无内容" v-else />
</div>
</template>
<script>
......@@ -21,6 +19,11 @@ export default {
list: []
}
},
computed: {
isWeapp() {
return this.$store.state.isWeapp
}
},
filters: {
progressText(value) {
value = parseInt(value)
......@@ -29,10 +32,14 @@ export default {
},
methods: {
getList() {
api.getCourseList().then(response => {
this.loaded = true
this.list = response
})
api
.getCourseList()
.then(response => {
this.list = response
})
.finally(() => {
this.loaded = true
})
},
onClick(data) {
if (this.isWeapp) {
......
src/pages/my/learn/components/freeCourseList.vue
浏览文件 @ f04204de
......@@ -9,9 +9,7 @@
<div class="progress">{{item.video_progress | progressText}}</div>
</li>
</ul>
<template v-else>
<slot name="empty"></slot>
</template>
<van-empty description="暂无内容" v-else />
</div>
</template>
<script>
......@@ -24,6 +22,11 @@ export default {
list: []
}
},
computed: {
isWeapp() {
return this.$store.state.isWeapp
}
},
filters: {
progressText(value) {
value = parseInt(value)
......@@ -32,10 +35,14 @@ export default {
},
methods: {
getList() {
api.getFreeCourseList().then(response => {
this.loaded = true
this.list = response
})
api
.getFreeCourseList()
.then(response => {
this.list = response
})
.finally(() => {
this.loaded = true
})
},
onClick(data) {
if (this.isWeapp) {
......
src/pages/my/learn/index.vue
浏览文件 @ f04204de
......@@ -103,6 +103,7 @@ export default {
font-size: 15px;
background-color: #2b7ce9;
border-radius: 6px;
border: 0;
}
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论