From ddd7c2c07f811dc8f8d3cdccb4c53522053fd538 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 29 Aug 2024 16:52:01 +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 | 58 ++++++++++++++++++-----
 pages/miniClass/classInfo.vue     | 76 +++++++++++++++++++------------
 pages/miniClass/classInfoMan.vue  | 36 ++++++++-------
 3 files changed, 114 insertions(+), 56 deletions(-)

diff --git a/components/classInfoWorkBlank.vue b/components/classInfoWorkBlank.vue
index b7b8f91..a6f36cd 100644
--- a/components/classInfoWorkBlank.vue
+++ b/components/classInfoWorkBlank.vue
@@ -1,37 +1,36 @@
 <template>
 	<view>
 		<view class="">
-			<view v-if="thisClass.state != 0" class="flex_box">
-
-				<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '0')"
+			<view v-if="thisClass.state != 0" :class="['flex_box',blankNumber < 3 ? 'flex_center' : 'flex_between']">
+				<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @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>
-				<view class="item" @click="goPingfen('/pages/miniClass/taskList',thisClass.id, '1')"
+				<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @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>
-				<view class="item" @click="goXindeList('/pages/miniClass/xindeList')"
+				<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @click="goXindeList('/pages/miniClass/xindeList')"
 					v-if="classModel.isExperience == 1">
-					<view class="img">
+					<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)" 
+				<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @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)"
+				<view :class="['item',blankNumber < 3 ? 'flex_box' : '']" @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>
@@ -49,9 +48,38 @@
 		name: "classInfoWorkBlank",
 		data() {
 			return {
-
+				blankNumber:0
 			};
 		},
+		onShow() {
+			// var _number = this.getBlankNumber
+		},
+		mounted() {
+			this.blankNumber = 0
+			console.log('进入mounted');
+			if(this.classModel.isTask == 1){
+				this.blankNumber++
+			}
+			if(this.classModel.isMedicalcase == 1){
+				this.blankNumber++
+			}
+			if(this.classModel.isExperience == 1){
+				this.blankNumber++
+			}
+			if(this.classModel.isQuestion == 1){
+				this.blankNumber++
+			}
+			if(this.classModel.isExam == 1){
+				this.blankNumber++
+			}	
+		},
+		computed:{
+			getBlankNumber(){
+				
+				var number = 0
+							
+			},
+		},
 		methods: {
 			goAddHomeWork(type) {
 
@@ -81,10 +109,13 @@
 
 <style lang="scss" scoped>
 	.flex_box {
-		justify-content: space-between;
+		// justify-content: space-between;
 	}
-
-	// .item1{border: 1px solid;}
+	.flex_center{ 
+		// justify-content: center;
+	}
+	 .item{ margin: 0 30rpx;}
+	
 	.fabuhomework {
 		margin: 20rpx 0;
 		margin-top: -10rpx;
@@ -121,4 +152,7 @@
 			height: 100%;
 		}
 	}
+	.item.flex_box{align-items: center; justify-content: space-between;
+			text{padding-top: 0;}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index 094424e..28c6012 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -41,22 +41,22 @@
 					<view class="titles flex_box">
 						<text>表现分</text><uni-icons type="help" size="18" color="#fff" @click="clickHelp"></uni-icons>
 					</view>
-
-				</view>
-				<view class="otherItems flex_box userScore">
-					<view v-if="classModel.isTask == 1">
+				</view>			
+				<view :class="['otherItems' ,'flex_box' ,'userScore']">
+					
+					<view v-if="classModel.isTask == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">作业得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task0Score}}</i>分</text>
 					</view>
-					<view v-if="classModel.isMedicalcase == 1">
+					<view v-if="classModel.isMedicalcase == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">医案得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task1Score}}</i>分</text>
 					</view>
-					<view v-if="classModel.isExperience == 1">
+					<view v-if="classModel.isExperience == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">心得得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.experienceScore}}</i>分</text>
 					</view>
-					<view v-if="classModel.isQuestion == 1">
+					<view v-if="classModel.isQuestion == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">思考题分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i>分</text>
 					</view>	
@@ -156,7 +156,7 @@
 				<view class="" v-show="students.length == 0 && tabId == '2'">
 					<u-divider text="暂无学员加入"></u-divider>
 				</view>
