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

src/components/index/JobComponents.vue

@@ -14,6 +14,7 @@
 			</view>
 			<view class="JobComponents-center-box" @click="JobDetails">
 				<view class="JobComponents-center-line"></view>
+				<view class="JobComponents-bjimg"></view>
 				<view class="JobComponents-center flex">
 					<view class="JobComponents-left">
 						<view class="operation-name">{{jobData.Title}}</view>
@@ -79,6 +80,15 @@
 	};
 </script>
 <style scoped>
+	.JobComponents-bjimg{
+		width: 104rpx;
+		height: 68rpx;
+		position: absolute;
+		right: 10rpx;
+		top: 43rpx;
+		background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654062513000_439.png')no-repeat;
+		background-size: 100% 100%;
+	}
 	.homework-score-num view:last-child {
 		font-size: 23rpx;
 		margin-top: 25rpx;

src/components/index/examComponents.vue

@@ -14,6 +14,7 @@
 			</view>
 			<view class="examComponents-center-box" @click="scoreDetails">
 				<view class="examComponents-center-line"></view>
+				<view class="examComponents-bjimg"></view>
 				<view class="examComponents-center flex">
 					<view class="examComponents-left">
 						<view class="operation-name">{{jobData.Title}}</view>
@@ -89,6 +90,15 @@
 	};
 </script>
 <style scoped>
+	.examComponents-bjimg{
+		width: 104rpx;
+		height: 68rpx;
+		position: absolute;
+		right: 10rpx;
+		top: 43rpx;
+		background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1654062518000_33.png')no-repeat;
+		background-size: 100% 100%;
+	}
 	.homework-score-num view:last-child {
 		font-size: 23rpx;
 		margin-top: 25rpx;

src/components/setComments/commentDetails.vue

@@ -222,6 +222,7 @@
         padding: 31rpx 40rpx 37rpx 22rpx;
         box-shadow: 0rpx 6rpx 29rpx 0rpx rgba(76, 76, 76, 0.09);
         border-radius: 30rpx;
+        margin-bottom: 40rpx;
     }
     .commentDetailsList-title .img{
         flex-shrink: 0;

src/components/setComments/commentDetailsPopu.vue

@@ -105,6 +105,10 @@
 		text-align: center;
 		color: #FFFFFF;
 	}
+	.commentPopup-save{
+		justify-content: center;
+		margin-top: 60rpx;
+	}
 	.commentPopup-title {
 		width: 100%;
 		text-align: center;

src/components/setComments/setComments.vue

 <template>
 	<view class="setComments-box">
-		<view class="setComments-add">
-			<van-icon name="plus" /><text>创建评价</text> </view>
+		<view class="setComments-add" @click="addComments">
+			<van-icon name="plus" /><text>创建评价</text> 
+		</view>
 		<view class="index-student-information">
 			<view class="setComments-content-box" v-if="dataList.length>0">
 				<template v-for="(item,index) in dataList">
@@ -11,7 +12,7 @@
 							<text class="setComments-title-left">第{{item.Times}}次评价</text>
 							<view class="setComments-title-right">
 								<view class="setComments-options flex">
-									<view class="setComments-options-title flex" @click="clickOptionsShow(item)">
+									<view class="setComments-options-title flex" @click.stop="clickOptionsShow(item)">
 										<view class="point"></view>
 										<text>{{item.ShowTypeStr}}</text>
 										<van-icon :name="item.optionsShow?'arrow-down':'arrow'" />
@@ -80,6 +81,11 @@
 						delta: 1
 					})
 				},
+				addComments(){
+					uni.navigateTo({
+						url: '/pages/setComments/commentRulesList'
+					})
+				},
 				goComment(item){
 					uni.navigateTo({
 						url: '/pages/setComments/commentDetails?comment='+ encodeURIComponent(JSON.stringify(item))
@@ -195,6 +201,7 @@
         left: 0;
         right: 0;
         top: 35rpx;
+		z-index: 2;
         background: #FCEEEF;
         padding: 20rpx 0 20rpx 0;
         border-radius: 0 0 25rpx 25rpx;

src/pages/setComments/commentRulesList.vue

@@ -504,14 +504,23 @@
 	.commentRulesList-box {
 		background: #FFFFFF;
 	}
-
-	.commentRulesList-header-title {
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #282828;
-		flex: 1;
-		text-align: center;
-		padding-right: 40rpx;
+	.commentRulesList-header-box{
+	    padding: 20rpx 42rpx;
+		flex-direction: row;
+		align-items: center;
+	}
+	.commentRulesList-header-title{
+	    font-size: 32rpx;
+	    font-weight: 500;
+	    color: #282828;
+		flex:1;
+		    text-align: center;
+		    padding-right: 40rpx;
+	}
+	.commentRulesList-header-left{
+	    font-size: 40rpx;
+	    position: relative;
+	    z-index: 3;
 	}
 
 	.navbarSticky {