From 1b416e193c8f7afff881b4f68b8d78466c22911d Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 16 Nov 2022 18:05:25 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue |  4 ++--
 pages/study/index.vue | 17 ++++-------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index a6e3b30..56f43c8 100644
--- a/pages/index/index.vue
+++ b/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 v-else class="qa-unSolve">【待解决】</text>
+							<text style="margin-left: -12upx;" v-if="item.isResolve" class="qa-solve">【已解决】</text>
+							<text style="margin-left: -12upx;" v-else class="qa-unSolve">【待解决】</text>
 						    {{ item.title }}
 						</view>
 					</view>
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 55c33c7..6dd0913 100644
--- a/pages/study/index.vue
+++ b/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="[status === status.value? 'sea-active':'','sea-index']"   @click="autonomyStatus(status.value)">
 					{{status.name}}
 				</view>
 			</view>
@@ -807,15 +807,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) {
@@ -859,8 +853,6 @@
 				}
 			},
 			loadchooseStatust(e) {
-				// this.loadstatusSelecShow = false;
-				// this.loadstatusBtnName = e.value[0].name;
 				this.boeStatus = e;
 				this.loadBoeData()
 			},
@@ -868,9 +860,8 @@
 				this.classType = e;
 				this.autonomy.type = e;
 				this.searchData();
-				// this.getLearning();
+				this.getLearning();
 			},
-
 			displayWord(data) {
 				if (data.progress == 0) {
 					return '未开始'

From c1bb25507433aa3b36d1de0eb83a5052300a923f Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 16 Nov 2022 18:06:58 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E8=BF=94=E5=9B=9E=E6=8C=89=E9=94=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myQa.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pages/my/myQa.vue b/pages/my/myQa.vue
index 00e532a..b24e840 100644
--- a/pages/my/myQa.vue
+++ b/pages/my/myQa.vue
@@ -186,6 +186,13 @@
 		   this.findData(true);
 		   this.findAnData(true);
 		 },
+		 
+		 // 实例被激活时使用，用于重复激活一个实例的时候
+		 activated () {
+			this.findData(true);
+		 },
+		 
+		 
 		 methods:{
 			  //展示全部
 		   displayAll(item) {

From cecb06f35f1391f4c6e9db7f67bd914f9fc0e4c4 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 16 Nov 2022 18:09:51 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/comments/comments.vue | 23 ++++++++++++++++++++++-
 pages/study/courseStudy.vue      |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/comments/comments.vue b/components/comments/comments.vue
index a6e0c6e..c289ec7 100644
--- a/components/comments/comments.vue
+++ b/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{
diff --git a/pages/study/courseStudy.vue b/pages/study/courseStudy.vue
index a7d3f04..2334f4e 100644
--- a/pages/study/courseStudy.vue
+++ b/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;">

From cfe5b7d6f51e294bc8dea5bf3778e88bb241d2f1 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 16 Nov 2022 18:15:21 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/study/index.vue | 67 ++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/pages/study/index.vue b/pages/study/index.vue
index 6dd0913..20e65cc 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -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="[status === status.value? 'sea-active':'','sea-index']"   @click="autonomyStatus(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>
@@ -288,6 +288,7 @@
 		},
 		data() {
 			return {
+				Applistatus:'',
 				autonomyStatusShow: false,
 				delData: {},
 				btnsShow: false, // 我报名的删除弹出
@@ -538,7 +539,8 @@
 				})
 			},
 			autonomyStatus(num) {
-				this.status = num;
+				console.log(num)
+				this.Applistatus = num;
 				this.getLearning();
 			},
 			taskStatus(num) {
@@ -727,7 +729,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 +747,6 @@
 						data.push(...res.result.list);
 					}
 				})
-				// }
 				let learData = {
 					page: 1,
 					size: 200,
@@ -824,12 +825,12 @@
 				}
 			},
 			// 自主学习选择状态事件
-			chooseStatus(e) {
-				this.statusSelectShow = false;
-				this.statusBtnName = e.value[0].name;
-				this.autonomy.status = e.value[0].value;
-				this.searchData();
-			},
+			// chooseStatus(e) {
+			// 	this.statusSelectShow = false;
+			// 	this.statusBtnName = e.value[0].name;
+			// 	this.autonomy.status = e.value[0].value;
+			// 	this.searchData();
+			// },
 			// 自主学习选择类型事件
 			// chooseStatust(e) {
 			// 	this.statusSelecShow = false;
