6-19-1

api/index.js

@@ -1,58 +1,58 @@
-import request from '@/utils/request'
-
-// 获取版本号信息
-// #ifdef APP || H5
-export function getAppBBH(data) {
-	return request({
-		url: '/api/version',
-		method: 'get',
-		data
-	});
-}
-// #endif
-
-
-// 消息通知
-export function articleList(data, id) {
-	return request({
-		url: '/api/article/list/' + id,
-		method: 'get',
-		data
-	});
-}
-
-// 文章详细
-export function details(data, id) {
-	return request({
-		url: '/api/article/details/' + id,
-		method: 'get',
-		data
-	});
-}
-// 是否已读
-export function notify_read(data) {
-	return request({
-		url: '/api/car/notify_read',
-		method: 'post',
-		data
-	});
-}
-// 获取首页引导图
-export function guide_map(data) {
-	return request({
-		url: '/api/guide_map',
-		method: 'get',
-		data
-	});
-}
-//获取从业人员列表
+import request from '@/utils/request'
+
+// 获取版本号信息
+// #ifdef APP || H5
+export function getAppBBH(data) {
+	return request({
+		url: '/api/version',
+		method: 'get',
+		data
+	});
+}
+// #endif
+
+
+// 消息通知
+export function articleList(data, id) {
+	return request({
+		url: '/api/article/list/' + id,
+		method: 'get',
+		data
+	});
+}
+
+// 文章详细
+export function details(data, id) {
+	return request({
+		url: '/api/article/details/' + id,
+		method: 'get',
+		data
+	});
+}
+// 是否已读
+export function notify_read(data) {
+	return request({
+		url: '/api/car/notify_read',
+		method: 'post',
+		data
+	});
+}
+// 获取首页引导图
+export function guide_map(data) {
+	return request({
+		url: '/api/guide_map',
+		method: 'get',
+		data
+	});
+}
+//获取从业人员列表
 export function getWorkerList(data) {
 	return request({
 		url: '/api/pub/getWorkerList',
 		method: 'post',
 		data
 	});
-}
+}
 //https://api.myjie.cn/api/pub/
 export function getCardLookCountRank(data) {
 	return request({
@@ -64,8 +64,32 @@ export function getCardLookCountRank(data) {
 
 export function getArtDetail(data) {
 	return request({
-			url: '/api/pub/getArtDetail',
-			method: 'post',
-			data
-		});
+		url: '/api/pub/getArtDetail',
+		method: 'post',
+		data
+	});
+}
+
+export function getKcList(data) {
+	return request({
+		url: '/api/education/index',
+		method: 'post',
+		data
+	});
+}
+
+export function recommend(data) {
+	return request({
+		url: '/api/education/recommend',
+		method: 'post',
+		data
+	});
+}
+
+export function getCourseList(data) {
+	return request({
+		url: '/api/education/getCourseList',
+		method: 'post',
+		data
+	})
 }

pages.json

@@ -27,9 +27,15 @@
 		{
 			"path": "pages/userhome/user",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "个人中心"
 			}
+		},
+		{
+			"path": "pages/index/list",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "课程列表"
+			}
 		}
 	],
 	"subPackages": [
@@ -317,12 +323,12 @@
 		"root": "pages/eduction",
 		"name": "eduction",
 		"pages": [
-			{
-				"path": "list",
-				"style": {
-					"navigationBarTitleText": "课程列表"
-				}
-			},
+			// {
+			// 	"path": "list",
+			// 	"style": {
+			// 		"navigationBarTitleText": "课程列表"
+			// 	}
+			// },
 			{
 				"path": "detail",
 				"style": {
@@ -347,7 +353,13 @@
 				"iconPath": "static/tabBar/tab-home.png",
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
-			},
+			},
+			{
+					"pagePath": "pages/index/list",
+					"iconPath": "static/tabBar/kc.png",
+					"selectedIconPath": "static/tabBar/kcaction.png",
+					"text": "课程"
+				},
 			// {
 			// 	"pagePath": "pages/category/category",
 			// 	"iconPath": "static/tabBar/tab-cate.png",

pages/eduction/detail.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
 		<view class="video-wrap">
-			<video :src="could_play?'https://api.myjie.cn/static/viedo/ddd.mp4':''" id="videoId" class="top-video"
-				:enable-progress-gesture="false" poster="https://api.myjie.cn/resource/user/user1/fw1.png"></video>
+			<video :src="could_play?chooseCourse.course_sp:''" id="videoId" class="top-video" :poster="topimg" v-if="chooseCourse.course_sp"></video>
+			<image :src="topimg" mode="widthFix" v-else class="top-video"></image>
 			<!-- 视频蒙版 -->
 			<!-- <view class="mask" v-if="!could_play" @click.stop=""></view> -->
 		</view>
@@ -16,21 +16,22 @@
 		<view class="" v-if="currentIndex == 0">
 			<view class="base-info">
 				<view class="info-tit">
-					深度了解阿强是个大傻逼
+					{{chooseCourse.course_topic}}
 				</view>
 				<view class="info-info flex">
 					<view class="info-item">
-						课程：共10节
+						课程：共{{courseList.length}}节
 					</view>
 					<view class="hx">
 
 					</view>
 					<view class="info-item">
-						人数：522人学习
+						人数：{{chooseCourse.course_play_count}}人学习
 					</view>
 				</view>
 			</view>
 			<view class="jianjie">
+				<audio  :src="bq(chooseCourse.course_audio)"  controls v-if="chooseCourse.course_audio" :name="chooseCourse.course_topic" author="母婴严选"></audio>
 				<view class="jianjie-top flex">
 					<view class="hx">
 
@@ -42,7 +43,7 @@
 
 					</view>
 				</view>
-				<view class="" v-html="content">
+				<view class="" v-html="chooseCourse.course_intro">
 
 				</view>
 			</view>
@@ -59,21 +60,21 @@
 					</view>
 				</view>
 				<view class="kc-list">
-					<view class="kc-item flex" v-for="item in 10">
-						<image src="" mode="" class="kc-img"></image>
+					<view class="kc-item flex" v-for="item in recommendList" v-if="item.gr_id != id">
+						<image :src="item.indeximg.indexOf('http') == -1 ? ('https://myj.liuniu946.com' +item.indeximg) : item.indeximg" mode="" class="kc-img"></image>
 						<view class="kc-info">
 							<view class="info-tit clamp">
-								母婴行业必学舞蹈（邓晏老师视频）
+								{{item.title}}
 							</view>
 							<view class="info-cate clamp">
-								技术控必练习
+								{{item.ins}}
 							</view>
 							<view class="info-info flex">
 								<view class="rs">
-									100
+									{{item.count}}
 								</view>
 								<view class="visit">
-									555555
+									{{item.alll}}
 								</view>
 							</view>
 						</view>
@@ -85,22 +86,10 @@
 		<!-- 课程目录 -->
 		<view class="" v-if="currentIndex == 1">
 			<view class="kc-ml">
-				<view class="ml-item flex">
+				<view class="ml-item flex" v-for="item in courseList" :key="item.course_id" @click="choose(item)">
 					<view class="bs"></view>
 					<view class="">
-						备孕必检查项目介绍【备孕系列课程】/3备孕必检查项目介绍【备孕系列课程】/3
-					</view>
-				</view>
-				<view class="ml-item flex">
-					<view class="bs"></view>
-					<view class="">
-						备孕必检查项目介绍【备孕系列课程】/3
-					</view>
-				</view>
-				<view class="ml-item flex">
-					<view class="bs"></view>
-					<view class="">
-						备孕必检查项目介绍【备孕系列课程】/3
+						{{item.course_topic}}
 					</view>
 				</view>
 			</view>
@@ -135,9 +124,24 @@
 	</view>
 </template>
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getUser
+	} from '@/api/user.js';
+	import { getCourseList,recommend } from "@/api/index.js"
 	export default {
 		data() {
 			return {
+				user: {},
+				choosId: 0,
+				recommendList: [],
+				topimg: '',
+				id: '',
+				courseList: [],
+				chooseCourse: {},
 				content: '<p>ddddddd</p>',
 				currentIndex: 0,
 				could_play: false,
@@ -146,9 +150,9 @@
 					}, {
 						title: '课程目录'
 					},
-					{
-						title: '讲师全部课程'
-					}
+					// {
+					// 	title: '讲师全部课程'
+					// }
 				]
 			};
 		},
