From a4b86b02202821a2e41cbd15adee722f725675ba Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 28 Aug 2024 17:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/classInfoWorkBlank.vue       | 138 ++++++++++++++----------
 pages/miniClass/addHomeWork.vue         |   6 +-
 pages/miniClass/classInfo.vue           | 119 ++++++++++++++------
 pages/miniClass/classInfoMan.vue        |  60 ++++++-----
 pages/miniClass/memberSet.vue           |  15 ++-
 pages/miniClass/taskDetail.vue          |  32 +++++-
 pages/miniClass/taskDetailForMan.vue    |  14 ++-
 pages/miniClass/taskListForWaitOpen.vue |   2 +-
 static/icon/teseIcon.png                | Bin 0 -> 5017 bytes
 9 files changed, 261 insertions(+), 125 deletions(-)
 create mode 100644 static/icon/teseIcon.png

diff --git a/components/classInfoWorkBlank.vue b/components/classInfoWorkBlank.vue
index f1949ba..b7b8f91 100644
--- a/components/classInfoWorkBlank.vue
+++ b/components/classInfoWorkBlank.vue
@@ -1,32 +1,43 @@
 <template>
 	<view>
-		<view class="">			
+		<view class="">
 			<view v-if="thisClass.state != 0" class="flex_box">
-			
-			<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '0')">
-				<view class="img">
-					<image src="@/static/icon/pigai2.png" mode="widthFix"></image>
+
+				<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '0')"
+					v-if="classModel.isTask == 1">
+					<view class="img">
+						<image src="@/static/icon/pigai2.png" mode="widthFix"></image>
+					</view>
+					<text>作业评分</text>
 				</view>
-				<text>作业评分</text>
-			</view>
-			<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '1')">
-				<view class="img">
-					<image src="@/static/icon/pigai1.png" mode="widthFix"></image>
+				<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '1')"
+					v-if="classModel.isMedicalcase == 1">
+					<view class="img">
+						<image src="@/static/icon/pigai1.png" mode="widthFix"></image>
+					</view>
+					<text>医案评分</text>
 				</view>
-				<text>医案评分</text>
-			</view>
-			<view class="item" @click="goXindeList('/pages/miniClass/xindeList')">
-				<view class="img">
-					<image src="@/static/icon/pigai3.png" mode="widthFix"></image>
+				<view class="item" @click="goXindeList('/pages/miniClass/xindeList')"
+					v-if="classModel.isExperience == 1">
+					<view class="img">
+						<image src="@/static/icon/pigai3.png" mode="widthFix"></image>
+					</view>
+					<text>心得评分</text>
+				</view>
+				<view class="item" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)" 
+				v-if="classModel.isQuestion == 1">
+					<view class="img">
+						<image src="@/static/icon/sikaoti.png" mode="widthFix"></image>
+					</view>
+					<text>思考题评分</text>
+				</view>
+				<view class="item" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)"
+				v-if="classModel.isExam == 1 && thisClass.state == '2'">
+					<view class="img">
+						<image src="@/static/icon/teseIcon.png" mode="widthFix"></image>
+					</view>
+					<text>考试评分</text>
 				</view>
-				<text>心得评分</text>
-			</view>
-								<view class="item" @click="goSikaoList('/pages/miniClass/sikaoQuestionList', thisClass.id)">
-									<view class="img">
-										<image src="@/static/icon/sikaoti.png" mode="widthFix"></image>
-									</view>
-									<text>思考题评分</text>
-								</view>
 			</view>
 		</view>
 	</view>
