From 749c14add225b20fd38420e3e199fe5ac7f7ef9c Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 30 Nov 2022 14:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B8=85=E9=99=A4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/data-filter/data-filter.vue | 39 ++++++++++++++++++++++++--
 pages/index/index.vue                  |  5 ++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/components/data-filter/data-filter.vue b/components/data-filter/data-filter.vue
index a146169..eac9e9f 100644
--- a/components/data-filter/data-filter.vue
+++ b/components/data-filter/data-filter.vue
@@ -1,8 +1,9 @@
 <template>
 	<view>
-		<view  @click="showFilter()" style="line-height: 34upx;height: 35upx;padding-right: 40upx;font-size: 32upx;">
+		<view   style="line-height: 34upx;height: 35upx;padding-right: 40upx;font-size: 32upx;">
 			<!-- <text style="color: #666;font-size: 30rpx;">筛选</text> -->
-			<image src="../../static/images/filter.png" style="width: 36upx;height: 36upx;vertical-align: middle;"></image>
+			<image @click="showFilter()" src="../../static/images/filter.png" style="width: 36upx;height: 36upx;vertical-align: middle;"></image>
+			<text class="clearsift" @click="clearsf()">清除筛选</text>
 		</view>
 		<!-- ${filterWidth} -->
 		<u-popup :show="filterShow" mode="center" @close="closeFilter" :safeAreaInsetTop="true" :closeable="false">
@@ -193,6 +194,35 @@
 			}
 		},
 		methods:{
+			clearsf(){
+				if(this.type==1){//生成课程查询条件
+					let params={
+						pageIndex:1,
+						pageSize:20,
+						name:'',
+						keyword:'',
+						publish:true,
+						device:2,
+						type:'',
+						sysType1:'',
+						sysType2:'',
+						sysType3:'',
+						scenes:'',
+						orderField:'',
+						orderAsc:false,
+						cateName:''
+					}
+					this.$emit('submit',this.filterTags,params);
+				}
+				this.course.sysType1 = '';
+				this.course.sysType2 = '';
+				this.course.sysType3 = '';
+				this.course.orderType = -1;
+				this.course.courseType = -1;
+				this.course.scenes = [];
+				
+				console.log('清除成功')
+			},
 			stopRoll(){},
 			toNewLink(){
 				location.href='https://m.qingxuetang.com/x/?appId=qxtcorp306130';
@@ -391,6 +421,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.clearsift{
+		font-size: 24upx;
+		color: #666;
+		margin-left: 5upx;
+	}
 	
 	/deep/ .u-popup__content{
 		width: 100%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 69045d6..ee9695e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -38,10 +38,11 @@
 				</view>
 			</view>
 			<view style="line-height: 40upx;height: 40upx; padding-top: 14upx;font-size: 16px; ">
-				<data-filter v-if="conType == 1" filterWidth="100%" :noOrder="false" :type="conType" @reset="resetFilters" @submit="submitFilters"></data-filter>
+				<data-filter v-if="conType == 1" filterWidth="100%" :noOrder="false" :type="conType" @reset="resetFilters" @submit="submitFilters"></data-filter>
 			</view>
 		</view>
-		<view class="" v-show="conType == 0">
+		<view class="" v-show="conType == 0">
+			
 			<recommend-index></recommend-index>
 		</view>