@@ -158,15 +162,163 @@
 			}
 		},
 		onLoad(opt) {
-
+			
+			if(opt.id) {
+				this.id = opt.id
+				this.getCourseList()
+			}
+			if(opt.img ) {
+				let imgurl = decodeURI(opt.img)
+				console.log(this.topimg);
+			}
+			this.getrecommendList()
 		},
 		onShow() {
-
+			
 		},
 		onReachBottom() {
 
 		},
 		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			navTo(url) {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
+					}
+				});
+			},
+			getUser() {
+				console.log('data')
+				const that = this;
+				getUser({}).then((e) => {
+					this.user = e.data;
+					this.setUserInfo(e.data)
+					// 
+					if(that.user.info_audit_status == 1 ) {
+						//双认证可播放
+						if(that.user.type_audit_status == 1) {
+							that.could_play = true
+						}else {
+							// 单次认证无平台认证
+							if(that.chooseCourse.course_price_3*1 > 0) {
+								//一次认证付费
+								that.could_play = false
+								let str = ''
+								if(that.user.type_audit_status == -2) {
+									str = '您未完成平台认证，是否立即认证？'
+								}
+								if(that.user.type_audit_status == -1) {
+									str = '您平台认证失败，请重新认证'
+								}
+								if(that.user.type_audit_status == -3) {
+									str = '您平台认证已失效，请重新认证'
+								}
+								if(that.user.type_audit_status == 0) {
+									str = '您已提交认证信息请等待认证结束'
+								}
+								uni.showModal({
+									title:'提示',
+									content:str?str:'您未完成平台认证，是否立即认证？',
+									complete(e) {
+										if(e.confirm) {
+											if (that.user.work_type_id <=0) {
+												that.navTo('/pages/user/model/modelrz?modelid='+that.user.show_template_id)
+											} else {
+												if (that.user.show_template_id) {
+													that.navTo('/pages/user/model/model?mtype=' + that.user.show_template_id+'&type=3')
+												}else{
+													uni.showModal({
+														title: '错误',
+														content: '您未购买模板请先购买',
+														showCancel: false,
+													});
+												}
+											}
+										}
+									}
+								})
+								
+							}else {
+								//一次认证即免费
+								that.could_play = true
+							}
+						}
+					}else {
+						//无认证 免费
+						if(that.chooseCourse.course_price*1 == 0) {
+							that.could_play = true
+						}else {
+							//付费
+							that.could_play = false
+							uni.showModal({
+								title:'提示',
+								content:'您未完成信息认证，是否立即认证？',
+								complete(e) {
+									
+									if(e.confirm) {
+										if (that.user.work_type_id <=0) {
+											that.navTo('/pages/user/model/modelrz?modelid='+that.user.show_template_id)
+										} else {
+											if (that.user.show_template_id) {
+												that.navTo('/pages/user/model/model?mtype=' + that.user.show_template_id+'&type=3')
+											}else{
+												uni.showModal({
+													title: '错误',
+													content: '您未购买模板请先购买',
+													showCancel: false,
+												});
+											}
+										}
+									}
+								}
+							})
+						}
+					}
+					
+				}).catch((e) => {
+					console.log(e, 'sj');
+				})
+			},
+			bq(url) {
+				if(url.indexOf('http') == -1) {
+					url = 'https://myj.liuniu946.com' + url
+				}
+				return url
+			},
+			choose(item) {
+				console.log(item,'item');
+				this.choosId = item.course_id
+				this.chooseCourse = item
+				this.currentIndex = 0
+			},
+			getrecommendList() {
+				recommend().then(res => {
+					console.log(res);
+					this.recommendList = res.data.recommendList.slice(0,3)
+				})
+			},
+			getCourseList() {
+				let that = this
+				getCourseList({
+					gr_id: that.id
+				}).then(res => {
+					console.log(res);
+					this.courseList = res.data.map(item => {
+						// item.course_sp = (item.course_sp.indexOf('http') == -1 )? ('http://qiniuyun.deepbytop.com' + item.course_sp ): item.course_sp
+						item.course_sp = item.course_sp.replace(/http:/g,'https:')
+						item.course_intro = item.course_intro.replace(/img src="/g,'img class="rich-img" src="https://myj.liuniu946.com')
+						return item
+					})
+					this.chooseCourse = this.courseList[0]
+					this.topimg = (this.chooseCourse.course_cover.indexOf('http') == -1 ? ('https://myj.liuniu946.com' + this.chooseCourse.course_cover): this.chooseCourse.course_cover)
+					console.log(this.chooseCourse.course_sp);
+					this.getUser()
+				})
+			},
 			navClick(index) {
 				this.currentIndex = index
 			}
@@ -354,4 +506,7 @@
 		}
 
 	}
