1.27

components/ty-paper/ty-paper.vue

@@ -33,10 +33,6 @@
 					<view class="btn2" @click="enter">确认</view>
 				</view>
 			</view>
-			<!-- 			<view class="" style="background: rgba(0, 0, 0, 0.1);width: 750rpx;
-height: 940rpx;position: absolute;top:50rpx ;left: -24rpx;z-index: 1;">
-
-			</view> -->
 		</view>
 		<scroll-view :scroll-y='true' class="u-flex u-row-between" style="flex-wrap: wrap;">
 			<view class="" @click="toinfo(item.id)" v-for="(item,index) in paperlist" :key="index"

pages/index/bookinfo.vue

@@ -22,13 +22,13 @@
 			</view>
 			<view class="" style="margin-top: 24rpx;">
 				<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>
+					<swiper-item v-for="(parent,index) in swiptlist" :key="index">
+						<view class="u-flex  swiper-item">
+							<view class="" v-for="child in parent" @click="toinfo(child.id)">
+								<image :src="child.image" style="width: 196rpx;height: 280rpx;" mode=""></image>
+								<view class="u-line-1" style="width: 196rpx;">{{child.title}}</view>
 								<view class="">
-									定价：<span style="color:rgba(204, 51, 0, 1) ;">¥28.5</span>
+									定价：<span style="color:rgba(204, 51, 0, 1) ;">¥{{child.price}}</span>
 								</view>
 							</view>
 						</view>
@@ -67,7 +67,7 @@
 				<view class="tu">
 					<view class="" style="position: relative;">
 						<view class="brief">内容简介</view>
-						<image class="image" src="/static/images/compile.png" mode=""></image>
+						<image class="image" src="/static/images/compile2.png" mode=""></image>
 					</view>
 					<view class="fonta">
 						{{datainfo.content_desc}}
@@ -76,7 +76,7 @@
 				<view class="tu">
 					<view class="" style="position: relative;">
 						<view class="brief">作者简介</view>
-						<image class="image" src="/static/images/compile.png" mode=""></image>
+						<image class="image" src="/static/images/compile2.png" mode=""></image>
 					</view>
 					<view class="fonta">
 						{{datainfo.author_desc}}
@@ -157,11 +157,6 @@
 				<view class="">
 					<view class="sample u-flex u-row-between">
 						<view class="">资源包</view>
-						<!-- <view class="u-flex">
-							<view class="selling">资源售价</view>
-							<view class="money5">¥48.5</view>
-							<view class="button4">付费下载</view>
-						</view> -->
 					</view>
 					<view class="courseware">电子书</view>
 					<view v-for="(item,index) in courseware_file" :key="index" class=""
@@ -209,15 +204,7 @@
 				}],
 				current: 0,
 				show: false,
-				list1: [{
-						image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
-						title: '身无彩凤双飞翼，心有灵犀一点通'
-					},
-					{
-						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
-						title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
-					}
-				],
+				list1: [],
 				id: '',
 				datainfo: {
 					sheet: '',
@@ -260,6 +247,11 @@
 			this.getBookInfo()
 		},
 		methods: {
+			//跳转详情
+			toinfo(id) {
+				this.id = id
+				this.getBookInfo()
+			},
 			//立即购买
 			orderinfo() {
 				uni.navigateTo({
@@ -271,15 +263,18 @@
 				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 = []
+					this.swiptlist = res.data.reduce((a, b) => {
+						let lastIndex = a.length - 1
+						if (a[lastIndex].length < 3) {
+							a[lastIndex].push(b)
+						} else {
+							a.push([b])
 						}
-					}
+						return a
+					}, [
+						[]
+					])
+
 				})
 			},
 			//详情
@@ -526,4 +521,8 @@
 			margin-left: 12rpx;
 		}
 	}
+
+	.swiper-item :not(:last-child) {
+		margin-right: 14rpx;
+	}
 </style>

pages/index/index-search.vue

@@ -6,7 +6,7 @@
 					@search="tosearch(1)"></u-search>
 			</u-navbar>
 		</view>
-		<view class="u-flex u-row-between top" v-if="positionlist.length == 0">
+		<view class="u-flex u-row-between top" v-if="show1">
 			<view class="his">
 				搜索历史
 			</view>
