From 8d39d98ac4eb44819a9b5bcce69ab3922e1b4f31 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 11 Jul 2024 16:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BB=8B=E7=BB=8D=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../commonComponents/video/index.vue | 33 +-
pages/course/courseDetail.vue | 4879 ++++++++---------
pages/course/index.vue | 1 +
pages/course/myCourse.vue | 13 +-
pages/mine/wallet/recharge/index.vue | 2 +-
pages/peanut/home.vue | 2 +-
utils/myIapCheck.js | 3 +-
7 files changed, 2460 insertions(+), 2473 deletions(-)
diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue
index 429d04c..d0cc53a 100644
--- a/pages/component/commonComponents/video/index.vue
+++ b/pages/component/commonComponents/video/index.vue
@@ -56,9 +56,10 @@
// importScripts('@/static/aliplayer/aliplayer-min.js')
export default {
- props: ["currentVideo", "currentVideoList"],
+ props: ["currentVideo", "currentVideoList",'noRecored'],
data() {
return {
+ // noRecored 为true时候不记录播放时长
//当前是否是全屏模式
isFullScreen: false,
isfresh: false,
@@ -75,6 +76,7 @@
isSetFirstTime: false,
screenType: null,
videoUrl: null,
+ num:0,
};
},
computed: {
@@ -98,7 +100,9 @@
// plus.screen.lockOrientation("portrait-primary");
// #endif
this.timer = null;
- await this.setVideoTime();
+
+ await this.setVideoTime();
+
this.player.dispose();
},
@@ -130,8 +134,8 @@
this.timer = setInterval(() => {
var that = this;
if (this.currentTime) {
- that.setVideoTime();
- console.log('我是onload定义的定时');
+
+ that.setVideoTime();
}
}, 60000);
@@ -189,12 +193,12 @@
var that = this;
if (this.currentTime) {
console.log('我是init定义的定时');
- await that.setVideoTime();
+ await that.setVideoTime();
}
}, 60000);
await this.getLive();
},
- async getData(data) {
+ async getData(data) {
if (!this.isSetFirstTime) {
var netWork = this.videoData.userCourseVideoPositionEntity ?
this.videoData.userCourseVideoPositionEntity.position :
@@ -218,8 +222,8 @@
}
}
this.currentTime = this.firstTime;
- console.log(this.firstTime, "这是第一次播放时长222");
- await this.setVideoTime();
+ console.log(this.firstTime, "这是第一次播放时长222",this.noRecored);
+ await this.setVideoTime();
uni.setStorageSync("videoOssList", JSON.stringify(list));
if (this.currentVideo.type == 0 || this.currentVideo.type == 2) {
@@ -309,10 +313,15 @@
var data = list.find((e) => e.id == this.videoData.id);
this.currentTime = data.time;
console.log('this.currentTime at line 这是结束的时候掉的存储视频:', this.currentTime)
- await this.setVideoTime();
+ await this.setVideoTime();
this.timer = null;
},
setVideoTime(time) {
+ let thisBlur = JSON.parse(this.noRecored)
+ if(thisBlur){
+ console.log('本条视频不记录播放记录，是未购买且试听章节',thisBlur);
+ return
+ }
console.log("是否走了存储视屏," + this.videoData.id, this.currentTime, );
var data = {
videoId: this.videoData.id,
@@ -767,8 +776,10 @@
async receiveIsfresh(newValue) {
if (newValue) {
if (this.player) {
- this.timer = null;
- await this.setVideoTime();
+ this.timer = null;
+
+ await this.setVideoTime();
+
this.player.dispose();
// this.player.seek(newValue);
}
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 998f964..2c08fe3 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -1,102 +1,62 @@
-
-
-
-
-
-
+
+
+
+
-
+
-
-
+
-
-
- 立即购买
-
-
- 立即续费
-
-
- 立即升级
-
+ " type="warning" @click="handleClickGetVip" :title="goBuyTitle" :show-icon="true">
+
+
+ 立即购买
+
+
+ 立即续费
+
+
+ 立即升级
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ course.title }}
-
-
-
-
-
- {{ course.title }}
-
- 进入学习
-
-
-
-
- 进入学习 -->
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- 精彩试听
-
-
-
-
-
-
- {{
- v.title
- }}
-
-
-
-
-
- 未购买
-
-
- 有效期至{{ v.endTime }}
-
-
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ 当前目录还未开始学习
+
+
+
+
+
+ vip课程有效期截止到：{{userMsg.userVip.endTime}}
+
+
-
-
+
+ 课程有效期截止到：{{librayList[curIndex].endTime}}
+
+ 续费
-
+
+
+
+
+
+
+
+
+
+ 您未购买此目录课程或已到期，购买后或开通超级VIP 即可学习本目录课程
+
+
+
+
+
+
+
+
+
- 开始学习
-
-
+
+
+
+ VIP畅学权益生效中
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
-
-
-
-
-
-
- {{ item.title }}
+
+
+
+
-
-
-
-
-
-
-
- 暂无文章
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.productName }}
-
+
+
+
+
+
+
+
+
+ {{ item.productName }}
+
-
- ￥{{ item.activityPrice }}
-
- ￥{{ item.price }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ ￥{{ item.activityPrice }}
+
+ ￥{{ item.price }}
+
+
+
+
+
+
+
+
+
+ 发布留言
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 请选择
-
-
- {{ item.productName }} - ￥{{ item.price }}
-
-
-
-
-
- 加入购物车
-
-
-
- 立即购买
-
-
-
-
-
-
-
-
-
-
-
-
-
- 回复@：{{ fatherSay.user.name }} 的留言
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 表情
-
-
-
-
-
-
-
-
+
+
+ 请选择
+
+
+ {{ item.productName }} - ￥{{ item.price }}
+
+
+
+
+
+ 加入购物车
+
+
+
+ 立即购买
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 回复@：{{ fatherSay.user.name }} 的留言
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 表情
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- 最多可上传3张图片哦
-
+
+
+
+
+
+ 最多可上传3张图片哦
+
-
-
-
-
-
- ×
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ ×
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+ .endBox {
+ // @include theme("vipbtnbg");
+ background-color: #258feb;
+ color: #fff;
+ font-size: 26rpx;
+ // margin: 20rpx 0;
+ padding: 10rpx 20rpx;
+
+ .flexbox {
+ justify-content: space-between;
+ }
+ }
+
+ ::v-deep .contentBox {
+ .ql-editor {
+ font-size: 26rpx;
+ font-style: normal;
+ min-height: 50rpx !important;
+ padding: 20rpx;
+ }
+
+ img {
+ width: 20px;
+ }
+
+ .u-upload__button {
+ margin: 0 auto;
+ }
+ }
+
+ .firstLeve {
+ padding-bottom: 10rpx;
+ border-bottom: 1px solid #f7f8f9;
+ }
+
+ .loadMore {
+ text-align: center;
+ margin-bottom: 20rpx;
+
+ text {
+ color: $themeColor;
+ font-size: 26rpx;
+ }
+ }
+
+ .boxB {
+ margin-left: 60rpx;
+ margin-top: 20rpx;
+ background-color: #f7f8f9;
+ padding-top: 20rpx;
+ padding-left: 10rpx;
+
+ .imgbox {
+ width: 40rpx !important;
+ height: 40rpx !important;
+ }
+
+ .contentBox {
+ width: calc(100% - 60rpx);
+ }
+
+ // .img{ width: 60rpx;
+ // height: 60rpx;
+ // image{width:60rpx; height: 60rpx; border-radius: 100%;}
+ // }
+ }
+
+ .chooseImgType {
+ margin-top: 20rpx;
+
+ .item {
+ text-align: center;
+ margin-right: 20rpx;
+ padding: 10rpx;
+ box-sizing: border-box;
+ justify-content: center;
+ align-items: center;
+ width: 60px;
+ border: 1px solid #eee;
+ height: 60px;
+ text-align: center;
+ border-radius: 20rpx;
+ background-color: #f4f5f7;
+
+ // background-color: red;
+ text {
+ font-size: 24rpx;
+ display: inline-block;
+ width: 100%;
+ margin-top: -10rpx;
+ }
+
+ .img {
+ margin: 0 auto;
+ }
+
+ .ss {
+ line-height: 20rpx;
+ color: #666;
+ }
+ }
+ }
+
+ .xufeiBtn {
+ display: inline-block;
+ padding: 4rpx 10rpx;
+ border: 1px solid #fff;
+ border-radius: 10rpx;
+ }
+
+ .libOther {
+ border: 1px solid #fff;
+ border-radius: 10rpx;
+ text-align: center;
+ background-color: rgba(0, 0, 0, .4);
+ padding: 10rpx;
+
+ .text {
+ font-size: 26rpx;
+ line-height: 40rpx;
+ margin-bottom: 20rpx;
+ color: #fff;
+ }
+ }
+
+ .tag-view {
+ justify-content: center;
+ margin-bottom: 20rpx;
+
+ .btn {
+ width: 40%;
+ margin: 0 20rpx;
+ }
+ }
+
+ .sbmitBox {
+ button {
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
+ @include theme("btn_bg");
+ color: #fff;
+ }
+ }
+
+ .upimgList {
+ margin-top: 15px;
+
+ .item {
+ border: 1px solid #eee;
+ padding: 10rpx;
+ margin-right: 20rpx;
+ width: 100rpx;
+ height: 100rpx;
+ position: relative;
+
+ .imgbox {
+ height: 100rpx;
+ overflow: hidden;
+ }
+
+ image {
+ width: 100%;
+ height: 100rpx;
+ }
+
+ span {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ position: absolute;
+ right: -10px;
+ top: -10px;
+ z-index: 1;
+ border: 1px solid #eee;
+ border-radius: 20rpx;
+ background-color: #fff;
+ line-height: 20px;
+ font-size: 26rpx;
+ text-align: center;
+ }
+ }
+ }
+
+ .emojiBtn {
+ .img {
+ width: 50rpx;
+ height: 50rpx;
+
+ image {
+ width: 100%;
+ height: 50rpx;
+ }
+ }
+ }
+
+ .editorBox {
+ width: calc(100vw - 100rpx);
+ }
+
+ .ql-container {
+ min-height: 50rpx !important;
+ height: auto !important;
+ border: 1px solid #eee;
+ border-radius: 50rpx;
+ }
+
+ .contentBox {
+ padding: 0 0rpx;
+
+ .icon {
+ width: 80rpx;
+ justify-content: center;
+ margin-left: 10rpx;
+ height: 80rpx;
+ align-items: center;
+ border: 1px solid #eee;
+ border-radius: 50rpx;
+ }
+
+ .addEmoji {
+ margin-right: 20rpx;
+ }
+
+ .imagesList {
+ margin-top: 20rpx;
+
+ .item {
+ margin-right: 20rpx;
+ }
+ }
+ }
+
+ //
+
+ .liuyanBox {
+ padding: 0 20rpx;
+ margin-top: 20rpx;
+
+ .contentBoxfirstLeve {
+ width: calc(100% - 70rpx);
+ }
+ }
+
+ .vipSee {
+ position: absolute;
+ left: 0;
+ top: 0;
+ font-size: 24rpx;
+ background-image: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
+ // @include theme("btn_bg");
+ color: #fff;
+ padding: 10rpx;
+ border-radius: 0 50rpx 50rpx 0;
+
+ }
+
+ .leve {
+ margin-bottom: 20rpx;
+
+ .imgbox {
+ border: 1px solid #eee;
+ margin-right: 10rpx;
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 100%;
+ overflow: hidden;
+ }
+
+ .contentBox {
+ font-size: 24rpx;
+
+ .name {
+ color: #999;
+ @include toe();
+ }
+
+ .content {
+ color: #333;
+ font-size: 26rpx;
+ margin-top: 10rpx;
+ }
+
+ .others {
+ margin-top: 10rpx;
+ color: #999;
+ align-items: center;
+
+ .dianzan {
+ align-items: center;
+ }
+
+ .pinglun {
+ align-items: center;
+ margin-left: 10rpx;
+ margin-right: 20rpx;
+ }
+ }
+ }
+ }
+
+ .showFew {
+ .icon_item1 {
+ -moz-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ }
+ }
+
+ .showAll {
+ .icon_item {
+ -moz-transform: rotate(-90deg);
+ -webkit-transform: rotate(-90deg);
+ }
+ }
+
+ .fold {
+ // 折叠状态
+ height: 500rpx;
+ overflow: hidden;
+ }
+
+ .linkPro {
+ margin-bottom: 20rpx;
+ background: rgba(255, 255, 255, 0.85) !important;
+
+ // padding:0 20rpx;
+ .more {
+ font-size: 24rpx;
+ color: #666;
+ }
+ }
+
+ .zhezhe {
+ text-align: center;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 20rpx;
+ z-index: 1;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ background-position: left bottom;
+ background-image: url(@/static/zhedieBg.png);
+ background-repeat: repeat-x;
+
+ .icon {
+ justify-content: center;
+ }
+
+ text {
+ color: $themeColor;
+ font-size: 26rpx;
+ }
+ }
+
+ .graybg {
+ // background-color: $containerColor;
+ }
+
+ .scroll-view_H {
+ background-color: #fff;
+ white-space: nowrap;
+ padding: 10rpx;
+ margin-top: 12rpx;
+
+ .item {
+ padding: 10rpx;
+ overflow: hidden;
+ display: inline-block;
+ padding-bottom: 0;
+ width: 210rpx !important;
+ margin-right: 8rpx;
+ border-radius: 10rpx;
+
+ image {
+ display: block;
+ width: 100%;
+ height: 260rpx;
+ }
+
+ .bookName {
+ display: block;
+ margin-top: 6rpx;
+ color: #666;
+ font-size: 24rpx;
+ white-space: nowrap;
+ overflow-x: hidden;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+
+ .proListPrice {
+ text-align: center;
+
+ .title {
+ font-size: 28rpx;
+ margin: 10px 0;
+ }
+
+ .list {
+ padding: 0 10px;
+ padding-bottom: 20rpx;
+
+ .item {
+ font-size: 26rpx;
+ color: #333;
+ margin-bottom: 10rpx;
+ line-height: 80rpx;
+ border-radius: 50rpx;
+ border: 1px solid #eee;
+ }
+
+ .item.active {
+ color: $themeColor;
+ border: 1px solid $themeColor;
+ }
+
+ .item:last-child {
+ // border-bottom: none
+ }
+ }
+
+ .tbn {
+ justify-content: center;
+ }
+
+ .buybtn {
+ background-color: #00d8df;
+ margin: 0;
+ margin-right: 20rpx;
+
+ text {
+ color: #fff;
+ }
+ }
+
+ .saveBtnss {
+ align-items: center;
+ justify-content: center;
+ height: 80rpx;
+
+ // width: 46%;
+ overflow: hidden;
+ border-radius: 50rpx;
+
+ text {
+ padding-left: 10rpx;
+ font-size: 28rpx;
+ }
+ }
+
+ .gouwuche {
+ border: 1px solid #666;
+ padding-right: 20rpx;
+
+ text {
+ // color: #fff;
+ }
+ }
+ }
+
+ .vipBtn {
+ @include theme("vipbtnbg");
+ border-radius: 100rpx;
+ justify-content: center;
+ width: auto;
+ padding: 0 20rpx;
+ color: #fff;
+ margin: 10rpx auto;
+ }
+
+ .buyBtn {
+ background: #f42c32 !important;
+ // background:
+ }
+
+ .buyBox {
+ // position: fixed;
+ // z-index: 2;
+ // bottom: 100rpx;
+ // left: 0;
+ @include pleft_right(4px);
+ // @include mshadow(10px, 1);
+ padding: 20rpx 10rpx;
+ width: 100%;
+ font-size: 28rpx;
+ flex-wrap: wrap;
+ background-image: linear-gradient(60deg,
+ #e0e9f6 0%,
+ #ece6fa 30%,
+ #d7e8f0 60%,
+ #fff 100%);
+ // background: rgba(255, 255, 255, 0.9);
+
+ .item {
+ width: 100%;
+ text-align: center;
+ line-height: 70rpx !important;
+ }
+
+ .tbn {
+ align-items: center;
+ }
+
+ .buybtn {
+ color: #fff;
+ }
+ }
+
+ .supermarketBox {
+ @include pleft_right(5px);
+
+ .borderbb {
+ background-image: linear-gradient(180deg, #468aff 0%, #46c0ff 100%);
+ @include pleft_right(10px);
+ border-radius: 20rpx;
+ @include ptop_bottm(10px);
+ @include mshadow(10px, 1);
+ }
+
+ .name {
+ font-size: 24rpx;
+ @include toe();
+ margin-top: 10rpx;
+ }
+
+ .price {
+ // text-align: center;
+ font-size: 26rpx;
+ font-weight: bold;
+ color: $themeColor;
+ padding-top: 10rpx;
+ }
+
+ .tips {
+ margin-top: 10px;
+ background-color: #e9f0ff;
+ padding: 5px;
+ border-radius: 5px;
+ font-size: 24rpx;
+
+ text {
+ font-weight: bold;
+ color: $themeColor;
+ }
+ }
+ }
+
+ .curseImg {
+ image {
+ width: 100%;
+ height: 500rpx;
+ }
+ }
+
+ .courseList {
+ position: relative;
+ padding-bottom: 50px;
+ // background-color: #fff;
+ // padding: 0 20rpx;
+ background-image: linear-gradient(0deg, #e9f0ff 0%, #fbfbff 100%);
+
+ .item {
+ padding: 0 20rpx;
+ font-size: 26rpx;
+ // min-height: 96rpx;
+ overflow: hidden;
+ line-height: 96rpx;
+ border-bottom: 1px solid #ececec;
+
+ text {
+ @include toe();
+ }
+ }
+ }
+
+ .containerBg1 {
+ border-top: 1px solid #fff;
+ margin-top: -4rpx;
+ // position: relative;
+ z-index: 1;
+
+ border-radius: 30rpx 30rpx 0 0;
+ // background-color: #fff;
+ // overflow: hidden;
+ }
+
+ .containerBg {
+ // background-color: #f4f7ff;
+ // overflow: hidden;
+ padding: 0 20rpx;
+ padding-bottom: 40rpx;
+ }
+
+ .buyBox {}
+
+ .vipBgColor {
+ background-color: #8265f9 !important;
+ }
+
+ .coursePart {
+ margin-top: 20rpx;
+ @include ptop_bottm(10px);
+ border-radius: 20rpx 20rpx 0 0;
+ @include pleft_right(10px);
+ align-items: flex-end;
+ @include mshadow(10px, 1);
+ margin-top: 20rpx;
+ padding: 0 20rpx;
+ padding-top: 20rpx;
+ background-color: $themeColor;
+
+ .item {
+ justify-content: center;
+ align-items: center;
+ color: #fff;
+ width: 100%;
+ text-align: center;
+ padding: 16rpx 0;
+ margin-right: 10rpx;
+ border-radius: 20rpx 20rpx 0 0;
+ border: 1px solid #fff;
+ border-bottom: none;
+ background-color: rgba(0, 0, 0, .4);
+
+ text {
+ font-size: 30rpx;
+ }
+ }
+
+ .item:last-child {
+ margin-right: 0;
+ }
+
+ .item.active {
+ background-color: #fbfbff;
+ color: $themeColor;
+ padding: 20rpx 0 !important;
+
+ text {
+ font-size: 36rpx !important;
+ }
+ }
+ }
+
+ .btnContainer {
+ border-top: 1px solid #cac6e1;
+ margin-top: 20rpx;
+ padding-top: 20rpx;
+ justify-content: space-between;
+
+ margin-bottom: 20rpx;
+ }
+
+ .buybtn {
+ border-radius: 100rpx;
+ justify-content: center;
+ width: 150px;
+ margin: 10rpx auto;
+ @include theme("btn_bg");
+ }
+
+ .priceBox {
+ background: rgba(255, 255, 255, 0.8);
+ border-radius: 20rpx;
+ padding: 10px;
+ margin-bottom: 10px;
+ justify-content: space-between;
+ // border-top: 1rpx solid #e7e7e7;
+ // border-bottom: 1rpx solid #e7e7e7;
+ padding: 10px 0;
+
+ .price {
+ width: 100%;
+ text-align: center;
+ }
+
+ .price:first-child {
+ border-right: 1px solid #cac6e1;
+ }
+ }
+
+ .prof {
+ font-size: 26rpx;
+ line-height: 50rpx;
+ padding: 10rpx 0;
+ color: #333;
+ // background-color: #f0f0f0;
+ // margin-bottom: 10rpx;
+ }
+
+ .catalogueTitle {
+ justify-content: space-between;
+ overflow: hidden;
+ // background-image: linear-gradient(108deg, #cae9f9 0%, #e1f6fc8c 50%);
+
+ // background-image: linear-gradient(180deg, #cfe0ff 0%, #fff 50%);
+ // padding: 0 20rpx;
+ font-size: 40rpx;
+
+ .learnBtn {
+ margin-bottom: 20rpx;
+ width: 150rpx;
+ text-align: center;
+ border: 1px solid $themeColor;
+ color: $themeColor;
+ line-height: 60rpx;
+ height: 60rpx;
+ font-size: 28rpx;
+ margin-top: 40rpx;
+ }
+
+ .price {
+ color: #ff582e;
+ font-size: 32rpx;
+
+ i {
+ font-style: normal;
+ font-size: 60rpx;
+ font-weight: bold;
+ }
+ }
+
+ .title {
+ display: block;
+ font-size: 30rpx;
+ margin-top: 20rpx;
+ font-weight: bold;
+ margin-bottom: 20rpx;
+ }
+
+ .saveBtn {
+ align-items: center;
+ justify-content: center;
+ height: 80rpx;
+ background-color: #00d8df;
+ // width: 46%;
+ overflow: hidden;
+ border-radius: 30rpx;
+
+ text {
+ padding-left: 10rpx;
+ font-size: 28rpx;
+ color: #fff;
+ }
+ }
+ }
+
+ .curseSet {
+ margin-right: 10px;
+ }
+
+ .shitingLIst {
+ background-color: #fff;
+ padding: 20rpx;
+ margin-bottom: 20rpx;
+
+ .item {
+ align-items: center;
+ border: none !important;
+ line-height: 30rpx !important;
+ margin-right: 20rpx;
+ }
+ }
+
+ .flexbox {
+ display: flex;
+ }
+
+ .imgcontainer {
+ background-color: $imgBg;
+ }
+
+ .fdButtonBox {
+ border-radius: 50rpx !important;
+ border: 1rpx solid $themeColor;
+ background-color: $themeColor;
+ color: #fff !important;
+ // width: 100%;
+ float: right;
+ padding: 4rpx 14rpx;
+ font-size: 24rpx;
+ font-weight: 500;
+ line-height: 30rpx;
+ border-radius: 10rpx;
+ box-sizing: border-box;
+
+ // margin-top: 20rpx;
+ // display: flex;
+ // align-items: center;
+ }
+
+ .fdButtonBoxRed {
+ border: 1rpx solid red;
+ background-color: red;
+ padding: 8rpx 14rpx;
+ font-size: 28rpx;
+ color: #fff !important;
+ }
+
+ /deep/.u-alert--warning--light {
+ background-color: none !important;
+ }
+
+ /deep/.u-alert__text--warning--light {
+ color: #fff !important;
+ }
+
+ /deep/.u-alert {
+ background: none !important;
+ }
+
+ /deep/.u-icon__icon--warning {
+ color: #fff !important;
+ }
+
+ /deep/.uni-section {
+ background: transparent !important;
+ }
+
+ /deep/.uni-section .uni-section-header {
+ padding-top: 10rpx !important;
+ padding-bottom: 10rpx !important;
+ }
+
+ /deep/.uni-section .uni-section-header {
+ padding-left: 0rpx !important;
+ // padding-bottom: 10rpx !important;
+ }
+
+ .chapter_title {
+ width: 100%;
+ font-size: 28rpx;
+ display: flex;
+ align-items: center;
+ position: relative;
+
+ // justify-content: space-between;
+ .top {
+ width: 100%;
+ display: flex;
+ align-items: center;
+
+ .left {
+ display: flex;
+ align-items: center;
+ }
+
+ .right {
+ // float: right;
+ position: absolute;
+ right: 0;
+ }
+ }
+
+ .not_purchased {
+ position: relative;
+
+ .spot {
+ width: 8rpx;
+ height: 8rpx;
+ position: absolute;
+ right: -4rpx;
+ border-radius: 8rpx;
+ background-color: #33435d;
+ bottom: -4rpx;
+ }
+
+ color: #33435d;
+ margin-left: 20rpx;
+ font-size: 24rpx;
+ padding: 0 20rpx;
+ border-bottom: 2rpx dotted #33435d;
+
+ text {
+ margin: 0 10rpx;
+ letter-spacing: 1rpx;
+ }
+ }
+ }
+
+ .course_title {
+ align-items: center;
+ justify-content: space-between;
+ background: #fff;
+ }
+
+ .courseTitle {
+ width: calc(100% - 220rpx);
+ padding: 20rpx;
+ font-size: 38rpx;
+ font-weight: bold;
+ // background-image: url(@/static/bg1.jpg);
+ background-size: cover;
+ background-repeat: no-repeat;
+ }
+
+ .start_learn_btn {
+ width: 200rpx;
+ height: 60rpx;
+ margin-right: 10rpx;
+ text-align: center;
+ line-height: 60rpx;
+ color: #fff;
+ font-size: 36rpx;
+ background-image: url(@/static/icon/start_learn_btn.png);
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ }
+
+ .popup_box {
+ padding-bottom: 20rpx;
+ width: 85vw;
+ overflow: hidden;
+ position: relative;
+ height: auto;
+
+ .title {
+ font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+ font-weight: normal;
+ font-size: 46rpx;
+ color: $themeColor;
+ background-color: #f5f5f5;
+ // line-height: 46rpx;
+ padding: 20rpx;
+ // border-leradius: 6px;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ }
+
+ .content {
+ font-size: 26rpx;
+ letter-spacing: 0.15rpx;
+ padding: 20rpx;
+ color: #3f3f3f;
+
+ .top {
+ margin: 30rpx 0;
+ }
+
+ .center {
+ line-height: 40rpx;
+ // padding:0 10rpx;
+ }
+
+ .bottom {
+ width: 100%;
+ margin-top: 60rpx;
+
+ font-size: 24rpx;
+ line-height: 26rpx;
+ color: #b0b0b0;
+ }
+ }
+
+ .button_box {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-top: 20rpx;
+
+ .u-button {
+ margin-left: 40rpx;
+ }
+
+ .u-button:nth-child(1) {
+ margin-left: 0;
+ }
+ }
+ }
+
+ .subLine {
+ * {
+ display: inline !important;
+ }
+ }
+
+ .item_videoList {
+ padding: 10rpx 0;
+ width: 100%;
+ // display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .textBox {
+ padding: 20rpx 0;
+ align-items: center;
+ justify-content: start;
+ width: 100%;
+ font-size: 28rpx;
+
+ text {
+ color: #1e2f3e;
+ }
+ }
+
+ .textBox.lock {
+ width: calc(100% - 60rpx);
+ }
+
+ .shitingTag {
+ display: flex;
+ }
+ }
+
+
+ .commonDetailPage {}
+
+ .course_info_box {
+ margin-bottom: 10rpx;
+
+ // padding:20rpx;
+ .course_info {
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ background: #f2f8ff;
+ // border-radius:20rpx;
+ overflow: hidden;
+ }
+ }
+
+ .catalogue_title {
+ background: linear-gradient(130deg, #162a4f 0%, #1e4c7d 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ font-size: 42rpx;
+ font-weight: bold;
+ letter-spacing: 4rpx;
+
+ // border:4rpx solid #1FB2F8;
+ // box-shadow: 0 2px 12px 0 rgba(255,255,255,.1);
+ // border-radius:40rpx;
+ // color:#fff;
+ // width:200rpx;
+ // height:70rpx;
+ // display:inline-block;
+ // padding:10rpx 20rpx;
+ }
+
+ .vipchapter_content {
+ position: relative;
+ padding-top: 50rpx !important;
+ background-color: #f2e6ff !important;
+ background-image: none !important;
+ border-color: #6429db !important;
+ }
+
+ .chapter_content {
+ padding: 20rpx;
+ border: 4rpx solid #fffffc;
+ background-image: linear-gradient(52deg, #e8f6ff 0%, #e3f2fe 50%);
+ box-shadow: 0px 0px 10px 0px #89c8e9 !important;
+ border-top-right-radius: 40rpx;
+ border-bottom-left-radius: 40rpx;
+
+ .item {
+ border-bottom: 1px solid #fff;
+ }
+
+ .videoList {
+ // padding:0 20rpx;
+ display: flex;
+ align-items: center;
+
+ // justify-content: space-between;
+ .video_item {
+ width: 24%;
+ font-size: 22rpx;
+ margin: 10rpx 0;
+ background: rgba(255, 255, 255, 0.85);
+ box-shadow: 0 2px 12px 0 rgba(255, 255, 255, 0.1);
+ border-radius: 10rpx;
+ padding: 10rpx 20rpx;
+ margin-right: 1%;
+
+ color: #333;
+ letter-spacing: 2rpx;
+ }
+ }
+ }
+
+ .line {
+ width: 16rpx;
+ height: 50rpx;
+ border-top-right-radius: 12rpx;
+ border-bottom-right-radius: 12rpx;
+ margin-right: 20rpx;
+ background-image: linear-gradient(108deg, #2786eb 0%, #35a6ff 100%);
+ }
+
+ .containerBg2 {
+ // padding-top: 40rpx;
+ // margin-top: 100rpx;
+ background: linear-gradient(108deg, #c3e7ff 0%, #59bafe 100%) !important;
+
+ .shiting {
+ line-height: 100rpx;
+ background: linear-gradient(130deg, #4fa1fd 0%, #12f3ff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ margin-bottom: 20rpx;
+ // background-image: linear-gradient(108deg, #4FA1FD 100%, #4FA1FD 0%);
+ // border:4rpx solid #1FB2F8;
+ // box-shadow: 0 2px 12px 0 rgba(255,255,255,.1);
+ // border-radius:40rpx;
+ color: #fff;
+ // width:200rpx;
+ // height:70rpx;
+ // display:inline-block;
+ // padding:10rpx 20rpx;
+ font-size: 72rpx;
+ text-align: center;
+ }
+
+ .shiting_content {
+ padding: 20rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 491eefd..7502312 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -360,6 +360,7 @@
}
.jianjie {
+ line-height: 30rpx; height: 60rpx; overflow: hidden;
overflow: hidden!important;
margin-top: 10rpx;
font-size: 24rpx;
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index 7a80a6e..c4d3714 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -36,14 +36,14 @@
VIP畅学
-
+
-
+
{{item.title}}
@@ -54,7 +54,7 @@
加入在学习
取消在学习
- 去学习
+ 去学习
@@ -76,11 +76,11 @@
-
+
-
+
{{item.title}}
@@ -88,7 +88,7 @@
取消在学习
- 去学习
+ 去学习
@@ -854,6 +854,7 @@
}
.jianjie {
+ line-height: 30rpx; height: 60rpx; overflow: hidden;
margin-top: 10rpx;
font-size: 24rpx;
@include bov();
diff --git a/pages/mine/wallet/recharge/index.vue b/pages/mine/wallet/recharge/index.vue
index 1f8556f..d72e667 100644
--- a/pages/mine/wallet/recharge/index.vue
+++ b/pages/mine/wallet/recharge/index.vue
@@ -139,7 +139,7 @@
},
],
iosPaylist: [{
- title: "apple pay支付",
+ title: "IAP支付",
id: 3,
imgUrl: require("@/static/icon/pay_2.png"),
}, ],
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 2095ca3..689dc76 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -63,7 +63,7 @@
正在学习
-
+
diff --git a/utils/myIapCheck.js b/utils/myIapCheck.js
index 178eb11..dcb8d6b 100644
--- a/utils/myIapCheck.js
+++ b/utils/myIapCheck.js
@@ -109,7 +109,8 @@ var iap = {
}
})
.catch((e) => {
- console.log('后台验证失败=>',e);
+ console.log('后台验证失败=>',e);
+ // that.finishTransaction(result);
});
},
}