@@ -840,28 +841,28 @@
 
 			// },
 			// 历史记录选择类型事件
-			hischooseStatus(e) {
-				this.hisstatusSelectShow = false;
-				this.hisstatusBtnName = e.value[0].name;
-				this.hisswitch = e.value[0].value;
-				if (this.hisswitch == 10) {
-					this.hisclassType = 10
-					this.history()
-				} else {
-					this.hisclassType = 20
-					this.history()
-				}
-			},
-			loadchooseStatust(e) {
-				this.boeStatus = e;
-				this.loadBoeData()
-			},
-			Application(e) {
-				this.classType = e;
-				this.autonomy.type = e;
-				this.searchData();
-				this.getLearning();
-			},
+			// hischooseStatus(e) {
+			// 	this.hisstatusSelectShow = false;
+			// 	this.hisstatusBtnName = e.value[0].name;
+			// 	this.hisswitch = e.value[0].value;
+			// 	if (this.hisswitch == 10) {
+			// 		this.hisclassType = 10
+			// 		this.history()
+			// 	} else {
+			// 		this.hisclassType = 20
+			// 		this.history()
+			// 	}
+			// },
+			// loadchooseStatust(e) {
+			// 	this.boeStatus = e;
+			// 	this.loadBoeData()
+			// },
+			// Application(e) {
+			// 	this.classType = e;
+			// 	this.autonomy.type = e;
+			// 	this.searchData();
+			// 	this.getLearning();
+			// },
 			displayWord(data) {
 				if (data.progress == 0) {
 					return '未开始'
@@ -1063,7 +1064,7 @@
 		}
 		.sea-index {
 			font-size: 26rpx;
-			margin-right: 16rpx;
+			// margin-right: 16rpx;
 			background-color: #fff;
 		}
 	}

From 174e6cd1de1aa2c0849b97933bbe8a4e756b30a8 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 16 Nov 2022 18:23:08 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=86=E4=BA=AB=E6=97=B6=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E6=9C=AA=E6=9F=A5=E7=9C=8B=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resource/articeDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/resource/articeDetail.vue b/pages/resource/articeDetail.vue
index f9ebffb..ff2e600 100644
--- a/pages/resource/articeDetail.vue
+++ b/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>   
 

From ab9a2f1a5ff49c0c1fc208cf1f4c4e64bcad9f67 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 16 Nov 2022 18:35:07 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resource/search.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/resource/search.vue b/pages/resource/search.vue
index 9ffbc34..fba5fdf 100644
--- a/pages/resource/search.vue
+++ b/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>
 				

From fff731355fd3e39285e58ad59502aa94d857939f Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 16 Nov 2022 18:35:24 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/images/icon/eye_open.png | Bin 0 -> 1337 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/images/icon/eye_open.png