-				{{getTijiaoTitleList}}
+				<!-- {{getTijiaoTitleList}} -->
 				<!-- 班内提交 -->
 				<view class="" v-if="tabId == '3' && thisClass.state != '0'">
 					<view class="flex_box tijiaoTitle">
@@ -422,7 +422,8 @@
 					questionScore: 0
 				},
 				roleCode:[],
-				firstLoad:false, // 是否是第一次请求
+				firstLoad:true, // 是否是第一次请求
+				blankNumber:0
 			}
 		},
 		onLoad(e) {
@@ -458,19 +459,7 @@
 		},
 		onShow() {			
 			this.getClassInfo()
-			this.getScore()
-			// this.getTijiaoTitleList()
-			if (this.thisClass.state != 0) {
-				if(this.firstLoad){
-					this.firstLoad = false
-					}
-				this.pPage = 0
-				this.taskList = []
-				this.getList()
-			}
-			// this.pPage = 0
-			// this.taskList = []
-			// this.getList()
+			this.getScore()			
 		},
 		computed: {
 			...mapState(["userInfo"]),
@@ -515,6 +504,24 @@
 				this.tijiaoTitleId = this.tijiaoTitleList[0].id
 				// this.tabId = 
 			},
+			getBlankNumber(){
+				this.blankNumber = 0
+				if(this.classModel.isTask == 1){
+					this.blankNumber++
+				}
+				if(this.classModel.isMedicalcase == 1){
+					this.blankNumber++
+				}
+				if(this.classModel.isExperience == 1){
+					this.blankNumber++
+				}
+				if(this.classModel.isQuestion == 1){
+					this.blankNumber++
+				}
+				// if(this.classModel.isExam == 1){
+				// 	this.blankNumber++
+				// }	
+			}
 		},
 		methods: {
 			
@@ -1017,10 +1024,10 @@
 										// console.log('this.admins.counter',this.admins.counter);
 										this.admins.scorer.push(item)
 									}
-									if (item.role == '5') {
-										// console.log('this.admins.counter',this.admins.counter);
-										this.admins.counter.push(item)
-									}
+									// if (item.role == '5') {
+									// 	// console.log('this.admins.counter',this.admins.counter);
+									// 	this.admins.counter.push(item)
+									// }
 
 								})
 							}
@@ -1029,7 +1036,18 @@
 							this.courses = res.result.courses
 							this.students = res.result.students
 							this.refresh = true
-							
+							var ss =  this.getTijiaoTitleList
+							if (this.thisClass.state != 0) {
+								this.pPage = 0
+								this.taskList = []
+								if(this.firstLoad){
+									this.firstLoad = false
+									this.tijiaoTitleId = this.tijiaoTitleList[0].id				
+									
+								}
+								this.getList()
+							}
+							var dd = this.getBlankNumber
 						}
 						uni.hideLoading()
 					}).catch(e => {
@@ -1315,7 +1333,9 @@
 
 	.userScore {
 		text-align: center;
-
+		.ite.flex_box{ align-items: end;
+			.ciyao{margin-right: 10rpx;}
+		}
 		.mainTxt {
 			font-size: 50rpx;
 			color: $themeColor;
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index 5594ab0..4729b46 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -134,22 +134,24 @@
 				</view>
 				<!-- 学员列表 -->
 				<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>
+				<view class="classMateBox" v-show="students.length> 0 ">	
+						<view class="" style=" overflow: hidden;">		
 				<uni-section class="mb-10 nobg xueyuanTitle" title="班内学员" type="line" sub-title="">共 {{students.length}} 名学员</uni-section>
+				</view>
+					<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>
 					<view class="newBox" >
 										<view 
 										:class="['item','flexbox',
@@ -411,6 +413,7 @@ import { ref, onMounted } from 'vue';
 				homeWorkList:[],
 				thisStudent:{},
 				showStudentBlank:false,
+			
 			}
 		},
 		onLoad(e) {
@@ -496,7 +499,8 @@ import { ref, onMounted } from 'vue';
 						break;
 				}
 				return _roleName
-			}
+			},
+			
 		},
 		methods: {
 			closePup(){