diff --git a/pages.json b/pages.json index c3d45db..3cafc34 100644 --- a/pages.json +++ b/pages.json @@ -1231,6 +1231,13 @@ "enablePullDownRefresh": true, "navigationBarTitleText": "商家教程" } + },{ + "path": "lookVideo", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "navigationBarTitleText": "观看视频" + } }] }, { diff --git a/pages/merchantTutorial/lookVideo.vue b/pages/merchantTutorial/lookVideo.vue new file mode 100644 index 0000000..06b314f --- /dev/null +++ b/pages/merchantTutorial/lookVideo.vue @@ -0,0 +1,141 @@ + + + + diff --git a/pages/merchantTutorial/tutorial.vue b/pages/merchantTutorial/tutorial.vue index 73da2b7..5ffcc78 100644 --- a/pages/merchantTutorial/tutorial.vue +++ b/pages/merchantTutorial/tutorial.vue @@ -20,14 +20,15 @@ bar-width="55" bar-height="6" :current="current" @change="change"> - + {{a.course_name}} - {{a.course_detail}} + {{a.course_subheading}} @@ -103,12 +104,15 @@ this.current = index; this.getCourseList() }, - onLookCord(url) { + onLookCord(url, title) { if (url) { - this.show = true; - let videoContext = wx.createVideoContext('myVideo') - videoContext.seek(0); - this.video_url = url + uni.navigateTo({ + url: "/pages/merchantTutorial/lookVideo?url=" + url + "&title=" + title + }) + // this.show = true; + // let videoContext = wx.createVideoContext('myVideo') + // videoContext.seek(0); + // this.video_url = url } else { this.$toast('暂无可观看的视频') } @@ -230,8 +234,8 @@ border-radius: 28rpx; background: linear-gradient(135deg, rgba(255, 255, 255, 0.08) 0%, rgba(250, 177, 173, 0.07) 59.66%, rgba(243, 74, 64, 0.06) 100%); display: flex; - align-items: center; - padding: 30rpx 20rpx; + // align-items: center; + padding: 20rpx; margin-bottom: 50rpx; .look { @@ -283,12 +287,13 @@ /* 超出部分显示省略号 */ white-space: normal; /* 使用正常的白空格处理方式,允许换行 */ + margin-top: 5rpx; } .subtitle { margin-top: 10rpx; /** 文本1 */ - font-size: 26rpx; + font-size: 28rpx; font-weight: 400; letter-spacing: 0rpx; color: rgba(102, 102, 102, 1); diff --git a/pages/news1/MerchantSettlement.vue b/pages/news1/MerchantSettlement.vue index 3985b63..7f3c936 100644 --- a/pages/news1/MerchantSettlement.vue +++ b/pages/news1/MerchantSettlement.vue @@ -519,7 +519,7 @@ page { font-size: 26upx; font-family: PingFang SC, PingFang SC; font-weight: 500; - color: #FF4C3C; + color: #002280; width: 236upx; } diff --git a/pages/news3/JoinDistribution.vue b/pages/news3/JoinDistribution.vue index 3c4cd66..c9aeed9 100644 --- a/pages/news3/JoinDistribution.vue +++ b/pages/news3/JoinDistribution.vue @@ -70,10 +70,10 @@ 我的团队 - +