diff --git a/static/images/icon/eye_open.png b/static/images/icon/eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c0715a57f76ad35cbb7902bb8c86683bd88a8eb
GIT binary patch
literal 1337
zcmV-91;+Y`P)<h;3K|Lk000e1NJLTq001Na0015c1^@s6MB%(s00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91B%lKT1ONa40RR919smFU0KuO_+W-Irqe(<TR9Fe^mQ74tRTRgWVHnI9
zlnyqHMxw-ENt?96*k~{@fM1D;8#OG1N?>4MtR`(Oq<%EIa8q1V;|Ieq!vvI8jV`)q
zF{T10wn>{VY?DR_Y16dzD=KwhF~9)h@Bes@&YQjg+J%Xco18i4o%28E{@=al-8*@C
zYvVt*0<N3o+uPe)wy?19Ogf#erbd}51?ZoVlWw>BNO5uT;kvrIB+siJH$*5Jjr!;3
z=Yx=FKsK*5i_7Iofcpq?2in@&{#*&K_^Jr?^z>AK-AVE7h|frLx&FpJihYy`fAo62
z7xMG-y~$*9GyY2a0rVze8CN0K(ca!3TYSv@yDTAy+(GI)Y)vcLP0=)31U@J)FaNft
zre-d8>AXDhpM=yN<O$)(A3?Q2Y&=(<BcYLz5zpAz*bb83rdTnBQrNMAf`az~fxuX<
zV!8a`aQJy*A5v=rwWhIOh1ADR`0EJu_4Sp`%*=cSxXMfzVmo$a6QQ_^iCUOITVwPS
z_BrerlSQ$$noDDFaB$t^<m3SyjixhNQc|*mrk`B`Vb};oB9SV#=P*UJRhKDB?RNEv
zZLk%0g8LL_tu1ivVVG@gppk#Q=32D6ySwYC8)pvn;t7w(^K5Ht>+crMZ5aac1syZV
z4EcP%N+&YJT^1P%UqN1A^1CFm<)db;Fv42(EgcGlz5x3OxJ&q|nDaD8$QCPZB=E)$
zk$fD<2N?GI{V%hW^A;#mLtG6W(Zsyn)|Qr*iOjf;hPk=9Gt{~pe-Hw_nQ_aeHP+A0
z&VC8*QEFW*Dk^%QzP|pd8;7I^5t(;cl~67+Dh4KC7VXR?BfshEl%0Xqqir-dH~&HW
zab%Ra@12^OdP@K|eN%>GD*-M48@4Qm2e4KHk2-`6mnM;6VGXCl4?UJ*`*xY3r=)eZ
z+;2M03Sip*n&Nt~j*(JLDnb{{**BVcSq1)_0K9#5E}#{&u(@#ZClZMV&G-drH+%jQ
ziB~9cAI-hf4CYketmD5+4V(=$eO>ZrV6$Pyv(6?yfcH)8=hD_!rX&7qGq9I0!zifd
z>;X;(;xYWSdJ%LddQ>=K)u=ACzOZ3F5H+psfW&VMoq2rn2YI*$%y?m8;g+VRrfK6G
zqIbT**+C&C?`NgL@p$}}#Z>#RCZG`;@D6KY<RE9xFA~}EDJF~)8RBm0zYdx2z=_OB
zZi2@|Ml;zCF7wX$gd~wU%k3Qs27@OA%pPEF=;}~D^~=c%V`_CV)B7tbD)wbw(l$a$
zq6aEdsnj7%qsd7;!rQ(Hu^$w_nZb(O&I<0M)+><kQsXyXb~`n-^|o;xAw>rU25#kl
z%^r&E=J7VY4SEz}x(>c#ixa}FG`JErP~%0U1MGTafm(64=rtXTPWg_6EMR|se+k6)
z^86A+bQ$XOoyOKSo|5pFWE|fFWGCngAEIs9h&)I9X~ctQ41?QEqn}xPbpBnIkd+dP
z#frFhG(kP08-D3hwlGc_0y=25<q@`L$O)6}TNR<qB=b^ym=)N@gxiRfVz0yYqm$_K
v_|9X0&p(Dkjg5_eW#+HhYb)@-TY-N7F7itg!eWT^00000NkvXXu0mjfaZqi=

literal 0
HcmV?d00001


From b1d4af682b9eaae5929008b3a0ef7e07ce6bb470 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Wed, 16 Nov 2022 18:39:40 +0800
Subject: [PATCH 8/9] tijiao

---
 static/images/icon/eye_close.png | Bin 0 -> 1551 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 static/images/icon/eye_close.png

diff --git a/static/images/icon/eye_close.png b/static/images/icon/eye_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f15fc74e3f957e2a0e058e9031c05ec5696bc19
GIT binary patch
literal 1551
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
B*2@3@

literal 0
HcmV?d00001


From b904e14ef247977de798f02a5c5c5bde438aa48c Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 16 Nov 2022 18:39:30 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myArticles.vue |  6 +++---
 pages/study/index.vue   | 24 +++---------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/pages/my/myArticles.vue b/pages/my/myArticles.vue
index 0f1ab37..41a74a1 100644
--- a/pages/my/myArticles.vue
+++ b/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)">
-									<img style="width: 182upx;height:124upx" v-if="item.coverurl" :src="$config.fileUrl+item.coverurl" alt=""/>
+								<view class="article-img" @click="toDetail(item)" v-if="item.coverurl">
+									<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>
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 20e65cc..751e6a2 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -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;">