@@ -14,49 +14,68 @@
 				<u-icon name="trash" color="rgba(0,0,0,.7)" size="14"></u-icon>
 			</view>
 		</view>
-		<view class="u-flex" style="flex-wrap: wrap;margin-top: 24rpx;" v-if="positionlist.length == 0">
+		<view class="u-flex" style="flex-wrap: wrap;margin-top: 24rpx;" v-if="show1">
 			<view class="item" style="margin-right: 16rpx;" v-for="(item,index) in search" :key="index">
 				{{item}}
 			</view>
 		</view>
-		<view class="u-flex u-row-between pad" style="margin-top:30rpx ;">
+		<view v-if="show" class="u-flex u-row-between pad" style="margin-top:30rpx ;">
 			<view class="" v-for="(item,index) in list" :key="index" @click="onchange(index)">
 				<text :class="curret==index?'one':'two' ">{{item}}</text>
 				<view v-if="curret==index" class="bottom">
 				</view>
 			</view>
 		</view>
-		<view class="sou">
-			<text>共32条“</text>
+		<view v-if="show" class="sou">
+			<text>共{{total}}条“</text>
 			<text style="color: #0ED4AA;">{{keyword1}}</text>
 			<text>”相关的搜素结果</text>
 		</view>
-		<view class="list1">
-			<view class="u-flex" style="margin-top: 28rpx;" v-if="curret==0">
-				<image src="/static/logo.png" style="width: 239rpx;height: 240rpx;" mode=""></image>
-				<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
- justify-content: space-between;">
-					<view class="">
-						<view class="title">ERP财务管理系统教程（用友U8V10.111111111)</view>
-						<view class="writer">陆培中，刘亚男</view>
-					</view>
-					<view class="">
-						<text class="ding">定价</text>
-						<text class="yang">¥</text>
-						<text class="money">38.5</text>
+		<view class="" v-if="positionlist.length > 0">
+			<view class="list1">
+				<view v-for="(item,index) in positionlist" :key="index" class="u-flex" style="margin-top: 28rpx;"
+					v-if="curret==0">
+					<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
+					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
+			justify-content: space-between;">
+						<view class="">
+							<view class="title">{{item.title}}</view>
+							<view class="writer">{{item.author}}</view>
+						</view>
+						<view class="">
+							<text class="ding">定价</text>
+							<text class="yang">¥</text>
+							<text class="money">{{item.price}}</text>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="top" v-if="curret==2">
-				<view class="flex">
-					<image src="/static/logo.png" style="width: 212rpx;height: 128rpx;" mode=""></image>
-					<view class="" style="margin-left: 20rpx;">
-						<view class="title1">ERP财务管理系统教程（用友U8V10.11111111)</view>
-						<view class="writer">陆培中，刘亚男</view>
+				<view v-for="(item,index) in positionlist" :key="index" class="u-flex" style="margin-top: 28rpx;"
+					v-if="curret==1">
+					<image :src="item.image" style="width: 239rpx;height: 240rpx;" mode=""></image>
+					<view class="u-flex-col " style="margin-left: 20rpx;height: 240rpx;padding: 12rpx 0;
+			justify-content: space-between;">
+						<view class="">
+							<view class="title">{{item.title}}</view>
+							<view class="writer">{{item.author}}</view>
+						</view>
+						<view class="">
+							<text class="ding">定价</text>
+							<text class="yang">¥</text>
+							<text class="money">{{item.price}}</text>
+						</view>
 					</view>
 				</view>
