1.24

components/ty-paper/ty-paper.vue

@@ -1,35 +1,35 @@
 <template>
 	<view class="page">
 		<view class="top u-flex u-row-between">
-			<view class="u-flex">
-				<text class="fen">教材级别</text>
+			<view class="u-flex" @click="change(0)">
+				<text :class="current==0?'new':'fen'">教材级别</text>
 				<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
 				</image>
 			</view>
-			<view class="u-flex">
-				<text class='fen'>教学层次</text>
+			<view class="u-flex" @click="change(1)">
+				<text :class="current==1?'new':'fen'">教学层次</text>
 				<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
 				</image>
 			</view>
-			<view class="u-flex">
-				<text class='fen'>专业分类</text>
+			<view class="u-flex" @click="change(2)">
+				<text :class="current==2?'new':'fen'">专业分类</text>
 				<image src="/static/images/down.png" style="width: 12rpx;height: 8rpx;margin-left: 8rpx;" mode="">
 				</image>
 			</view>
-			<view class="" class='fen'>获奖教材</view>
-			<view class="new">新书推荐</view>
+			<view @click="change(3)" class="" :class="current==3?'new':'fen'">获奖教材</view>
+			<view @click="change(4)" :class="current==4?'new':'fen'">新书推荐</view>
 		</view>
-		<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-			<view class="" v-for="(item,index) in 5" :key="index" style="margin-top: 26rpx;">
-				<image src="/static/logo.png" style="width: 334rpx;height: 460rpx;" mode=""></image>
-				<view class="title u-line-1">新时代大学生劳动教育教…</view>
-				<view class="writer">丁爱萍，林秀丽</view>
+		<scroll-view :scroll-y='true' class="u-flex u-row-between" style="flex-wrap: wrap;">
+			<view class="" v-for="(item,index) in paperlist" :key="index" style="margin-top: 26rpx;">
+				<image :src="item.image" style="width: 334rpx;height: 460rpx;" mode=""></image>
+				<view class="title u-line-1">{{item.title}}…</view>
+				<view class="writer u-line-1">{{item.author}}</view>
 				<view class="" style="margin-top: 8rpx;">
 					<text class="ding">定价</text>
-					<text class="money">¥38.5</text>
+					<text class="money">¥{{item.entity_price}}</text>
 				</view>
 			</view>
-		</view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -37,9 +37,49 @@
 	export default {
 		data() {
 			return {
-
+				level_id: '',
+				arrangement_id: '',
+				speciality_id: "",
+				book_type: 0,
+				is_new_recommend: '',
+				is_awards: '',
+				page: 1,
+				limit: 10,
+				current: 0,
+				paperlist: []
 			};
-		}
+		},
+		created(options) {
+			//新书
+			this.getBooksList()
+		},
+		methods: {
+			change(index) {
+				this.current = index
+				this.getBooksList()
+			},
+			getBooksList() {
+				if (this.current == 4) {
+					this.is_new_recommend = 0
+				}
+				if (this.current == 3) {
+					this.is_awards = 0
+				}
+				this.$u.post('api/books/getBooksList', {
+					level_id: this.level_id,
+					arrangement_id: this.arrangement_id,
+					speciality_id: this.speciality_id,
+					book_type: this.book_type,
+					is_new_recommend: this.is_new_recommend,
+					is_awards: this.is_awards,
+					page: this.page,
+					limit: this.limit
+				}).then(res => {
+					console.log('list', res);
+					this.paperlist = res.data.data
+				})
+			}
+		},
 	}
 </script>
 
@@ -50,6 +90,7 @@
 		font-weight: 500;
 		color: #333333;
 		margin-top: 20rpx;