+	/deep/ .rich-img {
+		width: 100% !important;
+	}
 </style>

pages/eduction/list.vue → pages/index/list.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
-		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="item in imagelist" class="carousel-item" @click="navTo(item.url)">
-				<image class="imageitem" :src="item.img" />
+		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" >
+			<swiper-item v-for="item in recommendList" class="carousel-item" @click="navTo('/pages/eduction/detail?id=' + item.gr_id + '&img=' + encodeURI(item.indeximg))">
+				<image class="imageitem" :src="item.indeximg.indexOf('http') == -1 ? ('https://myj.liuniu946.com' +item.indeximg) : item.indeximg " />
 			</swiper-item>
 		</swiper>
 		<view class="nav flex">
@@ -11,51 +11,73 @@
 				{{item.title}}
 			</view>
 		</view>
-		<scroll-view scroll-y="true" :style="{'height':height}" class="scroll-wrap">
-			<view class="kc-item flex" v-for="item in 10">
-				<image src="" mode="" class="kc-img"></image>
+		<scroll-view scroll-y="true" :style="{'height':height}" class="scroll-wrap" @scrolltolower="getKcList">
+			<view class="kc-item flex" v-for="item in navList[currentIndex].list" @click="navTo('/pages/eduction/detail?id=' + item.gr_id + '&img=' + encodeURI(item.indeximg))">
+				<image :src="item.indeximg.indexOf('http') == -1 ? ('https://myj.liuniu946.com' +item.indeximg) : item.indeximg " mode="" class="kc-img"></image>
 				<view class="kc-info">
 					<view class="info-tit clamp">
