Merge branch 'master' of http://120.79.166.78:7071/zhongzheng-edu/zz--front

common/httpList/collect.js

@@ -24,4 +24,28 @@ export default {
 			method: 'get',
 		})
 	},
+	//查询收藏课程列表
+	courseCollectList(data) {
+		return myRequest({
+			url: '/collect/course/list',
+			method: 'get',
+			data: data,
+		})
+	},
+	//查询收藏题库列表
+	bankCollectList(data) {
+		return myRequest({
+			url: '/collect/bank/list',
+			method: 'get',
+			data: data,
+		})
+	},
+	//查询收藏重点列表
+	courseNoteList(data) {
+		return myRequest({
+			url: '/collect/note/list',
+			method: 'get',
+			data: data,
+		})
+	},
 }

common/methodTool.js

@@ -25,4 +25,21 @@ export default {
 			url: '/pages/index/index'
 		});
 	},
+	/* 时间戳转换成日期
+	 * @param timestamp
+	 * @returns {*}
+	 */
+	timestampToTime(timestamp,isDay=true) {
+	    var date = new Date(timestamp * 1000);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+	    var Y = date.getFullYear() + '-';
+	    var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+	    var D = date.getDate() + ' ';
+	    var h = date.getHours() + ':';
+	    var m = date.getMinutes() + ':';
+	    var s = date.getSeconds();
+		if(isDay){
+			return Y+M+D;
+		}
+	    return Y+M+D+h+m+s;
+	}
 }

components/my.vue

@@ -133,10 +133,10 @@
 				collectTotal:0
 			};
 		},
-		mounted(){
-			this.getInfoAttached()
-		},
 		methods: {
+			init(){
+				this.getInfoAttached()
+			},
 			jumpPopup(){
 				this.show = true
 			},

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<home v-show="current==0"></home>
-		<my v-show="current==1"></my>
+		<my v-show="current==1" ref="refMy"></my>
 		
 		<u-tabbar v-model="current" :list="list" active-color="#2F4379" :before-switch="beforeSwitch" ></u-tabbar>
 	</view>
@@ -51,6 +51,9 @@
 					this.$navTo.togo('/pages/login/login');
 					return false
 				}else{
+					if(index==1){
+						this.$refs.refMy.init()
+					}
 					return true
 				}
 				

pages2/course/detail.vue

