Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

# Conflicts:
#	src/pages/index/workSituation.vue
#	src/pages/setComments/setComments.vue

src/components/index/workSituation/courseCard.vue

@@ -166,7 +166,7 @@
 				hideExchangeBoxHandler(item){
 					if(item){
 						data.currentCourse=item
-						ctx.emit('change',item.courseId)
+						ctx.emit('change',item.courseId,item.CourseName)
 					}
 					data.showItems=false
 					ctx.emit('changePopStatus',0)
@@ -178,8 +178,7 @@
 						data.titleList[1].data=r.Data.NotFinishList
 						data.titleList[2].data=r.Data.FinishList
 						data.currentCourse=r.Data.AllCourseList.length>0?r.Data.AllCourseList[0]:null
-						console.log(data.currentCourse)
-						ctx.emit('change',data.currentCourse?data.currentCourse.courseId:0)
+						ctx.emit('change',data.currentCourse?data.currentCourse.courseId:0,data.currentCourse?data.currentCourse.CourseName:'')
 						
 					})
 				},

src/components/index/workSituation/studentList.vue

 <template>
 	<view class="studentList-box flex">
 		<block v-if="dataList && dataList.length>0" >
-        <view class="studentList-content" @click="selectStuHandler(item)" v-for="(item,index) in dataList" :key="index">
+        <view class="studentList-content" v-for="(item,index) in dataList" :key="index"
+		@click="selectStuHandler(item)">
             <view class="studentList flex">
                 <view class="studentList-img">
                     <van-image width="100%" height="100%" fit="cover" class="img"
@@ -47,7 +48,6 @@
 			});
             let methods = {
 				selectStuHandler(item){
-					console.log(item)
 					ctx.emit("selected",item.StuId,item.StuName)
 				}
             }

src/components/setComments/rulesPopup.vue

@@ -114,7 +114,6 @@
 					}
 					uni.showLoading()
 					data.loading=true
-					console.log(data.valueNum)
 					data.ruleObj.StartNum = data.minValue >data.maxValue?data.maxValue:data.minValue;
 					data.ruleObj.EndNum = data.minValue>data.maxValue?data.minValue:data.maxValue;
 					if(props.rule!=-1){

src/pages/index/examDetails.vue

@@ -31,7 +31,8 @@
                 </view>
             </view>
             <view class="index-student-information" style="flex:1;height:1px">
-                <examDetailsComponents :ExamStu="ExamStu" :checkUnKnow='unSelectCheck'></examDetailsComponents>
+                <van-empty description="暂无数据" v-if="ExamStu.length === 0" />
+                <examDetailsComponents v-if="ExamStu.length>0" :ExamStu="ExamStu" :checkUnKnow='unSelectCheck'></examDetailsComponents>
             </view>
         </view>
 	</view>
@@ -76,9 +77,10 @@
 				},
 				//获取考试学生列表
 				getExamStuList(){
+                    uni.showLoading()
 					proxy.$request("/Exam/GetExamStuList", data.Msg).then(res => {
-						console.log(res.data);
 						data.ExamStu = res.Data;
+                        uni.hideLoading()
 					})
 				},
                 back(){
@@ -107,6 +109,23 @@
 	};
 </script>
 <style scoped>
+    .noData {
+		text-align: center;
+		flex: 1;
+		width: 100%;
+		margin-top: 171rpx;
+	}
+	
+	.noData image {
+		width: 200rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.noData view {
+		font-size: 24rpx;
+		color: #cecece;
+		text-align: center;
+	}
     .index-student-information{
         min-height: 800rpx;
 		background: #FFFFFF;

src/pages/index/workSituation.vue

@@ -123,7 +123,8 @@
 				currentCourseId:0,
 				userData:{},
 				loading:false,
-				showPopu:false
+				showPopu:false,
+				CourseName:''
 			});
 			data.userData=uni.getStorageSync("userInfo")
 			let methods = {
@@ -131,9 +132,9 @@
 					data.showPopu=status==1
 				},
 				goSet(){
-					//let url='/pages/setComments/setComments?CourseId='+data.currentCourseId;
 					let url='/pages/setComments/teacher-commit?courseId='+data.currentCourseId;
-					console.log("url",url);
+					//let url='/pages/setComments/setComments?CourseId='+data.currentCourseId+'&CourseName='+data.CourseName;
+
 					uni.navigateTo({
 						url:url
 					})
@@ -148,10 +149,11 @@
 						url:'/pages/student/student?stuId='+id+'&courseId='+data.currentCourseId+'&stuName='+encodeURIComponent(name)
 					})
 				},
