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

# Conflicts:
#	src/components/setComments/rulesPopup.vue
#	src/components/sregionslider/sregionslider.vue

src/components/index/scoreDetails/examDetailsComponents.vue

@@ -258,5 +258,6 @@
         height: 100%;
         overflow-y: auto;
         box-sizing: border-box;
+        padding: 0 0 100rpx 0;
     }
 </style>

src/components/index/scoreDetails/jobDetailsComponents.vue

@@ -88,6 +88,7 @@
         font-size: 20rpx;
         font-weight: 400;
         letter-spacing: 1px;
+        white-space: nowrap;
     }
     .homework-score:first-child{
         margin-right: 16rpx;
@@ -209,5 +210,6 @@
         height: 100%;
         overflow-y: auto;
         box-sizing: border-box;
+        padding: 0 0 100rpx 0;
     }
 </style>

src/components/index/workSituation/examList.vue

@@ -433,6 +433,7 @@
         font-weight: 400;
         letter-spacing: 1px;
         margin-bottom: 15rpx;
+        white-space: nowrap;
     }
     .homework-score:last-child{
         margin-right: 0rpx;

src/components/setComments/commentDetailsPopu.vue

@@ -87,6 +87,13 @@
 	};
 </script>
 <style scoped>
+	.commentPopup-content textarea{
+		width: 100%;
+		font-size: 30rpx;
+		line-height: 58rpx;
+		font-weight: 400;
+		color: #282828;
+	}
 	.commentPopup-content {
 		background: #F7F7F7;
 		border-radius: 30rpx;

src/components/setComments/studentsPopu.vue

@@ -11,7 +11,8 @@
 			<view class="studentsPopuImg">
 				<view class="studentsPopu-img-box flex">
 					<template v-for="(item,index) in stuList">
-						<view class="studentsPopu-img-list active flex" @click="clickChoose(item)">
+						<view class="studentsPopu-img-list flex" @click="clickChoose(item)"
+						:class="item.state?'active':''">
 							<view class="studentsPopu-imgbox flex">
 								<view class="studentsPopu-img flex">
 									<view>
@@ -64,7 +65,16 @@
 			let methods = {
 				// 选中
 				clickChoose(item) {
-					data.chooseStuArray.push(item);
+					item.state = !item.state
+					if(item.state){
+						data.chooseStuArray.push(item);
+					}else{
+						data.chooseStuArray.forEach((i,index)=>{
+							if(i.StuId==item.StuId){
+								data.chooseStuArray.splice(index,1)
+							}
+						})
+					}
 				},
 				// 搜索
 				searchKeywords() {
@@ -84,6 +94,10 @@
 			//监听属性数组
 			watch(() => props["courseStuList"], (newValue, oldValue) => {
 				if (newValue != oldValue && newValue && newValue.length > 0) {
+					let addList = function(arr) {
+						arr.forEach((item) => {item.state = false;})
+					}
+					addList(newValue);
 					data.stuList = newValue;
 				}
 			}, {
@@ -121,7 +135,9 @@
 		border-radius: 50%;
 		overflow: hidden;
 	}
-
+	.studentsPopu-img-list.active .studentsPopu-text{
+		color: #C91928;
+	}
 	.studentsPopu-img-list.active .studentsPopu-img {
 		background: #C91928;
 		box-shadow: 0rpx 0rpx 59rpx 0rpx rgba(201, 23, 39, 0.34);