@@ -34,33 +45,34 @@
 
 <script>
 	export default {
-		props:['thisClass','roleCode'],
-		name:"classInfoWorkBlank",
+		props: ['thisClass', 'roleCode', 'classModel'],
+		name: "classInfoWorkBlank",
 		data() {
 			return {
-				
+
 			};
-		},methods:{
-			goAddHomeWork(type){
-					
-					uni.navigateTo({
-						url: `/pages/miniClass/addHomeWork?classId=${this.thisClass.id}&type=${type}`
-					})
-				
+		},
+		methods: {
+			goAddHomeWork(type) {
+
+				uni.navigateTo({
+					url: `/pages/miniClass/addHomeWork?classId=${this.thisClass.id}&type=${type}`
+				})
+
 			},
 			goPingfen(url, classId, type) {
 				uni.navigateTo({
 					url: `${url}?classId=${classId}&type=${type}&roleCode=${this.roleCode}&classState=${this.thisClass.state}`
 				})
 			},
-			goSikaoList(url,id){
+			goSikaoList(url, id) {
 				uni.navigateTo({
-					url:`${url}?classId=${id}&roleCode=${this.roleCode}&classState=${this.thisClass.state}`
+					url: `${url}?classId=${id}&roleCode=${this.roleCode}&classState=${this.thisClass.state}`
 				})
 			},
-			goXindeList(url){
+			goXindeList(url) {
 				uni.navigateTo({
-					url:`${url}?classId=${this.thisClass.id}&type=2&roleCode=${this.roleCode}&classState=${this.thisClass.state}`
+					url: `${url}?classId=${this.thisClass.id}&type=2&roleCode=${this.roleCode}&classState=${this.thisClass.state}`
 				})
 			},
 		}
@@ -68,31 +80,45 @@
 </script>
 
 <style lang="scss" scoped>
-	.flex_box{justify-content: space-between;}
+	.flex_box {
+		justify-content: space-between;
+	}
+
 	// .item1{border: 1px solid;}
-	.fabuhomework{ margin: 20rpx 0; margin-top: -10rpx; width: 100%; 
-		text{ display: block; text-align: center;  border-radius: 10rpx; box-sizing: border-box; padding: 20rpx; color:#fff ;
-		background-image: linear-gradient(-90deg, #576afc 0%, #97a1ff 100%);
+	.fabuhomework {
+		margin: 20rpx 0;
+		margin-top: -10rpx;
+		width: 100%;
+
+		text {
+			display: block;
+			text-align: center;
+			border-radius: 10rpx;
+			box-sizing: border-box;
+			padding: 20rpx;
+			color: #fff;
+			background-image: linear-gradient(-90deg, #576afc 0%, #97a1ff 100%);
 		}
 	}
-		.item {
-			text-align: center;
 
-			text {
-				font-size: 28rpx;
-				display: inline-block;
-				padding-top: 20rpx;
-			}
+	.item {
+		text-align: center;
+
+		text {
+			font-size: 28rpx;
+			display: inline-block;
+			padding-top: 20rpx;
 		}
+	}
 
-		.img {
-			width: 100rpx;
-			height: 100rpx;
-			margin: 0 auto;
+	.img {
+		width: 100rpx;
+		height: 100rpx;
+		margin: 0 auto;
 
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		image {
+			width: 100%;
+			height: 100%;
 		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/miniClass/addHomeWork.vue b/pages/miniClass/addHomeWork.vue
index d568c7c..3d10a78 100644
--- a/pages/miniClass/addHomeWork.vue
+++ b/pages/miniClass/addHomeWork.vue
@@ -82,7 +82,7 @@ import $http from '@/config/requestConfig.js';
 				playData: {},
 				//手机号账号
 				form: {
-					id: '', // 作业或者医案id
+					id: undefined, // 作业或者医案id
 					classId: undefined,
 					display:'1',
 					content: '', // 描述
@@ -131,7 +131,7 @@ import $http from '@/config/requestConfig.js';
 		//第一次加载
 		onLoad(e) {
 			console.log('收到的值', e);
-			if(e.sort != 'undefined'){
+			if(e.sort != 'undefined' && e.sort){
 				this.form.sort = e.sort 
 			}			
 			this.pageType = e.type
@@ -300,7 +300,7 @@ import $http from '@/config/requestConfig.js';
 									    "title": this.form.title,
 									    "content": this.form.content,
 									    "img": this.form.img,
-										"sort": this.form.sort ? parseInt(this.form.sort)+1 : undefined
+										"sort": this.form.sort && !this.form.id ? parseInt(this.form.sort)+1 : undefined
 								},
 								header: { //默认 无 说明：请求头
 									'Content-Type': 'application/json'
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index a5000d1..83b8c94 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -44,19 +44,26 @@
 
 				</view>
 				<view class="otherItems flex_box userScore">
-					<view>
+					<view v-if="classModel.isTask == 1">
 						<text class="ciyao">作业得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task0Score}}</i>分</text>
 					</view>
-					<view><text class="ciyao">医案得分</text>
+					<view v-if="classModel.isMedicalcase == 1">
+						<text class="ciyao">医案得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task1Score}}</i>分</text>
 					</view>
-					<view><text class="ciyao">心得得分</text>
+					<view v-if="classModel.isExperience == 1">
+						<text class="ciyao">心得得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.experienceScore}}</i>分</text>
 					</view>
-					<view><text class="ciyao">思考题分</text>
+					<view v-if="classModel.isQuestion == 1">
+						<text class="ciyao">思考题分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i>分</text>
-					</view>						
+					</view>	
+					<!-- <view v-if="classModel.isExam == 1 && thisClass.state == '2'">
+						<text class="ciyao">考试分</text>
+						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i>分</text>
+					</view> -->
 				</view>
 				<!-- <view class="optionsBox" >
 					<view class="flex_box flex_between">
@@ -149,15 +156,16 @@
 				<view class="" v-show="students.length == 0 && tabId == '2'">
 					<u-divider text="暂无学员加入"></u-divider>
 				</view>
+				{{getTijiaoTitleList}}
 				<!-- 班内提交 -->
-				<view class="" v-if=" tabId == '3' && thisClass.state != '0'">
+				<view class="" v-if="tabId == '3' && thisClass.state != '0'">
 					<view class="flex_box tijiaoTitle">
 						<text :class="tijiaoTitleId == item.id ? 'active' :''" @click="titleClick(item,index)"
 							v-for="(item, index) in tijiaoTitleList" :key="index">{{item.name}}</text>
 					</view>
 					<!-- 班内任务 --><!-- 医案 --> <!-- 心得 -->
 					<view class="">
-						<view class="" v-if="tijiaoTitleId == 2 && thisClass.state == '1'">
+						<view class="" v-if="tijiaoTitleId == 2 && thisClass.state == '1' && roleCode.includes('0')">
 							<view class="noanser">
 								<view class="">
 									<text>快来添加一条记录吧~</text>
@@ -207,12 +215,14 @@
 												v-show="tijiaoTitleId == 2 && myExperience == 1 && item.scoreSuccess == 0"
 												@click.stop="editMyXinde(item)">修改</text>
 										</view>
+										<template v-if="roleCode.includes('0')">
 										<view class="leve3" v-show="item.reply && tijiaoTitleId != 2">
 											<text>已提交答案</text>
 										</view>
 										<view class="leve3 no" v-show="!item.reply && tijiaoTitleId != 2">
 											<text>未提交答案 点击开始答题</text>
 										</view>
+										</template>
 									</view>
 								</view>
 							</view>
@@ -239,7 +249,7 @@
 					<text class="adminName">班长：</text>
 					<view class="personbox" v-if="admins.monitor.user != null">
 						<text>{{admins.monitor.user.nickname != null && admins.monitor.user.nickname != '' ? admins.monitor.user.nickname : '匿名用户'}}</text>
-						<text v-if="admins.monitor.id">({{admins.monitor.user.tel}})</text>
+						<!-- <text v-if="admins.monitor.id">({{admins.monitor.user.tel}})</text> -->
 					</view>
 					<text v-else>暂未设置</text>
 				</view>
@@ -247,8 +257,8 @@
 					<text class="adminName">副班长：</text>
 					<view class="personbox" v-if="admins.dmonitor.user != null">
 						<text>{{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}</text>
-						-->
-						<text>({{admins.dmonitor.user.tel}})</text>
+						
+						<!-- <text>({{admins.dmonitor.user.tel}})</text> -->
 					</view>
 					<text v-else>暂未设置</text>
 				</view>
@@ -256,7 +266,7 @@
 
 					<view class="personbox" v-if="admins.learner.user != null">
 						<text>{{admins.learner.user.nickname != null && admins.learner.user.nickname != '' ? admins.learner.user.nickname : '匿名用户'}}</text>
-						<text>({{admins.learner.user.tel}})</text>
+						<!-- <text>({{admins.learner.user.tel}})</text> -->
 					</view>
 					<text v-else>暂未设置</text>
 				</view>
@@ -275,8 +285,8 @@
 					<template v-if="admins.scorer.length > 0">
 						<view class="arryItemSub" v-for="(item,index) in admins.scorer" :key="index">
 							<template v-if="item.user != null">
-								<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname : '匿名用户'}}</text>
-								<text>({{item.user.tel}}),</text>
+								<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+' ' : '匿名用户 '}}</text>
+								<!-- <text>({{item.user.tel}}),</text> -->
 							</template>
 						</view>
 					</template>
@@ -326,7 +336,7 @@
 
 				thisClass: {},
 				students: [],
-				tabId: '3',
+				tabId:'3',
 				curTagIndex: 0,
 				scrollable: false,
 				pPage: 0,
@@ -387,7 +397,8 @@
 				isDirector: false, // 是主任
 				isHave: false,
 				showMan: false,
-				tijiaoTitleList: [{
+				tijiaoTitleList:[],
+				defaultTijiaoTitleList: [{
 						name: '班内作业',
 						id: '0'
 					},
@@ -409,12 +420,14 @@
 					experienceScore: 0,
 					task0Score: 0,
 					questionScore: 0
-				}
+				},
+				roleCode:[]
 			}
 		},
 		onLoad(e) {
 			uni.hideTabBar();
 			this.classId = e.id
+			
 			this.getUserInfo()
 			uni.$on('refreshData', () => {
 				console.log('开始刷新列表数据');
@@ -445,6 +458,15 @@
 		onShow() {			
 			this.getClassInfo()
 			this.getScore()
+			// this.getTijiaoTitleList()
+			if (this.thisClass.state != 0) {
+				this.pPage = 0
+				this.taskList = []
+				this.getList()
+			}
+			// this.pPage = 0
+			// this.taskList = []
+			// this.getList()
 		},
 		computed: {
 			...mapState(["userInfo"]),
@@ -472,6 +494,23 @@
 				}
 				return list
 			},
+			// 获得提交项目的tab
+			getTijiaoTitleList(){
+				var _list = []
+				if(this.classModel.isTask == 1){
+					_list.push(this.defaultTijiaoTitleList[0])
+				}
+				if(this.classModel.isMedicalcase == 1){
+					_list.push(this.defaultTijiaoTitleList[1])
+				}
+				if(this.classModel.isExperience == 1){
+					_list.push(this.defaultTijiaoTitleList[2])
+				}
+				// return _list
+				this.tijiaoTitleList = _list 
+				this.tijiaoTitleId = this.tijiaoTitleList[0].id
+				// this.tabId = 
+			},
 		},
 		methods: {
 			
@@ -482,6 +521,32 @@
 				
 				this.taskList[index].zhedie = !this.taskList[index].zhedie
 			},
+			// 获取用户身份
+			getUserRole(){	
+								$http.request({
+										url: "common/class/getUserRole",
+										method: "POST",
+										data: {
+											"classId": this.classId
+										},
+										header: { //默认 无 说明：请求头
+											'Content-Type': 'application/json'
+										},
+									})
+									.then((res) => {
+										uni.hideLoading()
+										console.log('res获取身份信息',res);										
+										this.roleCode = res.result
+									}).catch(e => {
+										uni.hideLoading()
+										this.roleCode = []
+										uni.showToast({
+											title: '获取身份信息失败',
+											icon: 'error'
+										})
+									});
+					
+			},
 			// 查询平时表现分
 			getScore() {
 				$http.request({
@@ -648,8 +713,8 @@
 				if (this.tijiaoTitleId == textIndex) {
 					return
 				}
-				this.tijiaoTitleId = textIndex
-				console.log('e班内提交子按钮');
+				this.tijiaoTitleId = item.id
+				console.log('e班内提交子按钮',this.tijiaoTitleId);
 				this.pPage = 0
 				this.taskList = []
 				this.myExperience = 0
@@ -840,14 +905,10 @@
 			outClass(userId) {
 				let that = this
 				var _useId = undefined
-				var _txt = ''
-				// if (userId) {
-				// 	_useId = userId
-				// 	_txt = '即将踢出该学员，是否继续？'
-				// } else {
+				var _txt = ''				
 				_useId = this.userInfo.id
 				_txt = '您即将退出当前班级，退出班级后，在本班级提交的作业、医案、心得都将被删除，是否继续？'
-				// }
+				
 
 				uni.showModal({
 					title: '提示',
@@ -897,7 +958,7 @@
 			clickHelp() {
 				uni.showModal({
 					title: '说明',
-					content: "表现分占最终总成绩的40%，由作业,医案,心得,思考题四部分构成，每部分各占四分之一，且每部分最高为10分，总计40分。",
+					content: `表现分由${this.classModel.isTask == 1 ? '作业('+this.classModel.taskScore+'%)，' : ''}${this.classModel.isMedicalcase == 1 ? '医案('+this.classModel.medicalcaseScore+'%)，' : ''}${this.classModel.isExperience == 1 ? '心得('+this.classModel.experienceScore+'%)，' : ''} ${this.classModel.isQuestion == 1 ? '思考题('+this.classModel.questionScore+'%)' : ''}构成。`,
 					showCancel: false,
 					confirmText: '好的'
 				})
@@ -907,7 +968,7 @@
 					url: `/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}`
 				})
 			},
-			getClassInfo() {
+			getClassInfo() {				
 				uni.showLoading({
 					title: '正在加载'
 				})
@@ -964,9 +1025,7 @@
 							this.courses = res.result.courses
 							this.students = res.result.students
 							this.refresh = true
-							if (this.thisClass.state != 0) {
-								this.getList()
-							}
+							
 						}
 						uni.hideLoading()
 					}).catch(e => {
@@ -1452,7 +1511,7 @@
 	}
 
 	.tijiaoTitle {
-		justify-content: space-between;
+		justify-content:space-around;
 		margin-bottom: 20rpx;
 
 		text {
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index a2769a4..5594ab0 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -53,9 +53,9 @@
 					</view>
 					<!-- 待开班班长 -->
 					<view class="stepBox" v-if="thisClass.state == '0' && (roleCode.includes('1') || roleCode.includes('2'))">
-						<h3 class="PM_font threeStepTitle">3步操作快速开班</h3>
+						<h3 class="PM_font threeStepTitle">快速开班流程</h3>
 						<view class="flex_box item">
-							<i class="PM_font stepItem">1.</i>
+							<!-- <i class="PM_font stepItem">1.</i> -->
 							<view class="textBox">
 								<text class="PM_font">设置班委</text><br/>
 								<span>开班之前需要完成副班长、学委、评分员的任命</span>
@@ -70,8 +70,8 @@
 								</view>	
 							</view>
 						</view>
-						<view class="flex_box item">
-							<i class="PM_font stepItem">2.</i>
+						<view class="flex_box item" v-if="classModel.isTask == 1">
+							<!-- <i class="PM_font stepItem">2.</i> -->
 							<view class="textBox">
 								<text class="PM_font">作业设置</text><br/>
 								<span>根据教学时长,至少发布{{thisClass.homeWorkNumber}}条作业</span>
@@ -88,7 +88,7 @@
 							</view>
 						</view>
 						<view class="flex_box item">
-							<i class="PM_font stepItem">3.</i>
+							<!-- <i class="PM_font stepItem">3.</i> -->
 							<view class="textBox">
 								<text class="PM_font">招收学员</text><br/>
 								<span>班级内学员人满后可开班</span>
@@ -104,10 +104,10 @@
 						</view>
 					</view>
 					<view class="flex_box" v-if="thisClass.state == '1'">
-						<view class="item fabuhomework" @click="goTaskListForWait('0')" v-if="thisClass.state == '1'">
+						<view class="item fabuhomework" @click="goTaskListForWait('0')" v-if="thisClass.state == '1' && classModel.isTask == 1">
 							<text>作业列表</text>
 						</view>
-						<view class="item yianList" @click="goTaskListForWait('1')" v-if="thisClass.state == '1'">
+						<view class="item yianList" @click="goTaskListForWait('1')" v-if="thisClass.state == '1' && classModel.isMedicalcase == 1">
 							<text>医案列表</text>
 						</view>
 						<view class="item setBanewei" v-if="thisClass.state != '2'"
@@ -124,7 +124,7 @@
 					
 				</view>
 				<!--  作业批改 --> 
-				<class-infoWork-blank v-if="thisClass.state != '0'" :thisClass="thisClass" :roleCode="roleCode"></class-infoWork-blank>
+				<class-infoWork-blank v-if="thisClass.state != '0'" :thisClass="thisClass" :classModel="classModel" :roleCode="roleCode"></class-infoWork-blank>
 			</view>			
 			<view class="mainBox">
 				<view class="">
@@ -135,6 +135,20 @@
 				<!-- 学员列表 -->
 				<view class="" v-if="tabId == '2'">
 				<view class="classMateBox" v-show="students.length> 0 ">
+				<view class="flex_box tips">
+					<view class="item flex_box">
+						<span class=""></span><text>普通用户</text>
+					</view>
+					<view class="item flex_box">
+						<span class="superVip"></span><text>超级VIP</text>
+					</view>
+					<view class="item flex_box">
+						<span class="wumenVip"></span><text>医学VIP</text>
+					</view>
+					<view class="item flex_box">
+						<span class="zmVip"></span><text>国学VIP</text>
+					</view>
+				</view>
 				<uni-section class="mb-10 nobg xueyuanTitle" title="班内学员" type="line" sub-title="">共 {{students.length}} 名学员</uni-section>
 					<view class="newBox" >
 										<view 
@@ -784,7 +798,7 @@ import { ref, onMounted } from 'vue';
 				let that = this
 				if (statusCode == '1') {
 					console.log('this.admins',this.admins);
-					if(this.homeWorkList.length == 0){
+					if(this.homeWorkList.length == 0 && this.classModel.isTask == 1){
 						uni.showToast({
 							title: '开班前请发布班内作业，开班后将不可添加和更改',
 							icon: 'none',
@@ -792,19 +806,7 @@ import { ref, onMounted } from 'vue';
 						})
 						return
 					}
-					if (this.students.length < this.thisClass.number) {
-						uni.showModal({
-							title: "提示",
-							content:'班内成员还没有招满，确定开班操作吗？',
-							success(res) {
-								if (res.confirm) {
-									that.opClass(statusCode)
-								}else{
-									return
-								}
-							},
-						})
-					}
+					
 				}else if(statusCode == '2'){
 					var nowTime = Date.now()
 					var datecc = new Date(this.thisClass.endTime);					
@@ -850,8 +852,8 @@ import { ref, onMounted } from 'vue';
 								title: '操作成功',
 								icon: 'success'
 							})
-							setTimeout(() => {
-								this.getClassInfo()
+							setTimeout( () => {
+								 this.getClassInfo()
 							}, 500)
 						}else{
 							uni.showToast({
@@ -905,7 +907,7 @@ import { ref, onMounted } from 'vue';
 											icon: 'success'
 										})
 										setTimeout(() => {
-											this.getClassInfo()
+											that.getClassInfo()
 										}, 2000)
 									}
 								}).catch(e => {
@@ -1128,6 +1130,14 @@ import { ref, onMounted } from 'vue';
 		background-image: linear-gradient(-90deg, #258feb 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
 		
 	}
+	.tips{ 
+		padding:20rpx 10rpx ; background-color: #eee; border-radius: 10rpx;
+		font-size: 24rpx; color: #666;  margin: 20rpx 0; margin-bottom: 30rpx;
+	
+	.item{align-items: center;}
+	
+		span{display: inline-block; margin-right: 10rpx; border-radius: 4rpx;; width: 30rpx; height: 30rpx; background-color: #fff; border: 1px solid #999;}
+	}
 .daikaibtn{
 	.item{ padding: 10rpx 6rpx;}
 }
diff --git a/pages/miniClass/memberSet.vue b/pages/miniClass/memberSet.vue
index 2384f67..e81c297 100644
--- a/pages/miniClass/memberSet.vue
+++ b/pages/miniClass/memberSet.vue
@@ -201,6 +201,7 @@
 			</view>
 		</uni-forms>
 		<view class="btn_box"><button @click="onSubmit">提 交</button></view>
+		
 		<u-popup v-if="MemberAdd" key="1" :show="MemberAdd" :round="10" @close="closePup">
 			<view style="padding: 40rpx;" class="flex_box box6">
 				<view class="" style="width: 100%; text-align: center;">
@@ -560,13 +561,19 @@
 				if (!this.form.scorer[0] && !this.form.scorer[1] && !this.form.scorer[2]) {
 					newScorer = []
 				} else {
-					// console.log('删除之前newScorer', newScorer);
+					console.log('删除之前newScorer', newScorer);
+					var _scorerList = []
 					this.form.scorer.forEach((item, index) => {
 						console.log('item', item);
-						if (!item) {											
-							newScorer.splice(1,1)						
-						}
+						// if (!item) {											
+						// 	newScorer.splice(1,1)						
+						// }
+						if (item && item != null) {
+						 	_scorerList.push(item)					
+						 }
 					})	
+					newScorer = _scorerList
+					console.log('处理后的newScorer', newScorer);
 					newScorer = newScorer.map(item => {
 						return item.id
 					})										
diff --git a/pages/miniClass/taskDetail.vue b/pages/miniClass/taskDetail.vue
index fb3d052..3f5dedd 100644
--- a/pages/miniClass/taskDetail.vue
+++ b/pages/miniClass/taskDetail.vue
@@ -22,7 +22,7 @@
 				</view>				
 			</view>		
 				<!-- 还没提交提示 -->
-				<view class="noanser" v-show="!thisTask.reply && classState == '1'">
+				<view class="noanser" v-show="!thisTask.reply && classState == '1' && roleCode.includes('0')">
 					<view class="">
 						<text>还没有提交你的答案呢，现在开始作答吧！</text>
 					</view>
@@ -184,7 +184,8 @@
 
 				},
 				listDisplay: '1', // 提交记录展示类型 0 全部 1 自己的
-				classState:undefined
+				classState:undefined,
+				roleCode:[]
 			}
 		},
 		onLoad(e) {
@@ -228,6 +229,32 @@
 			...mapState(["userInfo"]),
 		},
 		methods: {
+			// 获取用户身份
+			getUserRole(){	
+								$http.request({
+										url: "common/class/getUserRole",
+										method: "POST",
+										data: {
+											"classId": this.thisTask.classId
+										},
+										header: { //默认 无 说明：请求头
+											'Content-Type': 'application/json'
+										},
+									})
+									.then((res) => {
+										uni.hideLoading()
+										 console.log('res获取身份信息',res);										
+										this.roleCode = res.result
+									}).catch(e => {
+										uni.hideLoading()
+										this.roleCode = []
+										uni.showToast({
+											title: '获取身份信息失败',
+											icon: 'error'
+										})
+									});
+					
+			},
 			// 获取医案任务详情
 			getTaskInfo(){
 				$http.request({
@@ -255,6 +282,7 @@
 								})
 							} 
 							console.log('this.fileList11',this.fileList11);
+							this.getUserRole()
 						}
 					}).catch(e => {
 						console.log(e, '数据报错')
diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue
index ee11a89..6851641 100644
--- a/pages/miniClass/taskDetailForMan.vue
+++ b/pages/miniClass/taskDetailForMan.vue
@@ -49,10 +49,18 @@
 									<view class="btn1" @click.stop="changeZheDie(item, index)">{{item.zhedie ? '收起' : '展开'}}</view>
 								</view>
 							</view>
+							
 							<view class="leve2">								
 								<view :class="['contentss',item.zhedie ? '' : 'zhedie']">
 									{{item.content}}									
 								</view>
+								<view class="">
+									<view class="imgBox flex_box" v-if="item.fileList.length > 0">
+										<view class="item" v-for="(item, index) in item.fileList" :key="index">
+											<image @click="previewImage(item.url)" :src="item.url" mode="widthFix"></image>
+										</view>
+									</view>
+								</view>
 								<view class="" style="margin-top: 20rpx;">									
 									<view class="score" v-if="item.scoreSuccess >= 2">
 										分数：{{item.score}}
@@ -320,10 +328,8 @@
 						},
 					})
 					.then(res => {
-						if (res.code == 0) {
-							
-							this.thisTask = res.result.classTask
-							
+						if (res.code == 0) {							
+							this.thisTask = res.result.classTask							
 							// this.zuoyeList = res.result.userList
 							// this.thisTask = taskinfo1.classTask
 							this.fileList11 = []
diff --git a/pages/miniClass/taskListForWaitOpen.vue b/pages/miniClass/taskListForWaitOpen.vue
index 35e60bd..716ce5d 100644
--- a/pages/miniClass/taskListForWaitOpen.vue
+++ b/pages/miniClass/taskListForWaitOpen.vue
@@ -24,7 +24,7 @@
 			<uni-section class="mb-10 mt-10 nobg" :title="'共'+total+'条数据'" type="line"></uni-section>
 				<view class="submitRecode">
 					<view class="newBox">
-						<view class="item " v-for="(item, index) in taskList" @click="clickTask(item)">
+						<view class="item " v-for="(item, index) in taskList" @click="clickTask(item)">							
 							<view class="leve1 flex_box flex_between">
 								<text style="flex: 1;">{{item.title}}</text>
 								<text class="edit border_radius_10 small_btn" @click.stop="goEdit(item)" v-if="pageType == 0 && classState == 0 || pageType == 1 && classState == 1 && item.otherInfo.setGiveHomeWorkNumber == 0">修改</text>
diff --git a/static/icon/teseIcon.png b/static/icon/teseIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdaea3dacd322224554547d9eb8c789cfb049f2d
GIT binary patch
literal 5017
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
S7IV341GLoj)oLD~U;aOy^nFeM

literal 0
HcmV?d00001