-				changeCourseHandler(id){
+				changeCourseHandler(id,name){
 					data.Msg.courseId=id
 					data.OperationMsg.courseId=id
 					data.currentCourseId=id
+					data.CourseName = name
 					methods.getCourseStuList()
 					methods.getExamPageList()
 					methods.getCourseHomeWorkList()

src/pages/setComments/commentRulesList.vue

@@ -5,6 +5,12 @@
 				<van-icon class="commentRulesList-header-left" name="arrow-left" @click="back" />
 				<text class="commentRulesList-header-title">评论规则</text>
 			</view>
+			<van-tabs v-model="activeName"
+			color="#D13A48" title-active-color="#D13A48"
+			@change="clickTabs">
+				<van-tab v-for="(item,indx) in LabelList" :key="index"
+				:title="item.name" :name="item.id"></van-tab>
+				</van-tabs>
 		</navbar>
 		<view class="commentRulesList-content">
 			<!-- <view class="commentRulesList-title flex">
@@ -55,7 +61,9 @@
 			</view>
 		</view>
 		<van-popup :show="show" :round="true" @close="closepopup">
-			<rulesPopup @cancel="closepopup" :rule="editor" :rules="courseRule" v-if="show" ref="getrulesPopup" @change="changeData"></rulesPopup>
+			<rulesPopup @cancel="closepopup" :rule="editor" :rules="courseRule" 
+			:Times="activeName"
+			v-if="show" ref="getrulesPopup" @change="changeData"></rulesPopup>
 		</van-popup>
 	</view>
 </template>
@@ -89,6 +97,8 @@
 			let data = reactive({
 				Msg: {
 					CourseId: '',
+					CourseName: '',
+					Times:''
 				},
 				//课程规则
 				courseRule: {
@@ -96,11 +106,17 @@
 					Title: "",
 					CourseId: 0,
 					CommentDetails: [], //规则详情
+					Times:''
 				}, //课程规则
 				isDefaultRule: true, //是否是默认规则（
 				detailItem: {}, //当前编辑项
 				show:false,
-				editor:-1
+				editor:-1,
+				activeName:'1',
+				LabelList:[
+					{name:'第一次评论',id:'1'},
+					{name:'第二次评论',id:'2'},
+					{name:'第三次评论',id:'3'}]
 			});
 			let methods = {
 				onClose(event) {
@@ -173,6 +189,11 @@
 						}
 					});
 				},
+				clickTabs(name){
+					data.Msg.Times = name.target.name
+					data.courseRule.Times = name.target.name
+					that.getCourseRule()
+				},
 				//获取课程规则信息
 				getCourseRule() {
 					uni.showLoading()
@@ -200,6 +221,7 @@
 					data.show=false
 				}
 			}
+			let that = methods
 			return {
 				...toRefs(data),
 				...methods
@@ -207,18 +229,9 @@
 		},
 		onLoad(option) {
 			this.Msg.CourseId = option.CourseId;
-			if(option.show){
-				//this.show = option.show
-				//this.addRules()
-			}
-			// if(option.CourseId){
-			// 	this.show = true
-			// 	this.addRules()
-			// 	setTimeout(()=>{
-			// 		this.show = false
-			// 		this.closure()
-			// 	},200)
-			// }
+			this.Msg.CourseName = option.CourseName;
+			this.Msg.Times = '1'
+			this.courseRule.Times = '1'
 			this.getCourseRule();
 		},
 	};
@@ -228,6 +241,7 @@
 		text-align: center;
 		flex: 1;
 		width: 100%;
+		margin-top: 171rpx;
 	}
 	.van-swipe-cell__left,
 	.van-swipe-cell__right {
@@ -379,6 +393,7 @@
 	.commentRulesList-content {
 		padding: 0 50rpx;
 		margin-bottom: 240rpx;
+		margin-top: 110rpx;
 	}
 
 	.commentRulesList-box {

src/pages/setComments/setComments.vue

@@ -75,6 +75,7 @@
 				},
 				courseTimeList: [], //课程自动生成评论次数
 				courseRule: {}, //课程评价规则
+				CourseName:''
 			});
 			let methods = {
 				backFirst() {
@@ -105,10 +106,8 @@
 					})
 				},
 				goRules() {
-					console.log('come in 2 ....')
 					uni.navigateTo({
-						//url: '/pages/setComments/commentRulesList?CourseId=' + data.Msg.CourseId
-						url: '/pages/setComments/commentRulesList?show=' + false+'&CourseId=' + data.Msg.CourseId
+						url: '/pages/setComments/commentRulesList?CourseId=' + data.Msg.CourseId + '&CourseName=' + data.CourseName
 					})
 				}
 			};
@@ -120,7 +119,7 @@
 		},
 		onLoad(option) {
 			this.Msg.CourseId = option.CourseId;
-			console.log(option)
+			this.CourseName = option.CourseName
 		},
 		onShow() {
 			this.getCourseRule();

src/pages/student/student.vue

@@ -15,13 +15,14 @@
 			<text>学情反馈</text>
 			<view>(共{{workList!=null&&workList.length>0?workList.length:0}}条)</view>
 		</view>
-		<view class="index-student-information">
+		<view class="index-student-information" v-if="workList.length>0">
 			<template v-for="(item,index) in workList">
 				<JobComponents v-if="item.ResultType==1" :jobData="item"></JobComponents>
 				<examComponents  v-if="item.ResultType==2" :jobData="item"></examComponents>
 				<commentsComponents  v-if="item.ResultType==3" :jobData="item"></commentsComponents>
 			</template>
 		</view>
+		<van-empty description="暂无数据" v-if="workList.length === 0" />
 	</view>
 </template>