From 2620537cacba86395ce75d67d54bea52a92226ab Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 16 Nov 2022 19:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=9A=84=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/course-assess/course-assess.vue |  8 ++++----
 pages/study/courseStudy.vue                | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/components/course-assess/course-assess.vue b/components/course-assess/course-assess.vue
index e87e18b..6360b74 100644
--- a/components/course-assess/course-assess.vue
+++ b/components/course-assess/course-assess.vue
@@ -9,16 +9,16 @@
 			<view class="content" style="padding: 10px;">
 				<view class="qitem"  v-for="(ass,assIdx) in info.items" :key="assIdx">
 					<view class="qitem-info">{{assIdx+1}}.{{ass.question}}</view>
+					
+					<view class="qitem-values" v-if="ass.qType==1">
+						<u-slider v-model="ass.answer" min="0" max="10" step="2" showValue></u-slider>
+					</view>
 					<view class="qitem-tips" v-if="ass.qType==1">
 						<view class="qitem-tips-start">{{ass.minText}}</view>
 						<view class="qitem-tips-end">{{ass.maxText}}</view>
 					</view>
-					<view class="qitem-values" v-if="ass.qType==1">
-						<u-slider v-model="ass.answer" min="0" max="10" step="2" showValue></u-slider>
-					</view>
 					<view  v-if="ass.qType==9">
 						<u--textarea v-model="ass.answer" placeholder="写下您想说的话"></u--textarea>
-						
 					</view>
 				</view>
 			</view>
diff --git a/pages/study/courseStudy.vue b/pages/study/courseStudy.vue
index 0844d2a..47df931 100644
--- a/pages/study/courseStudy.vue
+++ b/pages/study/courseStudy.vue
@@ -562,15 +562,18 @@
 				apiCourseStudy.studyIndex(this.courseId).then(rs=>{
 					if(rs.status != 200) {
 						uni.hideLoading();
-						$this.$refs.messager.show({message:rs.message,type:'error'});
+						uni.showToast({title:rs.message,type:'fail'});
+						//$this.$refs.messager.show({message:rs.message,type:'error'});
 						return;
 					}
 					if(rs.result.contents.length==0){
-						$this.$refs.messager.show({message:'课程内容已删除或课程已不再使用',type:'error'});
+						//$this.$refs.messager.show({message:'课程内容已删除或课程已不再使用',type:'error'});
+						uni.showToast({title:'课程内容已删除或课程已不再使用',type:'fail'});
 						return;
 					}
 					if(!rs.result.course.enabled){
-						$this.$refs.messager.show({message:'十分抱歉，此课程已停用，如需使用，请联系管理员。',type:'error'});
+						uni.showToast({title:'十分抱歉，此课程已停用，如需使用，请联系管理员。',type:'fail'});
+						//$this.$refs.messager.show({message:'十分抱歉，此课程已停用，如需使用，请联系管理员。',type:'error'});
 						return;
 					}
 					$this.courseInfo=rs.result.course;
@@ -691,6 +694,7 @@
 						if(hasIndex>0){
 							let pre=this.scrollList[hasIndex-1];
 							if(pre.status!=9){
+								//uni.showToast({title:'请按顺序学习',type:'fail'});
 								this.$refs.messager.show({message:'请按顺序学习',type:'error'});
 								return;
 							}