From f8ce62bb555fe6262657aa67cf04a297eb11a945 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Sun, 31 Mar 2024 10:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Course/lineStyleCourse.vue |  2 +-
 pages/merchant/teacher_detail.vue     |  6 ++++--
 pages/special/search.vue              | 12 ++++++++++--
 pages/special/task_info.vue           |  7 ++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/components/Course/lineStyleCourse.vue b/components/Course/lineStyleCourse.vue
index 9f09a15..c6a060a 100644
--- a/components/Course/lineStyleCourse.vue
+++ b/components/Course/lineStyleCourse.vue
@@ -12,7 +12,7 @@
 					<text v-for="(label, index) in item.label" :key="index">{{ label }}</text>
 				</view>
 				<view class="study-progress">
-					上次学到：{{ item.progress }}
+					上次学到：{{ item.progress || '' }}
 				</view>
 			</view>
 		</view>
diff --git a/pages/merchant/teacher_detail.vue b/pages/merchant/teacher_detail.vue
index 4c3407b..7e1c601 100644
--- a/pages/merchant/teacher_detail.vue
+++ b/pages/merchant/teacher_detail.vue
@@ -73,8 +73,10 @@
             {{ item.name }}
           </view>
         </view>
-        <mp-html v-if="navActive === 1" class="panel1" container-style="padding: 30rpx;background: #ffffff;"
-          :content="lecturer.introduction"></mp-html>
+				<view style="background: #fff;">
+					<mp-html v-if="navActive === 1" class="panel1" container-style="padding: 0 30rpx;background: #ffffff;"
+						:content="lecturer.introduction"></mp-html>
+				</view>
         <view v-if="navActive === 2 && list.length" class="panel2">
           <navigator v-for="item in list" :key="item.id" :url="
             item.is_light
diff --git a/pages/special/search.vue b/pages/special/search.vue
index 298926c..71fb7ff 100644
--- a/pages/special/search.vue
+++ b/pages/special/search.vue
@@ -5,7 +5,7 @@
       <view class="left flex-center-x">
         <i class="iconfont2 iconsousuo"></i>
         <input v-model.trim="search" confirm-type="search" @input="onSearch(search)" placeholder="搜索课程讲师" />
-        <i v-show="search" class="iconfont iconguanbi2" @click="search = ''"></i>
+        <i v-show="search" class="iconfont iconguanbi2" @click.stop="search = '';onSearch(search)"></i>
       </view>
     </view>
 		<view v-if="specialList.length" class="special-section">
@@ -87,7 +87,7 @@ export default {
 		onSearch: debounce(function () {
 			this.page = 1;
 			this.finished = false;
-			this.specialList = false;
+			this.specialList = [];
 			this.getSpecialList();
 		}, 500),
 		async getSpecialList() {
@@ -131,6 +131,14 @@ export default {
 		margin: 0 auto;
 		.left {
 			background: #fff;
+			padding-right: 100rpx;
+			position: relative;
+			.iconfont {
+				position: absolute;
+				top: 50%;
+				right: 31rpx;
+				transform: translateY(-50%);
+			}
 		}
 	}
 	.search-page .special-section uni-navigator {
diff --git a/pages/special/task_info.vue b/pages/special/task_info.vue
index 199e9f9..ea56361 100644
--- a/pages/special/task_info.vue
+++ b/pages/special/task_info.vue
@@ -74,8 +74,10 @@
         </view>
       </view>
     </view>
-    <mp-html v-else-if="tabIndex == 1" class="content" container-style="padding: 30rpx; background: #ffffff;"
-      :content="taskInfo.content"></mp-html>
+		<view v-else-if="tabIndex == 1" style="background: #fff;">
+			<mp-html class="content" container-style="padding: 30rpx; background: #ffffff;"
+				:content="taskInfo.content"></mp-html>
+		</view>
   </BaseContainer>
 </template>
 
@@ -505,7 +507,6 @@ page{
 }
 
 .task-info .content {
-  padding: 30rpx;
   background-color: #ffffff;
   font-size: 30rpx;
   line-height: 44rpx;