+		width: 334rpx;
 	}
 
 	.writer {
@@ -58,6 +99,7 @@
 		font-weight: 400;
 		color: #444444;
 		margin-top: 8rpx;
+		width: 334rpx;
 	}
 
 	.money {

components/ty-video/ty-video.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="page u-flex u-row-between">
-		<view class="item" v-for="(item,index) in 20" :key="index">
-			<image src="/static/logo.png" style="width: 334rpx;height: 204rpx;" mode=""></image>
-			<view class="title u-line-1">武忠祥领衔|25考研数学3213</view>
-			<view class="write">齐春峰</view>
-			<view class="money">¥1288.00</view>
+		<view class="item" v-for="(item,index) in videolist" :key="index" @click="tovideoinfo(item.id)">
+			<image :src="item.image" style="width: 334rpx;height: 204rpx;" mode=""></image>
+			<view class="title u-line-1">{{item.title}}</view>
+			<view class="write">{{item.lecturer}}</view>
+			<view class="money">¥{{item.price}}</view>
 		</view>
 	</view>
 </template>
@@ -14,8 +14,42 @@
 		name: "ty-video",
 		data() {
 			return {
-
+				page: 1,
+				total: 0,
+				videolist: [],
+				keywords: '',
 			};
+		},
+		onPullDownRefresh() {
+			if (this.videolist.length < this.total) {
+				this.page++
+				this.getVideoList()
+			}
+		},
+		created() {
+			this.getVideoList()
+		},
+		methods: {
+			//获取视频列表
+			getVideoList() {
+				this.$u.post('api/video/getVideoList', {
+					page: this.page,
+					limit: 10,
+					keywords: this.keywords,
+				}).then(res => {
+					console.log('video', res);
+					if (this.page == 1) {
+						this.videolist = res.data.data
+					} else {
+						this.videolist.concat(res.data.data)
+					}
+				})
+			},
+			tovideoinfo(id){
+				uni.navigateTo({
+					url:'/pages/index/video?id='+id
+				})
+			}
 		}
 	}
 </script>
@@ -32,6 +66,7 @@
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		padding: 8rpx 28rpx 34rpx;
 		flex-wrap: wrap;
