Augcl
/
englishread-front
generated from hly/uniapp-shop-templates
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

feat: 优化H5适配和页面布局，修复视频加载问题 

- 为H5平台添加条件编译，优化导航栏和页面布局
- 修复视频加载状态处理和错误提示
- 调整会员中心权益展示方式为动态渲染
- 优化书籍页面滚动体验和图片视频显示
- 统一页面标题和导航栏样式
hfll
hflllll 2 weeks ago
parent
f885fa8eb7
commit
ed8da100e4
9 changed files with 287 additions and 136 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +61
    -10
      pages.json
  2. +12
    -9
      pages/components/SplashScreen.vue
  3. +0
    -2
      pages/index/desk.vue
  4. +26
    -12
      pages/index/member.vue
  5. +7
    -0
      pages/index/user.vue
  6. +153
    -75
      subPages/home/book.vue
  7. +10
    -10
      subPages/home/directory.vue
  8. +16
    -17
      subPages/member/recharge.vue
  9. +2
    -1
      utils/share.js

+ 61
- 10
pages.json View File

@ -3,12 +3,17 @@
{ {
"path": "pages/index/home", "path": "pages/index/home",
"style": { "style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarTitleText": "主页"
} }
}, },
{ {
"path": "pages/index/desk", "path": "pages/index/desk",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "书桌", "navigationBarTitleText": "书桌",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
@ -17,14 +22,17 @@
"path": "pages/index/member", "path": "pages/index/member",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"navigationBarTitleText": "会员中心"
} }
}, },
{ {
"path": "pages/index/user", "path": "pages/index/user",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"navigationBarTitleText": "用户中心"
} }
} }
], ],
@ -35,18 +43,23 @@
{ {
"path": "login/login", "path": "login/login",
"style": { "style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarTitleText": "登录"
} }
}, },
{ {
"path": "login/userInfo", "path": "login/userInfo",
"style": { "style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarTitleText": "用户信息"
} }
}, },
{ {
"path": "home/plan", "path": "home/plan",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "个人语境方案定制", "navigationBarTitleText": "个人语境方案定制",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#06DADC" "navigationBarBackgroundColor": "#06DADC"
@ -55,44 +68,68 @@
{ {
"path": "home/search", "path": "home/search",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "搜索" "navigationBarTitleText": "搜索"
} }
}, },
{ {
"path": "home/submit", "path": "home/submit",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "报名个人语境定制" "navigationBarTitleText": "报名个人语境定制"
} }
}, },
{ {
"path": "home/directory", "path": "home/directory",
"style": { "style": {
"navigationBarTitleText": "",
// #ifndef H5
"navigationBarTitleText": "目录",
"navigationBarBackgroundColor": "#264C8F", "navigationBarBackgroundColor": "#264C8F",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
// #endif
// #ifdef H5
"navigationStyle": "custom",
"navigationBarTitleText": "目录"
// #endif
} }
}, },
{ {
"path": "user/introduce", "path": "user/introduce",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "产品介绍" "navigationBarTitleText": "产品介绍"
} }
}, },
{ {
"path": "user/policy", "path": "user/policy",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "服务协议与隐私政策" "navigationBarTitleText": "服务协议与隐私政策"
} }
}, },
{ {
"path": "user/profile", "path": "user/profile",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "资料修改" "navigationBarTitleText": "资料修改"
} }
}, },
{ {
"path": "user/discount", "path": "user/discount",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的优惠券" "navigationBarTitleText": "我的优惠券"
} }
}, },
@ -105,36 +142,50 @@
{ {
"path": "user/team", "path": "user/team",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "我的团队" "navigationBarTitleText": "我的团队"
} }
}, },
{ {
"path": "user/cash", "path": "user/cash",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "提现" "navigationBarTitleText": "提现"
} }
}, },
{ {
"path": "member/recharge", "path": "member/recharge",
"style": { "style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarTitleText": "充值"
} }
}, },
{ {
"path": "home/book", "path": "home/book",
"style": { "style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"navigationBarTitleText": "书籍"
} }
}, },
{ {
"path": "home/music", "path": "home/music",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "音乐切换" "navigationBarTitleText": "音乐切换"
} }
}, },
{ {
"path": "user/share", "path": "user/share",
"style": { "style": {
// #ifdef H5
"navigationStyle": "custom",
// #endif
"navigationBarTitleText": "分享" "navigationBarTitleText": "分享"
} }
} }
@ -149,7 +200,7 @@
} }
}, },
"globalStyle": { "globalStyle": {
"navigationBarTitleText": "uni-app",
"navigationBarTitleText": "四零语境",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
}, },