@@ -228,18 +228,20 @@ export default {
 			payStatus: true, //是否购买该课程
 			commendList: [], //推荐课程列表
 			collecStatus: false, //收藏状态
-			initH4: 0
+			initH4: 0,
+			id:0
 		};
 	},
 	onLoad(option) {
 		const Verify = require('@/wxcomponents/verify_mpsdk/main.js');
 		Verify.init();
+		this.id = option.id
 		this.$api.courseInfo(option.id).then(res => {
-			this.queryData = res.data.data;
+			this.pageData = res.data.data;
 			this.getTeacher(res.data.data.teacherIds);
-			this.getChapter(res.data.data.courseId);
-			this.getcommendList(res.data.data.courseId);
 		});
+		this.getChapter(this.id);
+		this.getcommendList(this.id);
 	},
 	onShow() {
 		if (!uni.getStorageSync('union_id') && this.$store.state.token === '') {
@@ -271,9 +273,7 @@ export default {
 		}
 	},
 	methods: {
-		getHeight() {
-			let that = this;
-		},
+
 		swipStatus() {
 			this.activeStatus = !this.activeStatus;
 			let self = this;
@@ -309,9 +309,6 @@ export default {
 			query
 				.select('#modules4')
 				.boundingClientRect(data => {
-					that.h4 = data.height;
-					console.log(data.height, 4444);
-					//	that.h4 = data.height;
 					if (that.h4 == 0) {
 						that.h4 = data.height;
 					}
@@ -334,7 +331,7 @@ export default {
 				.exec();
 		},
 		favoritesStatus() {
-			this.$api.coursecollectPD(this.queryData.courseId).then(result => {
+			this.$api.coursecollectPD(this.id).then(result => {
 				if (result.data.data === undefined) {
 					this.collecStatus = false;
 				} else {
@@ -350,7 +347,7 @@ export default {
 				});
 			} else {
 				if (this.collecStatus) {
-					this.$api.coursecollectPD(this.queryData.courseId).then(results => {
+					this.$api.coursecollectPD(self.id).then(results => {
 						self.$api.deletecoursecollect(results.data.data.collectCourseId).then(resz => {
 							self.favoritesStatus();
 						});
@@ -358,7 +355,7 @@ export default {
 				} else {
 					var data = {
 						userId: this.$store.state.userInfo.userId,
-						courseId: this.queryData.courseId
+						courseId: self.id
 					};
 					this.$api.coursecollect(data).then(res => {
 						self.favoritesStatus();

pages2/wd/collect.vue

@@ -5,24 +5,21 @@
 		</view>
 		<view >
 		    <view v-show="current === 0">
-		        <view class="content" v-for="(item,index) in list" :key="index">
+		        <view class="content" v-for="(item,index) in list1" :key="index" @click="jumpDetail(item)">
 					<view class="c_t1">
-						2021年5月1日
+						{{$method.timestampToTime(item.createTime)}}
 					</view>
 					<view>
 						<u-row >
 							<u-col span="5" >
 								<view style="padding: 5rpx;">
-									<image src="/static/banner.png" class="c_img"></image>
+									<image :src="$method.splitImgHost(item.coverUrl)" class="c_img"></image>
 								</view>
 							</u-col>
 							<u-col span="7" >
 								<view style="position: relative;height: 134rpx;padding-left: 10rpx;">
 									<view class="c_title">
-										二级建造师市政公用工程
-									</view>
-									<view class="c_log">
-										上次看到 2.1 二级建造师章节标题
+										{{item.courseName}}
 									</view>
 								</view>
 							</u-col>
@@ -32,11 +29,54 @@
 				</view>
 		    </view>
 		    <view v-show="current === 1">
-		        选项卡2的内容
+		        <view class="content" v-for="(item,index) in list2" :key="index" @click="jumpDetail(item)">
+		        	<view class="c_t1">
+		        		{{$method.timestampToTime(item.createTime)}}
+		        	</view>
+		        	<view>
+		        		<u-row >
+		        			<u-col span="5" >
+		        				<view style="padding: 5rpx;">
+		        					<image :src="$method.splitImgHost(item.coverUrl)" class="c_img"></image>
+		        				</view>
+		        			</u-col>
+		        			<u-col span="7" >
+		        				<view style="position: relative;height: 134rpx;padding-left: 10rpx;">
+		        					<view class="c_title">
+		        						{{item.bankName}}
+		        					</view>
+		        				</view>
+		        			</u-col>
+		        		</u-row>
+		        	</view>
+		        	
+		        </view>
 		    </view>
 		    <view v-show="current === 2">
-		        选项卡3的内容
+		        <view class="content" v-for="(item,index) in list3" :key="index" @click="jumpDetail(item)">
+		        	<view class="c_t1">
+		        		{{$method.timestampToTime(item.createTime)}}
+		        	</view>
+		        	<view>
+		        		<u-row >
+		        			<u-col span="5" >
+		        				<view style="padding: 5rpx;">
+		        					<image :src="$method.splitImgHost(item.coverUrl)" class="c_img"></image>
+		        				</view>
+		        			</u-col>
+		        			<u-col span="7" >
+		        				<view style="position: relative;height: 134rpx;padding-left: 10rpx;">
+		        					<view class="c_title">
+		        						{{item.name}}
+		        					</view>
+		        				</view>
+		        			</u-col>
+		        		</u-row>
+		        	</view>
+		        	
+		        </view>
 		    </view>
+			<view v-if="paramList[current].showStatus" style="text-align: center;margin-top: 24rpx;">到底啦~</view>
 		</view>
 	</view>
 </template>
@@ -51,19 +91,101 @@
 					'刷题', 
 					'重点考点'
 				],
-				list:[1,1,1,1,1,1,1,1,1,1,1],
+				list1: [],
+				list2: [],
+				list3: [],
+				paramList: [
+					{
+						pageNum: 1,
+						pageSize: 10,
+						total: 0,
+						showStatus: 0
+					},
+					{
+						pageNum: 1,
+						pageSize: 10,
+						total: 0,
+						showStatus: 0
+					},
+					{
+						pageNum: 1,
+						pageSize: 10,
+						total: 0,
+						showStatus: 0
+					}
+				],
 			}
 		},
 		onLoad(option) {
-			
+			this.initList()
 		},
 		onShow(){
 		},
 		methods: {
+			jumpDetail(item) {
+				if (this.current == 0) {
+					this.$navTo.togo('/pages2/course/detail', {
+						id: item.courseId
+					});
+					return;
+				}
+				if (this.current == 1) {
+						this.$navTo.togo('/pages2/bank/detail', {
+							id: item.bankId
+						});
+					return;
+				}
+				if (this.current == 2) {
+					this.$navTo.togo('/pages2/course/keynote', {
+						id: item.fileId
+					});
+					return;
+				}
+			},
+			initList() {
+				this.courseList();
+				this.bankList();
+				this.noteList();
+			},
 			onClickItem(e){
 				this.current = e.currentIndex
-			}
-		
+			},
+			//课程
+			courseList() {
+				var self = this;
+				var param = this.paramList[0];
+				this.$api.courseCollectList(param).then(res => {
+					self.paramList[0].total = res.data.total;
+					self.list1.push.apply(self.list1, res.data.rows);
+					if (self.list1.length === res.data.total) {
+						self.paramList[0].showStatus = true;
+					}
+				});
+			},
+			//题库
+			bankList() {
+				var self = this;
+				var param = this.paramList[1];
+				this.$api.bankCollectList(param).then(res => {
+					self.paramList[1].total = res.data.total;
+					self.list2.push.apply(self.list2, res.data.rows);
+					if (self.list2.length === res.data.total) {
+						self.paramList[1].showStatus = true;
+					}
+				});
+			},
+			//考试重点
+			noteList() {
+				var self = this;
+				var param = this.paramList[2];
+				this.$api.courseNoteList(param).then(res => {
+					self.paramList[2].total = res.data.total;
+					self.list3.push.apply(self.list3, res.data.rows);
+					if (self.list3.length === res.data.total) {
+						self.paramList[2].showStatus = true;
+					}
+				});
+			},
 		},
 		
 	}