+		align-content: flex-start;
 	}
 
 	.title {

pages/index/bookinfo.vue

@@ -5,44 +5,30 @@
 				<u-swiper :list="list1" mode='number' height='750' indicator-pos="bottomRight"></u-swiper>
 			</view>
 			<view class="back" style="margin-top: 24rpx;">
-				<view class="">九年级化学上册电子课本目录(义务教育教科</view>
-				<view class="item-jian">教材级别：公共体育教材</view>
-				<view class="item-jian">适用层次：高职教材</view>
-				<view class="item-jian">适用专业：建筑类系列教材</view>
-				<view class="item-jian">ISBN：989-9-2392-232</view>
-				<view class="item-jian">作者：袁伟，郑太雄，罗荣</view>
-				<view class="item-jian">纸质定价：¥57.5</view>
+				<view class="">{{datainfo.title}}</view>
+				<view class="item-jian">教材级别：{{datainfo.level.title}}</view>
+				<view class="item-jian">适用层次：{{datainfo.arrangement.title}}</view>
+				<view class="item-jian">适用专业：{{datainfo.speciality.title}}</view>
+				<view class="item-jian">ISBN：{{datainfo.isbn}}</view>
+				<view class="item-jian">作者：{{datainfo.author}}</view>
+				<view class="item-jian">纸质定价：¥{{datainfo.entity_price}}</view>
 			</view>
 		</view>
 		<view class="height"></view>
-		<view class="series">
+		<view class="series" v-if="datainfo.is_series==0">
 			<view class="u-flex u-row-between">
 				<view class="abount">相关系列</view>
 				<view class="updown" @click="toupdown">系列下载</view>
 			</view>
 			<view class="" style="margin-top: 24rpx;">
-				<swiper class="swiper" circular :indicator-dots="true" :autoplay="true">
-					<swiper-item v-for="(item,index) in 3" :key="index">
+				<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
+					<swiper-item v-for="(item,index) in swiptlist" :key="index">
 						<view class="u-flex u-row-between">
 							<view class="">
 								<image src="/static/logo.png" style="width: 196rpx;height: 280rpx;" mode=""></image>
 								<view class="u-line-1">腰部功能强化训…</view>
 								<view class="">
-									定价：¥28.5
-								</view>
-							</view>
-							<view class="">
-								<image src="/static/logo.png" style="width: 196rpx;height: 280rpx;" mode=""></image>
-								<view class="u-line-1">腰部功能强化训…</view>
-								<view class="">
-									定价：¥28.5
-								</view>
-							</view>
-							<view class="">
-								<image src="/static/logo.png" style="width: 196rpx;height: 280rpx;" mode=""></image>
-								<view class="u-line-1">腰部功能强化训…</view>
-								<view class="">
-									定价：¥28.5
+									定价：<span style="color:rgba(204, 51, 0, 1) ;">¥28.5</span>
 								</view>
 							</view>
 						</view>
@@ -59,14 +45,14 @@
 			<view v-if="current==0" class="padd content-box">
 				<view class="u-flex">
 					<view class="">
-						<view class="chu">开本:16开</view>
-						<view class="chu">印制:双色</view>
-						<view class="chu">版次:第一版第一次</view>
+						<view class="chu">开本:{{datainfo.format}}</view>
+						<view class="chu">印制:{{datainfo.print}}</view>
+						<view class="chu">版次:{{datainfo.edition}}</view>
 					</view>
 					<view class="" style="margin-left: 100rpx;">
-						<view class="chu">印张:12</view>
-						<view class="chu">出版日期:2021年1月</view>
-						<view class="chu">出版单位:北京出版社</view>
+						<view class="chu">印张:{{datainfo.sheet}}</view>
+						<view class="chu">出版日期:{{pubdate}}</view>
+						<view class="chu">出版单位:{{datainfo.publisher}}</view>
 					</view>
 				</view>
 				<view class="tu">
@@ -75,7 +61,7 @@
 						<image class="image" src="/static/images/compile.png" mode=""></image>
 					</view>
 					<view class="fonta">
-						本书以体能训练的原则、价值和方法为主要阐
+						{{datainfo.preface}}
 					</view>
 				</view>
 				<view class="tu">
@@ -84,7 +70,7 @@
 						<image class="image" src="/static/images/compile.png" mode=""></image>
 					</view>
 					<view class="fonta">
-						本书以体能训练的原则、价值和方法为主要阐
+						{{datainfo.content_desc}}
 					</view>
 				</view>
 				<view class="tu">
@@ -93,17 +79,20 @@
 						<image class="image" src="/static/images/compile.png" mode=""></image>
 					</view>
 					<view class="fonta">
-						本书以体能训练的原则、价值和方法为主要阐
+						{{datainfo.author_desc}}
 					</view>
 				</view>
 			</view>
 			<view v-if="current==1" class="padd data">
 				<!-- 样章 -->
-				<view class="">
+				<view class="" v-if="specimen_file.length>0">
 					<view class="sample">样章</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
+					<view class="" v-for="(item,index) in specimen_file" :key="index"
+						style="display: flex;margin-top: 28rpx;">
+						<view class="" style="display: flex;">
+							<image src="/static/images/pdf.png" class="image3" mode=""></image>
+							<view class="pdf">{{item.title}}</view>
+						</view>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
 				</view>
@@ -112,21 +101,29 @@
 						<view class="">资源包</view>
 						<view class="u-flex">
 							<view class="selling">资源售价</view>
-							<view class="money5">¥48.5</view>
+							<view class="money5">¥{{price}}</view>
 							<view class="button4" @click="show=true">付费下载</view>
 						</view>
 					</view>
 					<view class="courseware">课件</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
+					<view v-for="(item,index) in courseware_file" :key="index" class=""
+						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+						<div style="display: flex;">
+							<image src="/static/images/pdf.png" class="image3" mode=""></image>
+							<view class="pdf">{{item.title}}</view>
+						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
-					<view class="courseware">资源</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
-						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+					<view class="" v-if="resource_file.length>0">
+						<view class="courseware">资源</view>
+						<view v-for="(item,index) in resource_file" :key="index" class=""
+							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+							<view class="" style="display: flex;">
+								<image src="/static/images/pdf.png" class="image3" mode=""></image>
+								<view class="pdf">{{item.title}}</view>
+							</view>
+							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -134,7 +131,10 @@
 		<view class="" style=" height: 166rpx;"></view>
 		<view class="bottom u-flex">
 			<view class="left" @click="stylebook">样书申请</view>
-			<view class="right">在线试读</view>
+			<!-- <view v-if="" class="right">免费下载</view> -->
+			<view v-if="datainfo.is_certificate==0" class="right" @click="certificate()">体验下载</view>
+			<view v-if="datainfo.is_pay==0" class="right">已购买，可下载</view>
+			<view v-else-if class="right">在线试读</view>
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="24">
 			<view class="" style="padding: 32rpx 28rpx;">
@@ -143,11 +143,14 @@
 					<image src="../../static/images/close.png"
 						style="width: 44rpx;height: 44rpx;position: absolute;top: 0;right: 0;" mode=""></image>
 				</view>
-				<view class="" style="margin-top: 40rpx;">
+				<view class="" v-if="specimen_file.length>0">
 					<view class="sample">样章</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
+					<view class="" v-for="(item,index) in specimen_file" :key="index"
+						style="display: flex;margin-top: 28rpx;">
+						<view class="" style="display: flex;">
+							<image src="/static/images/pdf.png" class="image3" mode=""></image>
+							<view class="pdf">{{item.title}}</view>
+						</view>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
 				</view>
@@ -161,26 +164,33 @@
 						</view> -->
 					</view>
 					<view class="courseware">电子书</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
+					<view v-for="(item,index) in courseware_file" :key="index" class=""
+						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+						<div style="display: flex;">
+							<image src="/static/images/pdf.png" class="image3" mode=""></image>
+							<view class="pdf">{{item.title}}</view>
+						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
-					<view class="courseware"
-						style='border-top: 2rpx solid rgba(151, 151, 151, 0.1);margin-bottom:26rpx;padding-top:28rpx;'>
-						课件</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
+					<view class="courseware">课件</view>
+					<view v-for="(item,index) in courseware_file" :key="index" class=""
+						style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+						<div style="display: flex;">
+							<image src="/static/images/pdf.png" class="image3" mode=""></image>
+							<view class="pdf">{{item.title}}</view>
+						</div>
 						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
 					</view>
-					<view class="courseware"
-						style='border-top: 2rpx solid rgba(151, 151, 151, 0.1);margin-bottom:26rpx;padding-top:28rpx;'>
-						资源</view>
-					<view class="" style="display: flex;margin-top: 28rpx;">
-						<image src="/static/images/pdf.png" class="image3" mode=""></image>
-						<view class="pdf">第一章 集合与函数概念单元检测卷高一数学轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧巧轻轻巧</view>
-						<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+					<view class="" v-if="resource_file.length>0">
+						<view class="courseware">资源</view>
+						<view v-for="(item,index) in resource_file" :key="index" class=""
+							style="display: flex;margin-top: 28rpx;justify-content: space-between;">
+							<view class="" style="display: flex;">
+								<image src="/static/images/pdf.png" class="image3" mode=""></image>
+								<view class="pdf">{{item.title}}</view>
+							</view>
+							<image src="/static/images/updown.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -208,9 +218,94 @@
 						title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
 					}
 				],
