From b295b7ef4a4670f18c749f534ba07c0f7c1d5905 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 6 Jun 2024 15:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=80=A7=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 15 +-
pages/course/courseSet.vue | 397 +++++++++++++++---
pages/course/illustrate - 副本.vue | 226 ++++++++++
pages/course/illustrate.vue | 369 +++++++++++-----
pages/course/index.vue | 7 +-
pages/course/outline.vue | 183 ++++++++
pages/peanut/home.vue | 12 +-
static/bg2.jpg | Bin 0 -> 8995 bytes
static/homeLogo.png | Bin 0 -> 30023 bytes
static/jianjieIcon.png | Bin 0 -> 10984 bytes
static/pageBg.jpg | Bin 0 -> 19867 bytes
static/priceIcon.png | Bin 0 -> 14911 bytes
static/shuomingIcon.png | Bin 0 -> 17489 bytes
static/videoF.jpg | Bin 0 -> 29490 bytes
uni_modules/uni-drawer/changelog.md | 13 +
.../components/uni-drawer/keypress.js | 45 ++
.../components/uni-drawer/uni-drawer.vue | 183 ++++++++
uni_modules/uni-drawer/package.json | 87 ++++
uni_modules/uni-drawer/readme.md | 10 +
19 files changed, 1382 insertions(+), 165 deletions(-)
create mode 100644 pages/course/illustrate - 副本.vue
create mode 100644 pages/course/outline.vue
create mode 100644 static/bg2.jpg
create mode 100644 static/homeLogo.png
create mode 100644 static/jianjieIcon.png
create mode 100644 static/pageBg.jpg
create mode 100644 static/priceIcon.png
create mode 100644 static/shuomingIcon.png
create mode 100644 static/videoF.jpg
create mode 100644 uni_modules/uni-drawer/changelog.md
create mode 100644 uni_modules/uni-drawer/components/uni-drawer/keypress.js
create mode 100644 uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
create mode 100644 uni_modules/uni-drawer/package.json
create mode 100644 uni_modules/uni-drawer/readme.md
diff --git a/pages.json b/pages.json
index 41c498a..d33e87b 100644
--- a/pages.json
+++ b/pages.json
@@ -252,7 +252,8 @@
"path" : "pages/course/courseDetail",
"style" :
{
- "navigationBarTitleText" : "课程详细"
+ "navigationBarTitleText" : "课程详细",
+ "enablePullDownRefresh": true
}
},
{
@@ -263,10 +264,18 @@
}
},
{
- "path" : "pages/course/illustrate",
+ "path" : "pages/course/illustrate",
"style" :
{
- "navigationBarTitleText" : "课程说明"
+ "navigationBarTitleText" : "课程说明",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path" : "pages/course/outline",
+ "style" :
+ {
+ "navigationBarTitleText" : "课程大纲"
}
}
],
diff --git a/pages/course/courseSet.vue b/pages/course/courseSet.vue
index e3f482a..313069c 100644
--- a/pages/course/courseSet.vue
+++ b/pages/course/courseSet.vue
@@ -2,17 +2,85 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 点击课程名称即可查看对应的课程说明
+
+
+
+
+
+
+
+ {{item1.title}}
+
+
+ {{item2.title}}
+
+
+ {{item3.title}}33
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/course/illustrate - 副本.vue b/pages/course/illustrate - 副本.vue
new file mode 100644
index 0000000..f9de287
--- /dev/null
+++ b/pages/course/illustrate - 副本.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+ 点击课程名称即可查看对应的课程说明
+
+
+
+
+
+
+
+ --- {{item1.title}}
+
+
+ --- --- {{item2.title}}
+
+
+ --- --- --- {{item3.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 超强树选择器、树组件、树插件、无限级联树、单选树、多选树、自定义样式树、树形选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/course/illustrate.vue b/pages/course/illustrate.vue
index f9de287..b01c585 100644
--- a/pages/course/illustrate.vue
+++ b/pages/course/illustrate.vue
@@ -2,73 +2,78 @@
-
+
+
+
-
- 点击课程名称即可查看对应的课程说明
-
-
-
-
-
-
-
- --- {{item1.title}}
-
-
- --- --- {{item2.title}}
-
-
- --- --- --- {{item3.title}}
+
+
+
+
+
+ 点击课程名称即可查看对应的课程说明
+
+
+
+
+
+
+
+ {{item1.title}}
+
+
+ {{item2.title}}
+
+
+ {{item3.title}}33
+
+
-
-
-
-
-
-
-
-
-
-
- 超强树选择器、树组件、树插件、无限级联树、单选树、多选树、自定义样式树、树形选择
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -92,9 +97,11 @@
// size: '100',
// }
treeList: [],
+ tagId: null,
pid: null,
- infopop: false,
- pupContent: {},
+
+ courseInfo: {},
+ poster:'../../static/videoF.jpg', //封面图
current: {
poster: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/music-a.png',
name: '致爱丽丝',
@@ -103,7 +110,12 @@
},
audioAction: {
method: 'pause'
- }
+ },
+ curId: null,
+ courseTitle: '',
+ showTemp:true,
+ videoContext:null,
+ videoUrl:'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4'
};
},
//第一次加载
@@ -111,23 +123,84 @@
// 隐藏原生的tabbar
uni.hideTabBar();
this.pid = e.pid
+ this.tagId = e.id
console.log(e, '------')
+ this.videoContext = uni.createVideoContext('myVideo')
},
computed: {
- ...mapState(['userInfo'])
- },
+ ...mapState(['userInfo']),
+ videoHTML() {
+ return ``
+ }
+ },
//页面显示
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
this.getData()
+ this.getCourseInfo(this.tagId)
+ },
+ onUnload() {
+ // #ifdef APP-PLUS
+ plus.screen.lockOrientation('portrait-primary'); // 清除横屏
+ // #endif
+ this.showTemp = true
+ this.videoContext = null
+ },
+ onPullDownRefresh(){
+ uni.stopPullDownRefresh()
},
components: {
// musicPlay
},
//方法
methods: {
- change() {},
+ showDrawer(e) {
+ this.$refs[e].open()
+ this.videoContext.pause()
+ this.showTemp = true
+ console.log(5555)
+ },
+ // 关闭窗口
+ closeDrawer(e) {
+ this.$refs[e].close()
+
+ },
+ changeD(e, type) {
+ // console.log((type === 'showRight' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+ this[type] = e
+ if(!e){
+ this.showTemp = false
+ console.log('关闭弹窗')
+ this.videoContext.play()
+ }
+
+ },
+ formatRichText(html) { //控制图片大小
+ let newContent = html.replace(/
]*>/gi, function (match, capture) {
+ match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+ match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+ match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+ return match;
+ });
+ newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
+ match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
+ 'max-width:100%;');
+ return match;
+ });
+ newContent = newContent.replace(/
]*\/>/gi, '');
+ newContent = newContent.replace(/\
{
if (res.code == 0 && res.course.id) {
- this.pupContent = res.course
+ this.courseInfo = res.course
+ this.courseTitle = this.courseInfo.title + '课程说明'
+ this.curId = id
+ if(this.courseInfo.mediaType == 1 && this.courseInfo.media != ''){
+ // this.videoUrl = this.courseInfo.media
+ // this.poster = this.videoUrl +
+ // "?x-oss-process=video/snapshot,t_0,f_jpg"
+ }else{
+ // this.videoUrl = ''
+ this.poster = ''
+ }
+
+ // console.log(id, 'id')
} else {
- this.pupContent = {}
+ this.courseInfo = {}
+ this.videoUrl = ''
+ this.poster = ''
}
}).catch(e => {
- console.log(e, '报错')
+ this.courseInfo = {}
+ this.courseTitle = ''
+ this.curId = null
+ this.poster = ''
+ this.videoUrl = ''
+ console.log(e, '课程详情报错')
});
- this.infopop = true
+ },
+ clickCourseInfo(item) {
+
+ this.getCourseInfo(item.id)
+ this.closeDrawer('showRight')
+ },
+ playEnd(){
+ this.showTemp = true
+ },
+ clickToPlay(){
+ this.showTemp = false
+ this.videoContext.play()
}
},
@@ -168,19 +275,22 @@
@import '@/style/mixin.scss';
::v-deep .containerBg {
- .uni-collapse-item__title-box {
- background-color: transparent !important;
+ // .uni-collapse-item__title-box {
+ // background-color: transparent !important;
+ // }
+
+ // .uni-collapse-item__title {
+ // background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%) !important;
+
+ // text {
+ // color: #fff !important;
+ // font-size: 28rpx !important;
+ // }
+ // }
+ #myVideo {
+ width: 100% !important;
}
-
- .uni-collapse-item__title {
- background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%) !important;
-
- text {
- color: #fff !important;
- font-size: 28rpx !important;
- }
- }
-
+ video{width: 100% !important; }
}
.infoBox {
@@ -201,24 +311,89 @@
.uni-collapse-item__title-text {
font-size: 30rpx;
}
- .proTitle{text-align: center; padding:20rpx 0 ; margin-bottom: 20rpx; color: #666; font-size: 28rpx;}
+
+ .videoTemp {
+ position: relative;
+
+ .u-icon {
+ position: absolute;
+ z-index: 2;
+ left: calc(50% - 40rpx);
+ top: calc(50% - 40rpx);
+ }
+
+ image {
+ width: 100%;
+ }
+ }
+
+ .videoTemp:before {
+ content: '';
+ display: block;
+ width: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+ height: 100%;
+ background-color: rgba(0, 0, 0, .5);
+ z-index: 1;
+ }
+
+
+ .proTitle {
+ text-align: center;
+ padding: 20rpx 0;
+ margin-top: 60rpx;
+ // margin-bottom: 20rpx;
+ color: #666;
+ font-size: 26rpx;
+ }
+
.sub1List {
background-color: #f7f7f7;
- padding-left: 20rpx;
+ // padding-left: 20rpx;
}
.content {
.item {
+ background-color: #fff;
line-height: 80rpx;
- font-size: 28rpx;
+ font-size: 26rpx;
color: #497387;
- border-bottom: 1px solid #dae8f0;
- }
- }
+ // border-bottom: 1px solid #dae8f0;
- #myVideo {
- width: 100%;
- }
+ text {
+ padding-left: 20rpx;
+ }
+ .item:last-child{
+ border-bottom: 0;
+ }
+ }
+
+ .item.active {
+ // background-color: #aed1ec;
+ color: #fff;
+ background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%) !important;
+ }
+ .textss{display: inline-block; width: 100%; border-bottom: 1px solid #ebeef5;}
+ .leve2{
+ .textss{padding-left: 20rpx;}
+ }
+ .leve2{
+ .textss{padding-left: 40rpx;}
+ }
+ .leve3{
+ .textss{padding-left: 60rpx;}
+ }
+ .leve4{
+ .textss{padding-left: 80rpx;}
+ }
+ }
+ // .textss:last-child{
+ // border-bottom: 0;
+ // }
+ .topRight{margin-right: 20rpx; font-size: 28rpx; display: flex;}
+
audio {
width: 100% !important;
diff --git a/pages/course/index.vue b/pages/course/index.vue
index f69210e..c299c74 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -2,7 +2,7 @@
- 课程说明
+ 课程说明
-
+
+
了解课程
@@ -301,7 +302,7 @@
padding: 0 20rpx;
}
- .curseSet{margin-right: 20rpx; font-size: 26rpx;}
+ .curseSet{margin-right: 20rpx; font-size: 28rpx; display: flex; align-items: center;}
.fixed {
position: fixed;
z-index: 1; width: 100%; background-color: #fff;
diff --git a/pages/course/outline.vue b/pages/course/outline.vue
new file mode 100644
index 0000000..d510cef
--- /dev/null
+++ b/pages/course/outline.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课程价格
+
+
+
+
+
+
+
+
+
+
+
+ 课程说明
+
+
+
+
+
+
+
+
+
+
+ 平台简介
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 43d8b86..cfc9458 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -4,7 +4,7 @@
-
+
我的课程
+
+
+ 学习大纲
+
太湖讲堂
@@ -25,11 +29,7 @@
吴门医述
-
-
-
- 学习大纲
-
+
diff --git a/static/bg2.jpg b/static/bg2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a23601b673787eaa1be5916a59c32010899d61ee
GIT binary patch
literal 8995
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
literal 0
HcmV?d00001
diff --git a/static/homeLogo.png b/static/homeLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..465da7e61885607dfe91ebe2d24f458408b03d25
GIT binary patch
literal 30023
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