-				<view class="money1">
-					¥158.0
+				<view v-for="(item,index) in VideoList" :key="index" class="top" v-if="curret==2">
+					<view class="flex">
+						<image :src="item.image" style="width: 212rpx;height: 128rpx;" mode=""></image>
+						<view class="" style="margin-left: 20rpx;">
+							<view class="title1">{{item.title}}</view>
+							<view class="writer">{{item.lecturer}}</view>
+						</view>
+					</view>
+					<view class="money1">
+						¥{{item.price}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -69,11 +88,17 @@
 			return {
 				keyword1: '',
 				search: [],
-				positionlist: [1],
+				positionlist: [],
 				list: [
 					'纸质书', '电子书', '名师教学视频'
 				],
 				curret: 0,
+				page: 1,
+				limit: 10,
+				show: false,
+				show1: true,
+				total: 0,
+				VideoList: []
 			};
 		},
 		onLoad() {
@@ -84,24 +109,59 @@
 		methods: {
 			onchange(index) {
 				this.curret = index
+				if (index == 2) {
+					this.getVideoList()
+				} else {
+					this.getBooksList()
+				}
 			},
 			clear() {
 				uni.removeStorageSync('searchdata')
 				this.search = []
 			},
 			tosearch(type) {
-				// this.positionlist = []
-				// if (type == 1) {
-				// 	this.keyword = this.keyword1
-				// }
-				// this.page = 1
-				// this.total = 0
-				// this.getlist()
 				if (this.keyword1 != '') {
 					this.search.push(this.keyword1)
 				}
 				uni.setStorageSync('searchdata', this.search)
+				this.getBooksList()
+			},
+			getBooksList() {
+				this.$u.post('api/books/getBooksList', {
+					page: this.page,
+					limit: this.limit,
+					keywords: this.keyword1,
+					book_type: this.curret
+				}).then(res => {
+					this.positionlist = res.data.data
+					this.total = res.data.total
+					if (this.positionlist.length == 0) {
+						this.show = true
+						this.show1 = false
+					} else if (this.positionlist.length > 0) {
+						this.show = true
+						this.show1 = false
+					}
+				})
 			},
+			getVideoList() {
+				this.$u.post('api/video/getVideoList', {
+					page: this.pagea,
+					limit: this.limita,
+					keywords: this.keyword1
+				}).then(res => {
+					console.log('list', res);
+					this.total = res.data.total
+					this.VideoList = res.data.data
+					if (this.VideoList.length == 0) {
+						this.show = true
+						this.show1 = false
+					} else if (this.VideoList.length > 0) {
+						this.show = true
+						this.show1 = false
+					}
+				})
+			}
 		}
 	}
 </script>

pages/index/index.vue

@@ -36,7 +36,11 @@
 		<view class="" style="height: 200rpx;"></view>
 		<view v-if="curret==0" class="back pad">
 			<view class="wrap" v-if="curret==0">
-				<u-swiper :list="list"></u-swiper>
+				<swiper class="swiper" style="height: 280rpx;border-radius: 20rpx;" circular>
+					<swiper-item v-for="(item,index) in imagelist" :key="index" @click="toinfo(item.id,item.jump_type)">
+						<image style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill" :src="item.image"></image>
+					</swiper-item>
+				</swiper>
 			</view>
 			<view class="jiang">
 				<view class="u-flex u-row-between">
@@ -65,14 +69,6 @@
 					<text class="title1">新书推荐</text>
 					<view class="look" @click="tomore(4)">查看更多</view>
 				</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)">
@@ -114,12 +110,14 @@
 				page1: 1,
 				limit1: 10,
 				awardlist: [],
-				newlist: []
+				newlist: [],
+				imagelist: []
 			}
 		},
 		onLoad() {
 			this.getnewlist()
 			this.getawardslist()
+			this.getBanner()
 		},
 		methods: {
 			tomore(index) {
@@ -130,6 +128,15 @@
 					duration: 0
 				})
 			},
+			//轮播图
+			getBanner() {
+				this.$u.post('/api/banner/getBanner').then(res => {
+					if (res.code == 1) {
+						this.imagelist = res.data
+						console.log('imagelist', this.imagelist);
+					}
+				})
+			},
 			// 新书推荐
 			getnewlist() {
 				this.$u.post('api/books/getBooksList', {
@@ -137,7 +144,6 @@
 					page: this.page,
 					limit: this.limit
 				}).then(res => {
-					// console.log(res);
 					this.newlist = res.data.data
 				})
 			},
@@ -160,10 +166,17 @@
 					url: "/pages/index/index-search"
 				})
 			},