+				id: '',
+				datainfo: {
+					sheet: '',
+					publisher: '',
+					preface: "",
+					author_desc: '',
+					title: '',
+					isbn: '',
+					author: '',
+					entity_price: '',
+					format: '',
+					print: '',
+					edition: '',
+					content_desc: "",
+					level: {
+						title: ''
+					},
+					arrangement: {
+						title: ''
+					},
+					speciality: {
+						title: ''
+					},
+					series_id: '',
+					is_series: '', //是否可以系列购买
+					is_certificate: '', //是否体验中
+					is_pay: '', //是否已购买
+				},
+				swiptlist: [],
+				pubdate: '',
+				courseware_file: [],
+				resource_file: [],
+				specimen_file: [],
+				price: '', //资源价格,
+
 			};
 		},
+		onLoad(options) {
+			this.id = options.id
+			this.getBookInfo()
+		},
 		methods: {
+			certificate(){
+				this.$u.post('/api/certificate/useCertificate',{
+					id:this.id
+				}).then(res=>{
+					
+				})
+			},
+			// 系列
+			getSeriesBooks() {
+				this.$u.post('api/books/getSeriesBooks', {
+					series_id: this.series_id
+				}).then(res => {
+					console.log('books', res);
+					var list = []
+					for (var i = 0; i < res.data.length; i++) {
+						list.push(res.data[i])
+						if (list.length == 3) {
+							this.swiptlist.push(list)
+							this.list = []
+						}
+					}
+				})
+			},
+			//详情
+			getBookInfo() {
+				this.$u.post('api/books/getBookInfo', {
+					id: this.id
+				}).then(res => {
+					console.log('info', res);
+					this.datainfo = res.data
+					this.series_id = res.data.series_id
+					this.pubdate = res.data.pubdate.slice(0, 4) + '年' + res.data.pubdate.slice(5, 7) + "月"
+					this.getSeriesBooks()
+					this.courseware_file = res.data.courseware_file
+					this.resource_file = res.data.resource_file
+					this.specimen_file = res.data.specimen_file
+					this.price = res.data.price
+					var arr = res.data.banner.map(item => {
+						let obj = {}
+						obj.image = item
+						return obj
+					})
+					console.log(arr);
+					this.list1 = arr
+				})
+			},
 			change(index) {
 				this.current = index;
 			},

pages/index/contribute.vue

@@ -15,7 +15,7 @@
 					<text style="color: rgba(34, 34, 34, 1);">您的姓名</text>
 				</view>
 				<view class="box u-flex">
-					<input type="text" style="width: 100%;" />
+					<input v-model="from.name" type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 电话 -->
@@ -25,7 +25,7 @@
 					<text style="color: rgba(34, 34, 34, 1);">您的电话</text>
 				</view>
 				<view class="box u-flex">
-					<input type="text" style="width: 100%;" />
+					<input v-model="from.phone" type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 邮箱 -->
@@ -35,7 +35,7 @@
 					<text style="color: rgba(34, 34, 34, 1);">您的邮箱</text>
 				</view>
 				<view class="box u-flex">
-					<input type="text" style="width: 100%;" />
+					<input v-model="from.email" type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 学校 -->
@@ -45,7 +45,7 @@
 					<text style="color: rgba(34, 34, 34, 1);">您所在的学校名称</text>
 				</view>
 				<view class="box u-flex">
-					<input type="text" style="width: 100%;" />
+					<input v-model="from.school" type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 选题名称 -->
@@ -75,7 +75,8 @@
 				</view>
 				<view class="box u-flex" style="padding: 0 28rpx;" @click="show=true">
 					<image src="/static/images/calendar.png" style="width: 44rpx;height: 44rpx;" mode=""></image>
-					<u-calendar v-model="show" mode="date" @click="change"></u-calendar>
+					<u-calendar v-model="show" mode="date" @change="change"></u-calendar>
+					<input v-model="from.last_publish_time" :disabled="true" type="text" style="width: 100%;" />
 				</view>
 			</view>
 			<!-- 经费情况 -->
@@ -125,11 +126,21 @@
 					}
 				],
 				show: false,
