Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/mobile into stat

components/comments/comments.vue

@@ -43,7 +43,7 @@
 							</view> -->
 						</view>
 						<view v-if="comm.replyList && comm.replyList.length>0" class="comment-replys">
-							<view v-for="(reply,replyIdx) in comm.replyList" :key="replyIdx" class="comment">
+							<view v-for="(reply,replyIdx) in comm.replyList" :key="replyIdx" class="comment" v-if="comm.showAll || replyIdx<2">
 								<view class="comment-top">
 									<view style="display: flex;">
 										<author v-if="reply" :showInfo="true" :data="reply"></author>
@@ -78,6 +78,9 @@
 									
 								</view>
 							</view>
+							<view v-if="comm.replyList.length>2" class="view-all-com" @click="loadReplyMore(comm)">
+								{{comm.showAll ? '收起':`查看全部${comm.replyList.length}条评论 >`}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -220,6 +223,9 @@
 			      }
 		},
 		methods: {
+			loadReplyMore(item){
+			   item.showAll=!item.showAll;
+			},
 			loadData(append){ //加载数据
 			  let params={
 			    pageIndex:this.pageIndex,
@@ -239,6 +245,7 @@
 					       let ids=[];
 					              let allList=[];
 					              res.result.list.forEach(item=>{
+									item.showAll = false;
 					                item.avatar='';
 					                item.orgInfo='';
 									item.sex = null;
@@ -584,6 +591,20 @@
 </script>
 
 <style lang="scss" scoped>
+	.view-all-com{
+		// width: 304upx;
+		display: inline-block;
+		height: 52upx;
+		line-height: 40upx;
+		background: #F6F6F6;
+		border-radius: 26upx;
+		box-sizing: border-box;
+		padding: 4upx 40upx 4upx 40upx;
+		font-size: 24upx;
+		color: #666666;
+		margin-left: 100upx;
+		margin-top: 20upx;
+	}
 	.comment{
 		padding-top: 20upx;
 		.comment-top{

pages/index/index.vue

@@ -121,8 +121,8 @@
 					<view class="content-list"  @click="toQaDetail(item)">
 						<view class="content-title">
 							<!-- qa-basic -->
-							<text v-if="item.isResolve" class="qa-solve">【已解决】</text>
+							<text style="margin-left: -12upx;" v-if="item.isResolve" class="qa-solve">【已解决】</text>
-							<text v-else class="qa-unSolve">【待解决】</text>
+							<text style="margin-left: -12upx;" v-else class="qa-unSolve">【待解决】</text>
 						    {{ item.title }}
 						</view>
 					</view>

pages/my/myArticles.vue

@@ -60,8 +60,8 @@
 							</view>
 							<view class="article-bot">
 								<text class="article-wz" @click="toDetail(item)" v-html="$keywordActiveShow(item.summary, articleList.keyword)"></text>
-								<view class="article-img" @click="toDetail(item)">
+								<view class="article-img" @click="toDetail(item)" v-if="item.coverurl">
-									<img style="width: 182upx;height:124upx" v-if="item.coverurl" :src="$config.fileUrl+item.coverurl" alt=""/>
+									<img style="width: 182upx;height:124upx"  :src="$config.fileUrl+item.coverurl" alt=""/>
 								</view>
 							</view>
 							<!--自己不需要显示作者信息呀-->
@@ -74,7 +74,7 @@
 										<image class="btn-img" src="../../static/images/icon/del.png" size="24"></image><text class="btn-text">删除</text>
 									</view>
 								</view>
-								<view class="">
+								<view style="margin-right: -30upx;">
 									<interact-bar :views="false" :data="item"></interact-bar>
 								</view>
 							</view>

pages/my/myQa.vue

@@ -186,6 +186,13 @@
 		   this.findData(true);
 		   this.findAnData(true);
 		 },
+		 
+		 // 实例被激活时使用，用于重复激活一个实例的时候
+		 activated () {
+			this.findData(true);
+		 },
+		 
+		 
 		 methods:{
 			  //展示全部
 		   displayAll(item) {

pages/resource/articeDetail.vue

@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<comments ref="comComments" v-if="id!=''" :objType="2" :objId="id" ></comments>
-		<interact-fixed v-if="detail.id" :type="2" @comment-success="commentSuccess" :comments="false" :data="detail"></interact-fixed>
+		<interact-fixed v-if="detail.id" :type="1" @comment-success="commentSuccess" :comments="false" :data="detail"></interact-fixed>
 	</view>
 </template>   
 

pages/resource/search.vue

@@ -51,7 +51,8 @@
 				<view class="words-top">
 					<view class="words-title">热门搜索</view>
 					<view class="words-clear" @click="hotSearch()">
-						<image src="../../static/images/icon/eye.png" mode=""  style="margin-right: 15px;width: 32upx;height: 24upx;"></image>
+						<image v-if="!showHotSearch" src="../../static/images/icon/eye_close.png" mode=""  style="margin-right: 15px;width: 32upx;height: 26upx;"></image>
+						<image v-if="showHotSearch" src="../../static/images/icon/eye_open.png" mode=""  style="margin-right: 15px;width: 32upx;height: 26upx;"></image>
 					</view>
 				</view>
 				

pages/study/courseStudy.vue

@@ -3,7 +3,7 @@
 	<view>
 		<watermark></watermark>
 		<u-toast ref="messager"></u-toast>
-		<page-title :showBack="true">{{courseInfo.name}}</page-title>
+		<!-- <page-title :showBack="true"></page-title> -->
 		<view class="playbox"><!--内容播放区域-->
 			 <view style="min-height: 500upx;" >
 			 	<view v-if="curContent.contentType==10" style="background-color: #000000;">

pages/study/index.vue

@@ -31,7 +31,7 @@
 				<u-icon style="margin-left: 18upx;" name="arrow-down"></u-icon>
 			</view>
 			<view class="sea-show" v-show="statusSelectShow">
-				<view  v-for="(status,index) in statustList" :key="index" :class="[classType == status.value? 'sea-active':'','sea-index']" @click="autonomyStatus(status.value)">
+				<view  v-for="(status,index) in statustList" :key="index" :class="[boeStatus === status.value? 'sea-active':'','sea-index']" @click="taskStatus(status.value)">
 					{{status.name}}
 				</view>
 			</view>
@@ -42,7 +42,7 @@
 				<u-icon style="margin-left: 18upx;" name="arrow-down"></u-icon>
 			</view>
 			<view class="sea-show" v-show="statusSelectShow">
-				<view  v-for="(status,index) in statustList" :key="index" :class="[classType == status.value? 'sea-active':'','sea-index']" @click="taskStatus(status.value)">
+				<view  v-for="(status,index) in statustList" :key="index" :class="[Applistatus === status.value? 'sea-active':'','sea-index']"   @click="autonomyStatus(status.value)">
 					{{status.name}}
 				</view>
 			</view>
@@ -83,25 +83,7 @@
 		</view>
 		<!-- 自主学习 -->
 		<view class="listbox" v-show="tabIndex===1">
-			<!-- <view class="listbox-top"> -->
+			
-				<!-- 自主学习类型查询 -->
-				<!-- <view class="top-ten" style="margin-top: 21px;margin-left: 13px;">
-					<text class="textbtn" @click="statusSelecShow=!statusSelecShow;autonomyStatusShow=false">类型</text>
-					<text class="textbtn" style="margin:0 20upx;"
-						@click="autonomyStatusShow=!autonomyStatusShow;statusSelecShow=false">进度</text>
-				</view> -->
-			<!-- </view> -->
-			<!-- <view class="sea-show" v-show="statusSelecShow">
-				<text v-for="(item,tidx) in typeArray" :key="tidx"
-					:class="[item.value == classType ?'sea-active':'','sea-index' ]"
-					@click="Application(item.value)">{{item.name}}</text>
-			</view> -->
-			<!-- <view class="sea-show" v-show="autonomyStatusShow">
-				<text :class="[autonomy.status == 0?'sea-active':'','sea-index']" @click="autonomyStatus(0)">全部</text>
-				<text :class="[autonomy.status == 1?'sea-active':'','sea-index']" @click="autonomyStatus(1)">未开始</text>
-				<text :class="[autonomy.status == 2?'sea-active':'','sea-index']" @click="autonomyStatus(2)">进行中</text>
-				<text :class="[autonomy.status == 9?'sea-active':'','sea-index']" @click="autonomyStatus(9)">已完成</text>
-			</view> -->
 			<view v-if="studyList.length == 0 && couresList.length == 0 && isOne" class="zan-wu">
 				您还没有学习课程，快去学习吧～
 			</view>
@@ -112,11 +94,11 @@
 						<view style="position: relative;">
 							<course-image class="uc-course-type" :course="c" width="265upx" height="154upx">
 							</course-image>
-							<text class="uc-course-type-text" v-if="c.courseType == 10">录播</text>
+							<!-- <text class="uc-course-type-text" v-if="c.courseType == 10">录播</text>
 							<text class="uc-course-type-text" v-if="c.courseType == 20">录播</text>
 							<text class="uc-course-type-text" v-if="c.courseType == 'online-course'">录播</text>
 							<text class="uc-course-type-text" v-if="c.courseType == 'face-course'">线下课</text>
-							<text v-if="c.courseType == 'project'" class="uc-course-type-text">学习项目</text>
+							<text v-if="c.courseType == 'project'" class="uc-course-type-text">学习项目</text> -->
 						</view>
 
 						<view class="course-text" style="justify-content: space-between;position: relative;">
@@ -288,6 +270,7 @@
 		},
 		data() {
 			return {
+				Applistatus:'',
 				autonomyStatusShow: false,
 				delData: {},
 				btnsShow: false, // 我报名的删除弹出
@@ -538,7 +521,8 @@
 				})
 			},
 			autonomyStatus(num) {
-				this.status = num;
+				console.log(num)
+				this.Applistatus = num;
 				this.getLearning();
 			},
 			taskStatus(num) {
@@ -727,7 +711,7 @@
 					pageIndex: 1, //第几页
 					pageSize: 200,
 					courseName: this.learkeyword,
-					status: this.status,
+					status: this.Applistatus,
 				}
 				await apicourseStudy.myStudyList(lear).then(res => {
 					if (res.status == 200) {
@@ -745,7 +729,6 @@
 						data.push(...res.result.list);
 					}
 				})
-				// }
 				let learData = {
 					page: 1,
 					size: 200,
@@ -807,15 +790,9 @@
 						url: '/pages/study/studydetail?id=' + citem.id + '&type=' + citem.courseType
 					});
 				} else {
-					if (citem.courseType == 10) {
 						uni.navigateTo({
-							url: '../resource/microDetail?studyId=' + citem.id + '&id=' + citem.courseId
+							url: '/pages/study/courseStudy?studyId=' + citem.id + '&id=' + citem.courseId
 						})
-					} else if (citem.courseType == 20) {
-						uni.navigateTo({
-							url: '/pages/study/onlineCourse?studyId=' + citem.id + '&id=' + citem.courseId
-						})
-					}
 				}
 			},
 			choose(citem) {
@@ -830,12 +807,12 @@
 				}
 			},
 			// 自主学习选择状态事件
-			chooseStatus(e) {
+			// chooseStatus(e) {
-				this.statusSelectShow = false;
+			// 	this.statusSelectShow = false;
-				this.statusBtnName = e.value[0].name;
+			// 	this.statusBtnName = e.value[0].name;
-				this.autonomy.status = e.value[0].value;
+			// 	this.autonomy.status = e.value[0].value;
-				this.searchData();
+			// 	this.searchData();
-			},
+			// },
 			// 自主学习选择类型事件
 			// chooseStatust(e) {
 			// 	this.statusSelecShow = false;
@@ -846,31 +823,28 @@
 
 			// },
 			// 历史记录选择类型事件
-			hischooseStatus(e) {
+			// hischooseStatus(e) {
-				this.hisstatusSelectShow = false;
+			// 	this.hisstatusSelectShow = false;
-				this.hisstatusBtnName = e.value[0].name;
+			// 	this.hisstatusBtnName = e.value[0].name;
-				this.hisswitch = e.value[0].value;
+			// 	this.hisswitch = e.value[0].value;
-				if (this.hisswitch == 10) {
+			// 	if (this.hisswitch == 10) {
-					this.hisclassType = 10
+			// 		this.hisclassType = 10
-					this.history()
+			// 		this.history()
-				} else {
+			// 	} else {
-					this.hisclassType = 20
+			// 		this.hisclassType = 20
-					this.history()
+			// 		this.history()
-				}
+			// 	}
-			},
+			// },
-			loadchooseStatust(e) {
+			// loadchooseStatust(e) {
-				// this.loadstatusSelecShow = false;
+			// 	this.boeStatus = e;
-				// this.loadstatusBtnName = e.value[0].name;
+			// 	this.loadBoeData()
-				this.boeStatus = e;
+			// },
-				this.loadBoeData()
+			// Application(e) {
-			},
+			// 	this.classType = e;
-			Application(e) {
+			// 	this.autonomy.type = e;
-				this.classType = e;
+			// 	this.searchData();
-				this.autonomy.type = e;
+			// 	this.getLearning();
-				this.searchData();
+			// },
-				// this.getLearning();
-			},
-
 			displayWord(data) {
 				if (data.progress == 0) {
 					return '未开始'
@@ -1072,7 +1046,7 @@
 		}
 		.sea-index {
 			font-size: 26rpx;
-			margin-right: 16rpx;
+			// margin-right: 16rpx;
 			background-color: #fff;
 		}
 	}