-			toinfo(id) {
-				uni.navigateTo({
-					url: '/pages/index/bookinfo?id=' + id
-				})
+			toinfo(id, type=0) {
+				if (type == 0) {
+					uni.navigateTo({
+						url: '/pages/index/bookinfo?id=' + id
+					})
+				}
+				if (type == 1) {
+					uni.navigateTo({
+						url: '/pages/index/video?id=' + id
+					})
+				}
 			},
 			contribute() {
 				uni.navigateTo({
@@ -293,6 +306,7 @@
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		padding: 28rpx 20rpx 0;
+		margin-top: 28rpx;
 	}
 
 	.back {

pages/index/orderinfo.vue

@@ -3,19 +3,19 @@
 		<view class="info">
 			<view class="u-flex u-row-between">
 				<text class="shang">商品信息</text>
-				<text class="more">展开</text>
+				<text class="more" @click="open">展开</text>
 			</view>
-			<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in 4" :key="index">
+			<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,index) in orderlist.slice(0,3)" :key="index">
 				<view class="box">
-					<image src="/static/logo.png" style="width: 120rpx;height: 160rpx;" mode=""></image>
+					<image :src="item.image" style="width: 120rpx;height: 160rpx;" mode=""></image>
 				</view>
 				<view class=""
 					style="margin-left: 20rpx;justify-content: space-between;display: flex;flex-direction: column;height: 160rpx;">
 					<view class="">
-						<view class="title u-line-1">中医基础理论(全国中医药行业高…</view>
+						<view class="title u-line-1">{{item.title}}</view>
 						<view class="fufei">资源类型：付费资源</view>
 					</view>
-					<view class="money">¥324.5</view>
+					<view class="money">¥{{item.price}}</view>
 				</view>
 			</view>
 			<view class="jiner ">
@@ -23,7 +23,7 @@
 					<text class="sum">商品金额</text>
 					<view class="">
 						<text class="figure">￥</text>
-						<text class="figure" style="font-size: 32rpx;font-weight: 400;">325.00</text>
+						<text class="figure" style="font-size: 32rpx;font-weight: 400;">{{orderinfo.total_price}}</text>
 					</view>
 				</view>
 			</view>
@@ -70,16 +70,29 @@
 	export default {
 		data() {
 			return {
-				value: 0
+				value: 0,
+				orderlist: [],
+				orderinfo: {
+					total_price: ''
+				}
 			};
 		},
-		onLoad() {
+		onLoad(options) {
 			this.getOrderList()
+			this.orderid = options.id
 		},
 		methods: {
+			open() {
+
+			},
 			//获取订单列表
-			getOrderList(){
-				
+			getOrderList() {
+				this.$u.post('api/order/getOrderInfo', {
+					id: this.orderid
+				}).then(res => {
+					this.orderlist = res.data.goods
+					this.orderinfo = res.data
+				})
 			},
 			// 选中某个单选框时，由radio时触发
 			radioChange(e) {

pages/index/updown.vue

@@ -51,7 +51,8 @@
 				change: 0,
 				all: false,
 				list: [],
-				series_id: ''
+				series_id: '',
+				orderid: ''
 			};
 		},
 		onLoad(options) {
@@ -75,14 +76,15 @@
 			},
 			//订单确认
 			orderinfo() {
-				this.$u.post('', {
+				this.$u.post('api/order/createOrder', {
 					goods_id: '',
-					type: ''
+					type: 0
 				}).then(res => {
 					if (res.code == 1) {
+						this.orderid = res.data.id
 						setTimeout(() => {
 							uni.navigateTo({
-								url: '/pages/index/orderinfo'
+								url: '/pages/index/orderinfo?id=' + this.orderid
 							})
 						}, 800)
 					}

pages/mine/card.vue

@@ -85,10 +85,11 @@
 		},
 		methods: {
 			use(id) {
+				console.log(id);
 				this.$u.post('/api/certificate/useCertificate', {
-					id: this.id
+					id:id
 				}).then(res => {
-
+				
 				})
 			},
 			change(index) {
@@ -98,8 +99,8 @@
 				this.$u.post('/api/certificate/getMyCertificate', {
 					is_expire: ''
 				}).then(res => {
-					console.log(res);
 					this.MyCertificate = res.data.data
+					console.log('MyCertificate',this.MyCertificate);
 				})
 			},
 			Certificate() {

pages/mine/setting.vue

@@ -22,7 +22,7 @@
 				<image src="/static/images/return.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 			</view>
 		</view>
-		<view class="button">
+		<view class="button" @click="toquit">
 			退出登录
 		</view>
 	</view>
@@ -50,6 +50,12 @@
 				uni.navigateTo({
 					url:'/pages/mine/abount'
 				})
+			},
+			toquit(){
+				uni.clearStorageSync()
+				uni.navigateTo({
+					url:'/pages/login/login'
+				})
 			}
 		}
 	}