+				from: {
+					name: '',
+					phone: '',
+					email: '',
+					school: '',
+					manuscript_status: "",
+					last_publish_time: '',
+					funds_status: '',
+					biographical_url: '',
+				}
 			};
 		},
 		methods: {
 			change(e) {
-				console.log(e);
+				this.last_publish_time = e.result
 			}
 		}
 	}

pages/index/index.vue

@@ -41,20 +41,21 @@
 			<view class="jiang">
 				<view class="u-flex u-row-between">
 					<text class="title1">获奖教材</text>
-					<view class="look">查看更多</view>
+					<view class="look" @click="tomore(3)">查看更多</view>
 				</view>
 				<view class="cai u-flex u-row-between">
-					<view class="item " v-for="(item,index) in 6" :key="index" @click="toinfo()">
-						<image src="/static/logo.png" class="bookimg" mode=""></image>
+					<view class="item " v-for="(item,index) in awardlist.slice(0,6)" :key="index"
+						@click="toinfo(item.id)">
+						<image :src="item.image" class="bookimg" mode=""></image>
 						<view class="title2 u-line-1">
-							ERP财务管理系统管理教程
+							{{item.title}}
 						</view>
 						<view class="u-line-1 author">
-							丁爱萍，林秀丽
+							{{item.author}}
 						</view>
 						<view class="bottom1">
 							<text class="ding">定价</text>
-							<text class="money">¥38.5</text>
+							<text class="money">{{item.entity_price}}</text>
 						</view>
 					</view>
 				</view>
@@ -62,21 +63,37 @@
 			<view class="newbox">
 				<view class="u-flex u-row-between">
 					<text class="title1">新书推荐</text>
-					<view class="look">查看更多</view>
+					<view class="look" @click="tomore(4)">查看更多</view>
 				</view>