-						母婴行业必学舞蹈（邓晏老师视频）
+						{{item.title}}
 					</view>
 					<view class="info-cate clamp">
-						技术控必练习
+						{{item.ins}}
 					</view>
 					<view class="info-info flex">
 						<view class="rs">
-							100
+							{{item.count}}
 						</view>
 						<view class="visit">
-							555555
+							{{item.alll}}
 						</view>
 					</view>
 				</view>
 			</view>
+			<uni-load-more :status="navList[currentIndex].loadingType"></uni-load-more>
 		</scroll-view>
 	</view>
 </template>
 <script>
+	import {
+		getKcList,
+		recommend
+	} from '@/api/index.js'
 	export default {
 		data() {
 			return {
+				recommendList: [],
 				height: '',
 				currentIndex: 0,
 				navList: [{
-						title: '全部'
+						title: '全部',
+						page: 1,
+						pageSize: 10,
+						list: [],
+						loadingType: 'morde',
+						loaded: false
 					}, {
-						title: '视频'
+						title: '视频',
+						page: 1,
+						pageSize: 10,
+						list: [],
+						loadingType: 'morde',
+						type: 0,
+						loaded: false
 					},
 					{
-						title: '音频'
+						title: '音频',
+						page: 1,
+						pageSize: 10,
+						list: [],
+						loadingType: 'morde',
+						type: 1,
+						loaded: false
 					}
 				]
 			};
 		},
-		onLoad(opt) {
-
-		},
+		onLoad(opt) {},
 		onShow() {
-
+			this.getKcList()
+			this.getrecommendList()
 		},
 		onReady(res) {
 			var that = this;
@@ -74,8 +96,51 @@
 
 		},
 		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
+					}
+				})
+			},
+			getrecommendList() {
+				recommend().then(res => {
+					console.log(res);
+					this.recommendList = res.data.recommendList
+				})
+			},
+			getKcList(type) {
+				let that = this;
+				let item = that.navList[that.currentIndex]
+				if(item.loaded && type == 'tab') {
+					return
+				}
+				if(item.loadingType == 'noMore' || item.loadingType == 'loading') {
+					return
+				}
+				item.loadingType = 'loading'
+				getKcList({
+					type1: item.type,
+					page: item.page,
+					pageSize: item.pageSize
+				}).then(res => {
+					console.log(res);
+					item.list = item.list.concat(res.data.grlist)
+					item.page++
+					if(item.pageSize == res.data.grlist.length) {
+						item.loadingType = 'more'
+					}else {
+						item.loadingType = 'noMore'
+					}
+					item.loaded = true
+				})
+			},
 			navClick(index) {
 				this.currentIndex = index
+				this.getKcList('tab')
 			}
 		}
 	};