+ 12
- 9
pages/components/SplashScreen.vue View File

@ -180,7 +180,7 @@ export default {
.splash-content { .splash-content {
flex: 1; flex: 1;
width: 100%; width: 100%;
height: 100%;
height: 80%;
overflow: hidden; overflow: hidden;
// 富文本樣式 // 富文本樣式
@ -197,7 +197,7 @@ export default {
.skip-button { .skip-button {
position: absolute; position: absolute;
top: 100rpx;
top: 40rpx;
left: 40rpx; left: 40rpx;
background-color: #0000004D; background-color: #0000004D;
@ -217,13 +217,16 @@ export default {
// 文字容器定位到左下角 // 文字容器定位到左下角
.text-container { .text-container {
position: absolute;
bottom: 80rpx;
left: 40rpx;
z-index: 10001;
// position: absolute;
// bottom: 80rpx;
// left: 40rpx;
// z-index: 10001;
height: 20%;
width: 100%;
padding: 20rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8rpx;
gap: 30rpx;
} }
// 英文文字样式 // 英文文字样式
@ -233,7 +236,7 @@ export default {
font-size: 32rpx; // 16px转换为rpx font-size: 32rpx; // 16px转换为rpx
line-height: 48rpx; // 24px转换为rpx line-height: 48rpx; // 24px转换为rpx
letter-spacing: 0; letter-spacing: 0;
color: #FFFFFF;
color: black;
background: transparent; background: transparent;
} }
@ -244,7 +247,7 @@ export default {
font-size: 32rpx; // 16px转换为rpx font-size: 32rpx; // 16px转换为rpx
line-height: 48rpx; // 24px转换为rpx line-height: 48rpx; // 24px转换为rpx
letter-spacing: 0; letter-spacing: 0;
color: #FFFFFF;
color: black;
background: transparent; background: transparent;
} }


+ 0
- 2
pages/index/desk.vue View File

@ -1,7 +1,5 @@
<template> <template>
<view class="desk-container"> <view class="desk-container">
<!-- 顶部搜索栏 --> <!-- 顶部搜索栏 -->
<view class="header"> <view class="header">
<view class="search-container"> <view class="search-container">


+ 26
- 12
pages/index/member.vue View File

@ -1,6 +1,7 @@
<template> <template>
<view class="container"> <view class="container">
<view class="header"> <view class="header">
<!-- #ifndef H5 -->
<view class="header-bg"> <view class="header-bg">
<image <image
src="/static/会员背景.png" src="/static/会员背景.png"
@ -9,6 +10,7 @@
/> />
<text class="header-title">会员中心</text> <text class="header-title">会员中心</text>
</view> </view>
<!-- #endif -->
<view class="header-content"> <view class="header-content">
<view class="zuanshi"> <view class="zuanshi">
@ -80,18 +82,12 @@
<view class="benefits-list"> <view class="benefits-list">
<!-- 碎片学习 系统掌握 --> <!-- 碎片学习 系统掌握 -->
<view class="benefit-item">
<view class="benefit-content">
<view class="benefit-title">碎片学习 系统掌握</view>
<view class="benefit-desc">根据薄弱点智能推荐，每节课3-5分钟，碎片化完成系统学习</view>
</view>
<view class="benefit-icon">
<image src="/static/会员图片1.png" mode="aspectFit"></image>
</view>
<view class="benefit-item" v-for="(item, index) in memberBenefits" :key="index">
<uv-parse :content="item"></uv-parse>
</view> </view>
<!-- 匹配水平 --> <!-- 匹配水平 -->
<view class="benefit-item">
<!-- <view class="benefit-item">
<view class="benefit-content"> <view class="benefit-content">
<view class="benefit-title">匹配水平</view> <view class="benefit-title">匹配水平</view>
<view class="benefit-desc">依据水平精准推课，不做无用功快速提升</view> <view class="benefit-desc">依据水平精准推课，不做无用功快速提升</view>
@ -99,10 +95,10 @@
<view class="benefit-icon"> <view class="benefit-icon">
<image src="/static/会员图片2.png" mode="aspectFit"></image> <image src="/static/会员图片2.png" mode="aspectFit"></image>
</view> </view>
</view>
</view> -->
<!-- 科学闭环测 讲练结合 --> <!-- 科学闭环测 讲练结合 -->
<view class="benefit-item">
<!-- <view class="benefit-item">
<view class="benefit-content"> <view class="benefit-content">
<view class="benefit-title">科学闭环测 讲练结合</view> <view class="benefit-title">科学闭环测 讲练结合</view>
<view class="benefit-desc">精心设计科学的学习流程 「测试-讲解-练习-检验」知识掌握更牢固</view> <view class="benefit-desc">精心设计科学的学习流程 「测试-讲解-练习-检验」知识掌握更牢固</view>
@ -110,7 +106,7 @@
<view class="benefit-icon"> <view class="benefit-icon">
<image src="/static/会员图片3.png" mode="aspectFit"></image> <image src="/static/会员图片3.png" mode="aspectFit"></image>
</view> </view>
</view>
</view> -->
</view> </view>
</view> </view>
@ -191,6 +187,7 @@ export default{
return { return {
isLogin: uni.getStorageSync('token') ? true : false, isLogin: uni.getStorageSync('token') ? true : false,
memberInfo: [], memberInfo: [],
memberBenefits: [],
userInfo: { userInfo: {
name: '战斗世界', name: '战斗世界',
avatar: '/static/默认头像.png' avatar: '/static/默认头像.png'
@ -242,6 +239,17 @@ export default{
if (memberRes.code === 200) { if (memberRes.code === 200) {
this.memberInfo = [...memberRes.result] this.memberInfo = [...memberRes.result]
} }
if(!this.memberInfo.length){
// 如果不是会员 获取会员部分信息
this.getMemberBenefits()
}
},
// 获取会员权益
async getMemberBenefits() {
const benefitsRes = await this.$api.member.getMemberList()
if (benefitsRes.code === 200) {
this.memberBenefits = benefitsRes.result.map(item => item.content)
}
}, },
// 获取用户信息 // 获取用户信息
async getUserInfo() { async getUserInfo() {
@ -322,7 +330,13 @@ export default{
.header-content{ .header-content{
margin: 0 18rpx; margin: 0 18rpx;
/* #ifndef H5 */
margin-top: -150rpx; margin-top: -150rpx;
/* #endif */
/* #ifdef H5 */
margin-top: 100rpx;
/* #endif */
// height: 256rpx; // height: 256rpx;
border-radius: 32rpx; border-radius: 32rpx;
border-width: 2rpx; border-width: 2rpx;


+ 7
- 0
pages/index/user.vue View File

@ -2,8 +2,10 @@
<view class="user-container"> <view class="user-container">
<!-- 用户信息区域 --> <!-- 用户信息区域 -->
<view class="user-info-section"> <view class="user-info-section">
<!-- #ifndef H5 -->
<view class="page-title">我的</view> <view class="page-title">我的</view>
<!-- #endif -->
<view class="user-info"> <view class="user-info">
<view class="user-avatar" @click="goLogin"> <view class="user-avatar" @click="goLogin">
<image :src="isLogin ? userInfo.avatar === 'undefined' ? displayInfo.avatar : userInfo.avatar : displayInfo.avatar" mode="aspectFill"></image> <image :src="isLogin ? userInfo.avatar === 'undefined' ? displayInfo.avatar : userInfo.avatar : displayInfo.avatar" mode="aspectFill"></image>
@ -304,7 +306,12 @@ export default {
/* 用户信息区域 */ /* 用户信息区域 */
.user-info-section { .user-info-section {
background: linear-gradient(180deg, #ABFFFF 0%, #FFFFFF 100%); background: linear-gradient(180deg, #ABFFFF 0%, #FFFFFF 100%);
height: 300rpx; height: 300rpx;
/* #ifdef H5 */
height: 200rpx;
/* #endif */
// display: flex; // display: flex;
// align-items: center; // align-items: center;
padding: 60rpx 32rpx 0rpx; padding: 60rpx 32rpx 0rpx;


+ 153
- 75
subPages/home/book.vue View File

@ -1,7 +1,10 @@
<template> <template>
<view class="book-container"> <view class="book-container">
<!-- 自定义顶部导航栏 -->
<!-- 条件编译 -->
<!-- #ifndef H5 -->
<uv-status-bar></uv-status-bar> <uv-status-bar></uv-status-bar>
<!-- 自定义顶部导航栏 -->
<view class="custom-navbar" :class="{ 'navbar-hidden': !showNavbar }"> <view class="custom-navbar" :class="{ 'navbar-hidden': !showNavbar }">
<uv-status-bar></uv-status-bar> <uv-status-bar></uv-status-bar>
<view class="navbar-content"> <view class="navbar-content">
@ -12,6 +15,7 @@
</view> </view>
</view> </view>
<!-- #endif -->
<!-- Swiper内容区域 --> <!-- Swiper内容区域 -->
<swiper <swiper
@ -24,72 +28,86 @@
:key="index" :key="index"
class="swiper-item" class="swiper-item"
> >
<view class="content-area" @click="toggleNavbar">
<!-- 会员限制页面 -->
<view v-if="!isMember && pagePay[index] === 'Y'" class="member-content" >
<text class="member-title">{{ pageTitles[index] }}</text>
<view class="member-button" @click.stop="unlockBook">
<text class="member-button-text">升级会员解锁</text>
<scroll-view scroll-y style="height: 100vh;">
<view scroll-y class="content-area" @click="toggleNavbar">
<!-- 会员限制页面 -->
<view v-if="!isMember && pagePay[index] === 'Y'" class="member-content" >
<text class="member-title">{{ pageTitles[index] }}</text>
<view class="member-button" @click.stop="unlockBook">
<text class="member-button-text">升级会员解锁</text>
</view>
</view> </view>
</view>
<!-- 图片卡片页面 -->
<view class="card-content" v-else-if="pageTypes[index] === '1'">
<view class="card-line">
<image :src="configParamContent('highlight_icon')" class="card-line-image" mode="aspectFill" />
<text class="card-line-text">划线重点</text>
</view>
<view v-for="(item, itemIndex) in page" :key="itemIndex">
<image class="card-image" v-if="item && item.type === 'image'" :src="item.imageUrl" mode="aspectFill"></image>
<view class="english-text-container clickable-text" v-else-if="item && item.type === 'text' && item.language === 'en' && item.content" @click.stop="handleTextClick(item.content, item, index)">
<text
v-for="(token, tokenIndex) in splitEnglishSentence(item.content)"
:key="tokenIndex"
:class="['english-token', { 'clickable-word': token.isWord && findWordDefinition(token.text) }]"
@tap="token.isWord && findWordDefinition(token.text) ? handleWordClick(token.text) : null"
user-select
>{{ token.text }}</text>
<!-- 图片卡片页面 -->
<view class="card-content" v-else-if="pageTypes[index] === '1'">
<view class="card-line">
<image :src="configParamContent('highlight_icon')" class="card-line-image" mode="aspectFill" />
<text class="card-line-text">划线重点</text>
</view> </view>
<view v-else-if="item && item.type === 'text' && item.language === 'zh' && item.content" @click.stop="handleTextClick(item.content, item, index)">
<text class="chinese-text clickable-text" user-select>{{ item.content }}</text>
<view v-for="(item, itemIndex) in page" :key="itemIndex">
<image class="card-image" v-if="item && item.type === 'image'" :src="item.imageUrl" mode="aspectFill"></image>
<view class="english-text-container clickable-text" v-else-if="item && item.type === 'text' && item.language === 'en' && item.content" @click.stop="handleTextClick(item.content, item, index)">
<text
v-for="(token, tokenIndex) in splitEnglishSentence(item.content)"
:key="tokenIndex"
:class="['english-token', { 'clickable-word': token.isWord && findWordDefinition(token.text) }]"
@tap="token.isWord && findWordDefinition(token.text) ? handleWordClick(token.text) : null"
user-select
>{{ token.text }}</text>
</view>
<view v-else-if="item && item.type === 'text' && item.language === 'zh' && item.content" @click.stop="handleTextClick(item.content, item, index)">
<text class="chinese-text clickable-text" user-select>{{ item.content }}</text>
</view>
</view> </view>
</view> </view>
</view>
<view v-else>
<view v-for="(item, itemIndex) in page" :key="itemIndex">
<!-- 文本页面 -->
<view v-if="item && item.type === 'text' && item.content" class="text-content" >
<view :class="{ 'text-highlight': isTextHighlighted(page, itemIndex) }" @click.stop="handleTextClick(item.content, item, index)">
<text
class="content-text clickable-text"
user-select
>
{{ item.content }}
</text>
<view v-else>
<view v-for="(item, itemIndex) in page" :key="itemIndex">
<!-- 文本页面 -->
<view v-if="item && item.type === 'text' && item.content" class="text-content" >
<view :class="{ 'text-highlight': isTextHighlighted(page, itemIndex) }" @click.stop="handleTextClick(item.content, item, index)">
<text
class="content-text clickable-text"
user-select
>
{{ item.content }}
</text>
</view>
</view> </view>
</view>
<!-- 文本页面 -->
<view v-else-if="item.type === 'image'" class="image-container">
<image class="content-image" :src="item.imageUrl" mode="aspectFill"></image>
</view>
<!-- 文本页面 -->
<view v-else-if="item.type === 'image'" class="image-container">
<image class="content-image" :src="item.imageUrl" mode="widthFix"></image>
</view>
<!-- 视频页面 -->
<view v-else-if="item.type === 'video'" class="video-content">
<video :src="item.video" class="video-player" controls :poster="item.poster"></video>
<!-- 视频页面 -->
<view v-else-if="item.type === 'video'" class="video-content" @click.stop>
<!-- 视频加载状态 -->
<view v-if="videoLoading" class="video-loading">
<text class="loading-text">视频加载中...</text>
</view>
<!-- 视频播放器 -->
<video
v-else
src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4"
class="video-player"
controls
:poster="item.coverUrl"
@loadstart="onVideoLoadStart"
@loadeddata="onVideoLoadStart"
@error="onVideoError"
></video>
</view>
</view> </view>
</view> </view>
</view> </view>
</view>
</scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- 自定义底部控制栏 --> <!-- 自定义底部控制栏 -->
<view class="custom-tabbar" :class="{ 'tabbar-hidden': !showNavbar }"> <view class="custom-tabbar" :class="{ 'tabbar-hidden': !showNavbar }">
<!-- 音频控制栏组件 --> <!-- 音频控制栏组件 -->
@ -261,6 +279,9 @@ export default {
isAudioLoading: false, // 音频是否正在加载 isAudioLoading: false, // 音频是否正在加载
hasAudioData: false, // 是否有音频数据 hasAudioData: false, // 是否有音频数据
audioLoadFailed: false, // 音频加载是否失败 audioLoadFailed: false, // 音频加载是否失败
// 视频状态相关
videoLoading: false, // 视频是否正在加载
courseIdList: [], courseIdList: [],
bookTitle: '', bookTitle: '',
courseList: [ courseList: [
@ -319,6 +340,29 @@ export default {
} }
}, },
methods: { methods: {
// 视频事件处理方法
onVideoLoadStart() {
console.log("视频开始加载📺📺📺📺📺📺📺📺📺📺");
this.videoLoading = true;
},
onVideoCanPlay() {
console.log("视频可以播放");
this.videoLoading = false;
},
onVideoError() {
this.videoLoading = false;
uni.showToast({
title: '视频加载失败',
icon: 'none',
duration: 2000
});
},
// 獲取用戶會員信息 判斷是否和傳參傳過來的會員id相同 // 獲取用戶會員信息 判斷是否和傳參傳過來的會員id相同
async getMemberInfo(){ async getMemberInfo(){
const memberRes = await this.$api.member.getUserMemberInfo() const memberRes = await this.$api.member.getUserMemberInfo()
@ -1700,7 +1744,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.book-container { .book-container {
width: 100%; width: 100%;
height: 100vh;
min-height: 100vh;
background-color: #F8F8F8; background-color: #F8F8F8;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -1755,23 +1799,55 @@ export default {
.content-swiper { .content-swiper {
flex: 1; flex: 1;
height: calc(100vh - 100rpx);
// min-height: calc(100vh - 100rpx);
// margin-top: 100rpx; // margin-top: 100rpx;
margin-bottom: 100rpx;
height: 100vh;
} }
.swiper-item { .swiper-item {
height: 100%;
min-height: 100vh;
// background-color: red;
} }
.content-area { .content-area {
flex: 1; flex: 1;
padding: 0 40rpx;
padding-top: 100rpx;
padding: 30rpx 40rpx 100rpx;
/* #ifndef H5 */
padding: 100rpx 40rpx;
/* #endif */
// padding-top: ;
// background: linear-gradient(180deg, #DEFFFF 0%, #FBFEFF 22.65%, #F0FBFF 100%); // background: linear-gradient(180deg, #DEFFFF 0%, #FBFEFF 22.65%, #F0FBFF 100%);
height: 100%;
min-height: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
.content-image{
width: 100%;
height: auto;
margin: 30rpx auto;
}
.video-content{
width: 100%;
height: auto;
margin: 30rpx auto;
position: relative;
.video-player{
// height: 100%;
width: 100%;
// margin: 0 auto;
// height: auto;
}
.video-loading {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
color: #666;
font-size: 28rpx;
}
}
} }
.card-content { .card-content {
@ -1811,6 +1887,7 @@ export default {
width: 590rpx; width: 590rpx;
height: 268rpx; height: 268rpx;
border-radius: 24rpx; border-radius: 24rpx;
margin: 30rpx auto;
// margin-bottom: 20rpx; // margin-bottom: 20rpx;
} }
.english-text { .english-text {
@ -1900,22 +1977,23 @@ export default {
color: #FFFFFF; color: #FFFFFF;
} }
.video-content {
width: 100vw;
margin: 200rpx -40rpx 0;
height: 500rpx;
background-color: #FFFFFF;
// padding: 40rpx;
border-radius: 24rpx;
display: flex;
align-items: center;
justify-content: center;
.video-player{
width: 670rpx;
margin: 0 auto;
height: 376rpx;
}
}
// .video-content {
// width: 100%;
// height: auto;
// // margin: 200rpx -40rpx 0;
// // height: 500rpx;
// background-color: #FFFFFF;
// // padding: 40rpx;
// border-radius: 24rpx;
// display: flex;
// align-items: center;
// justify-content: center;
// .video-player{
// width: 100%;
// margin: 0 auto;
// height: auto;
// }
// }


+ 10
- 10
subPages/home/directory.vue View File

@ -2,15 +2,15 @@
<view class="directory-container"> <view class="directory-container">
<view class="book-container"> <view class="book-container">
<view class="book-info"> <view class="book-info">
<view class="book-cover">
<image :src="bookInfo.booksImg" mode="aspectFill" :style="{width: '100%', height: '100%'}"></image>
</view>
<view class="book-details">
<view class="book-title">{{ bookInfo.translate }}</view>
<view class="book-subtitle">{{ bookInfo.booksName }}</view>
<view class="book-author">{{ bookInfo.booksAuthor }}</view>
<view class="book-level" :class="classMap[bookInfo.vipInfo.title]">{{ bookInfo.vipInfo.title }}</view>
</view>
<view class="book-cover">
<image :src="bookInfo.booksImg" mode="aspectFill" :style="{width: '100%', height: '100%'}"></image>
</view>
<view class="book-details">
<view class="book-title">{{ bookInfo.translate }}</view>
<view class="book-subtitle">{{ bookInfo.booksName }}</view>
<view class="book-author">{{ bookInfo.booksAuthor }}</view>
<view class="book-level" :class="classMap[bookInfo.vipInfo.title]">{{ bookInfo.vipInfo.title }}</view>
</view>
</view> </view>
<view class="book-knowledge"> <view class="book-knowledge">
<view class="book-knowledge-title"> <view class="book-knowledge-title">
@ -172,7 +172,7 @@ export default {
return this.isCourseSortReversed ? [...list].reverse() : list; return this.isCourseSortReversed ? [...list].reverse() : list;
}, },
computedList(){ computedList(){
return this.courseList.records.slice(0, 5)
return this.courseList.records?.slice(0, 5) || []
} }
}, },
methods: { methods: {


+ 16
- 17
subPages/member/recharge.vue View File

@ -7,11 +7,13 @@
class="header-img" class="header-img"
mode="scaleToFill" mode="scaleToFill"
/> />
<text class="header-title">会员开通</text>
<!-- 加一个推出箭头 -->
<view class="header-icon" @click="goBack">
<uv-icon name="arrow-left" color="#000" size="20" />
</view>
<!-- #ifndef H5 -->
<text class="header-title">会员开通</text>
<!-- 加一个推出箭头 -->
<view class="header-icon" @click="goBack">
<uv-icon name="arrow-left" color="#000" size="20" />
</view>
<!-- #endif -->
<!-- 轮播容器 --> <!-- 轮播容器 -->
<view class="uv-demo-block swiper-container"> <view class="uv-demo-block swiper-container">
<uv-swiper <uv-swiper
@ -113,18 +115,12 @@
<view class="benefits-list"> <view class="benefits-list">
<!-- 碎片学习 系统掌握 --> <!-- 碎片学习 系统掌握 -->
<view class="benefit-item">
<view class="benefit-content">
<view class="benefit-title">碎片学习 系统掌握</view>
<view class="benefit-desc">根据薄弱点智能推荐，每节课3-5分钟，碎片化完成系统学习</view>
</view>
<view class="benefit-icon">
<image src="/static/会员图片1.png" mode="aspectFit"></image>
</view>
<view class="benefit-item" v-for="item in packageList" :key="item.id">
<uv-parse :content="item.content" />
</view> </view>
<!-- 匹配水平 -->
<view class="benefit-item">
<!-- 匹配水平 -->
<!-- <view class="benefit-item">
<view class="benefit-content"> <view class="benefit-content">
<view class="benefit-title">匹配水平</view> <view class="benefit-title">匹配水平</view>
<view class="benefit-desc">依据水平精准推课，不做无用功快速提升</view> <view class="benefit-desc">依据水平精准推课，不做无用功快速提升</view>
@ -134,7 +130,7 @@
</view> </view>
</view> </view>
<!-- 科学闭环测 讲练结合 -->
科学闭环测 讲练结合
<view class="benefit-item"> <view class="benefit-item">
<view class="benefit-content"> <view class="benefit-content">
<view class="benefit-title">科学闭环测 讲练结合</view> <view class="benefit-title">科学闭环测 讲练结合</view>
@ -143,7 +139,7 @@
<view class="benefit-icon"> <view class="benefit-icon">
<image src="/static/会员图片3.png" mode="aspectFit"></image> <image src="/static/会员图片3.png" mode="aspectFit"></image>
</view> </view>
</view>
</view> -->
</view> </view>
</view> </view>
@ -282,6 +278,9 @@
position: relative; position: relative;
width: 100%; width: 100%;
height: 500rpx; height: 500rpx;
/* #ifdef H5 */
margin-top: -100rpx;
/* #endif */
// background: red; // background: red;
.header-img{ .header-img{
width: 100%; width: 100%;


+ 2
- 1
utils/share.js View File

@ -21,7 +21,8 @@ function share() { //微信分享
} = res.result } = res.result
console.log(appId); console.log(appId);
jWeixin.config({ jWeixin.config({
debug: true,
// debug: true,
debug: false,
appId: appId, appId: appId,
nonceStr: nonceStr, nonceStr: nonceStr,
signature: signature, signature: signature,


Write Preview
Loading…
Cancel
Save