-				<view class="u-flex video u-row-between">
-					<view class="item2 " v-for="(item,index) in 6" :key="index">
-						<image src="/static/logo.png" style="width: 322rpx;height: 198rpx;" mode=""></image>
-						<view class="title3 u-line-1">武忠祥领衔|25考研数学领域</view>
-						<view class="author u-line-1">武忠祥</view>
-						<view class="money">¥1288.00</view>
+				<!-- 				<view class="u-flex video u-row-between">
+					<view class="item2 " v-for="(item,index) in newlist.slice(0,6)" :key="index" @click="">
+						<image :src="item.image" style="width: 322rpx;height: 198rpx;" mode=""></image>
+						<view class="title3 u-line-1">{{item.title}}</view>
+						<view class="author2 u-line-1">{{item.author}}</view>
+						<view class="money">¥{{item.entity_price}}</view>
+					</view>
+				</view> -->
+				<view class="cai u-flex u-row-between">
+					<view class="item " v-for="(item,index) in newlist.slice(0,6)" :key="index"
+						@click="toinfo(item.id)">
+						<image :src="item.image" class="bookimg" mode=""></image>
+						<view class="title2 u-line-1">
+							{{item.title}}
+						</view>
+						<view class="u-line-1 author">
+							{{item.author}}
+						</view>
+						<view class="bottom1">
+							<text class="ding">定价</text>
+							<text class="money">{{item.entity_price}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
 			<view class="" style="height: 30rpx;"></view>
 		</view>
-		<view v-if="curret==1" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
-			<ty-paper></ty-paper>
+		<view v-show="curret==1" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
+			<ty-paper ref='paper'></ty-paper>
 		</view>
 		<view v-if="curret==3" style="position: relative;z-index: 1;margin-top: 24rpx;" class="">
 			<ty-video></ty-video>
@@ -96,14 +113,23 @@
 				limit: 10,
 				page1: 1,
 				limit1: 10,
-				awardlist: []
+				awardlist: [],
+				newlist: []
 			}
 		},
 		onLoad() {
 			this.getnewlist()
-			this.awardslist()
+			this.getawardslist()
 		},
 		methods: {
+			tomore(index) {
+				this.curret = 1
+				this.$refs.paper.current = index
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
+				})
+			},
 			// 新书推荐
 			getnewlist() {
 				this.$u.post('api/books/getBooksList', {
@@ -111,19 +137,18 @@
 					page: this.page,
 					limit: this.limit
 				}).then(res => {
-					console.log('new', res);
-
+					this.newlist = res.data.data
 				})
 			},
 			//获奖推荐
-			awardslist() {
+			getawardslist() {
 				this.$u.post('api/books/getBooksList', {
 					is_awards: 0,
 					page: this.page1,
 					limit: this.limit1
 				}).then(res => {
 					console.log('award', res);
-					this.awardlist = res.data
+					this.awardlist = res.data.data
 				})
 			},
 			onchange(index) {
@@ -134,9 +159,9 @@
 					url: "/pages/index/index-search"
 				})
 			},