@@ -85,15 +150,14 @@
 		margin: auto;
 		width: 750rpx;
 		height: 392rpx;
-		padding: 0 $page-row-spacing;
 
 		.carousel-item {
-			border-radius: 20rpx;
+			// border-radius: 20rpx;
 
 			.imageitem {
 				// margin: auto;
-				width:750rpx;
-				height:392rpx;
+				width: 750rpx;
+				height: 392rpx;
 			}
 		}
 	}
@@ -102,6 +166,7 @@
 		width: 750rpx;
 		height: 88rpx;
 		margin: 20rpx 0;
+
 		.nav-item {
 			line-height: 88rpx;
 			width: 50%;
@@ -119,15 +184,17 @@
 
 		background-color: #fff;
 	}
+
 	.scroll-wrap {
 		// background-color: red;
 	}
+
 	.kc-item {
 		// border-bottom: #c8c7cc solid 1px;
 		padding: 22rpx 0;
 		justify-content: center;
 		background-color: #fff;
-	
+
 		.kc-img {
 			flex-shrink: 0;
 			width: 266rpx;
@@ -135,7 +202,7 @@
 			margin-right: 20rpx;
 			background-color: #eee;
 		}
-	
+
 		.kc-info {
 			height: 164rpx;
 			width: 360rpx;
@@ -143,28 +210,28 @@
 			flex-direction: column;
 			justify-content: space-between;
 			align-items: flex-start;
-	
+
 			// background-color: red;
 			.info-tit {
 				width: 100%;
 				font-size: 32rpx;
 				color: #000;
 			}
-	
+
 			.info-cate {
 				width: 100%;
 				color: #ff5a97;
 				font-size: 28rpx;
 			}
-	
+
 			.info-info {
 				width: 360rpx;
 				font-size: 24rpx;
-	
+
 				.rs {
 					color: #8f8f94;
 				}
-	
+
 				.visit {
 					color: $base-color;
 				}