-			toinfo() {
+			toinfo(id) {
 				uni.navigateTo({
-					url: '/pages/index/bookinfo'
+					url: '/pages/index/bookinfo?id=' + id
 				})
 			},
 			contribute() {
@@ -205,6 +230,16 @@
 		font-weight: 400;
 		color: #444444;
 		margin-top: 8rpx;
+		width: 202rpx;
+	}
+
+	.author2 {
+		font-size: 24rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #444444;
+		margin-top: 8rpx;
+		width: 322rpx;
 	}
 
 	.title2 {

pages/index/video.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<view class="video">
-			<image src="../../static/logo.png" style="width: 750rpx;height: 456rpx;" mode=""></image>
+			<image :src="info.image" style="width: 750rpx;height: 456rpx;" mode=""></image>
 			<image v-if="current==1" src="/static/images/play.png" mode="" class="ding"></image>
 			<image v-if="current==0" src="/static/images/free.png" mode="" class="free"></image>
 		</view>
@@ -10,14 +10,14 @@
 			<view class="" style="border-top: 2rpx solid rgba(151, 151, 151, 0.1);" v-if="current==0">
 				<view class="">
 					<view class="" style="padding:  0 28rpx;">
-						<view class="titles">25考研数学定制VIP领学3班·S班</view>
+						<view class="titles">{{info.title}}</view>
 						<view class="teacher">
 							<text>课程讲师：</text>
-							<text>武忠祥 刘金峰 姜晓千</text>
+							<text>{{info.lecturer}}</text>
 						</view>
 						<view class="money">
 							<text>¥</text>
-							<text>48.5</text>
+							<text>{{info.price}}</text>
 						</view>
 					</view>
 					<view class="back"></view>
@@ -25,25 +25,33 @@
 						<view class="titles" style="margin-top: 0;">
 							课程介绍
 						</view>
+						<view class="text-info">
+							{{video_desc}}
+						</view>
 					</view>
 				</view>
 			</view>
-			<view class="catalogue" v-if="current==1">
-				<view class="section u-flex u-row-between">
+			<view class="" style="height: 166rpx;"></view>
+			<view class="catalogue" v-if="current==1 && file.length > 0">
+				<view  v-for="(item,index) in file" :key="index" class="section u-flex u-row-between"
+					@click="onplay(item.url)">
 					<view class="">
-						<text class="tong">章节1</text>
-						<text class="tong" style="margin-left: 20rpx;">高等数学通用</text>
+						<text class="tong">{{item.title}}</text>
 					</view>
-					<view class="look">
+					<view v-if="info.is_pay==1" class="look">
 						观看
 					</view>
+					<view v-if="item.is_try==0" class="look">
+						试看
+					</view>
 				</view>
 			</view>
 		</view>
 		<view class="bottom" style="display: flex;justify-content: space-between;">
 			<view class="button1 u-flex u-row-center" v-if="current==0">
 				<view class="">免费试看</view>
-				<image src="/static/images/slice.png" style="width: 32rpx; height: 32rpx;margin-left: 12rpx;" mode=""></image>
+				<image src="/static/images/slice.png" style="width: 32rpx; height: 32rpx;margin-left: 12rpx;" mode="">
+				</image>
 			</view>
 			<view class="button2" v-if="current==0">
 				立即订阅
@@ -52,23 +60,57 @@
 				立即学习
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<video :src='url' class="video" id="demoVideo" :controls="true" :enable-progress-gesture="false">
+			</video>
+		</u-popup>
 	</view>
-</template>  
+</template>
 
 <script>
 	export default {
 		data() {
 			return {
+				show1: false,
 				list: [{
 					name: '课程介绍',
 				}, {
 					name: '目录',
 				}],
 				current: 0,
-				show: false
+				show: false,
+				id: '',
+				video_desc: '',
+				info: {
+					image: '',
+					lecturer: '',
+					price: '',
+					title: '',
+					is_pay: '',
+				},
+				file: [],
+				url: ''
 			};
 		},
+		onLoad(options) {
+			this.id = options.id
+			this.getVideoInfo()
+		},
 		methods: {
+			//获取视频信息
+			getVideoInfo() {
+				this.$u.post('api/video/getVideoInfo', {
+					id: this.id
+				}).then(res => {
+					console.log('info', res);
+					this.info = res.data
+					const a = new RegExp('style=""', 'gi')
+					var content = res.data.video_desc.replace(a, `styles`)
+					const regex = new RegExp('<img', 'gi')
+					this.video_desc = content.replace(regex, `<img style="max-width: 100%; height: auto"`)
+					this.file = res.data.file
+				})
+			},
 			change(index) {
 				this.current = index;
 			},
@@ -76,12 +118,24 @@
 				uni.navigateTo({
 					url: '/pages/index/updown'
 				})
+			},
+			onplay(url) {
+				this.show1 = true
+				this.url = url
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.text-info {
+		font-size: 28rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		color: #222222;
+		margin-top: 24rpx;
+	}
+
 	.button1 {
 		width: 336rpx;
 		height: 88rpx;

pages/mine/card.vue

@@ -2,91 +2,58 @@
 	<view class="page">
 		<u-tabs :font-size='28' :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		<view class="list" v-if="current==0">
-			<view class="box u-flex">
+			<view class="box u-flex" v-for="(item,index) in MyCertificate" :key="index">
 				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
 				<view class="" style="margin-left: 62rpx;width: 300rpx;">
 					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
+						{{item.goods.title}}
 					</view>
 					<view class="time">
-						有效期至:2023/12/23 23:59
+						{{item.free_end_time||''}}
 					</view>
 				</view>
-				<view class="button" style="margin-left: 36rpx;">
+				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;" @click='use(item.id)'>
 					立即使用
 				</view>
-			</view>
-			<view class="box u-flex">
-				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
-				<view class="" style="margin-left: 62rpx;width: 300rpx;">
-					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
-					</view>
-					<view class="time">
-						有效期至:2023/12/23 23:59
-					</view>
-				</view>
-				<view class="">
+				<view v-if="item.is_expire==0" class="">
 					<image src="../../static/images/past.png" style="width: 200rpx;height: 200rpx;" mode=""></image>
 				</view>
 			</view>
 		</view>
 		<view class="list" v-if="current==1">
-			<view class="box u-flex">
+			<view class="box u-flex" v-for="(item,index) in certificate" :key="index">
 				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
 				<view class="" style="margin-left: 62rpx;width: 300rpx;">
 					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
+						{{item.goods.title}}
 					</view>
 					<view class="time">
-						有效期至:2023/12/23 23:59
+						{{item.free_end_time||''}}
 					</view>
 				</view>
-				<view class="button" style="margin-left: 36rpx;">
+				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;" @click='use(item.id)'>
 					立即使用
 				</view>
-			</view>
-			<view class="box u-flex">
-				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
-				<view class="" style="margin-left: 62rpx;width: 300rpx;">
-					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
-					</view>
-					<view class="time">
-						有效期至:2023/12/23 23:59
-					</view>
-				</view>
-				<view class="">
+				<view v-if="item.is_expire==0" class="">
 					<image src="../../static/images/past.png" style="width: 200rpx;height: 200rpx;" mode=""></image>
 				</view>
 			</view>
 		</view>
 		<view class="list" v-if="current==2">
-			<view class="box u-flex">
+			<view class="box u-flex" v-for="(item,index) in uncertificate" :key="index">
 				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
 				<view class="" style="margin-left: 62rpx;width: 300rpx;">
 					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
+						{{item.goods.title}}
 					</view>
 					<view class="time">
-						有效期至:2023/12/23 23:59
+						{{item.free_end_time||''}}
 					</view>
 				</view>
-				<view class="button" style="margin-left: 36rpx;">
+				<view v-if="item.is_expire==1" class="button" style="margin-left: 36rpx;">
 					立即使用
 				</view>
-			</view>
-			<view class="box u-flex">
-				<image src="/static/logo.png" style="width:120rpx;height: 160rpx;" mode=""></image>
-				<view class="" style="margin-left: 62rpx;width: 300rpx;">
-					<view class="title">
-						高手控局:中国历史中的 殿堂级处世智慧电
-					</view>
-					<view class="time">
-						有效期至:2023/12/23 23:59
-					</view>
-				</view>
-				<view class="">
+				<view v-if="item.is_expire==0" class="">
 					<image src="../../static/images/past.png" style="width: 200rpx;height: 200rpx;" mode=""></image>
 				</view>
 			</view>
@@ -105,13 +72,50 @@
 				}, {
 					name: '已过期',
 				}],
-				current: 0
+				current: 0,
+				MyCertificate: [],
+				certificate: [],
+				uncertificate: [],
 			};
 		},
+		onLoad() {
+			this.getMyCertificate()
+			this.Certificate()
+			this.unCertificate()
+		},
 		methods: {
+			use(id) {
+				uni.navigateTo({
+					url: '/pages/index/bookinfo?id=' + id
+				})
+			},
 			change(index) {
 				this.current = index;
-			}
+			},
+			getMyCertificate() {
+				this.$u.post('/api/certificate/getMyCertificate', {
+					is_expire: ''
+				}).then(res => {
+					console.log(res);
+					this.MyCertificate = res.data.data
+				})
+			},
+			Certificate() {
+				this.$u.post('/api/certificate/getMyCertificate', {
+					is_expire: 1
+				}).then(res => {
+					console.log(res);
+					this.certificate = res.data.data
+				})
+			},
+			unCertificate() {
+				this.$u.post('/api/certificate/getMyCertificate', {
+					is_expire: 0
+				}).then(res => {
+					console.log(res);
+					this.uncertificate = res.data.data
+				})
+			},
 		}
 	}
 </script>