Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

common/style/new_style.css

@@ -2643,10 +2643,10 @@ button[disabled] {
  */
 .request_status_new {
 	font-size: 28rpx;
-	background: #CFF0BE;
-	color: #000000;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
+	background: rgba(34, 175, 104, 0.2);
+	color: rgba(34, 175, 104, 1);
 }
 
 /**
@@ -2654,8 +2654,8 @@ button[disabled] {
  */
 .request_status_reviewing {
 	font-size: 28rpx;
-	background: #ECEE1F;
-	color: #000000;
+	background: rgba(236, 156, 0, 0.2);
+	color: rgba(236, 156, 0, 1);
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2665,8 +2665,8 @@ button[disabled] {
  */
 .request_status_agreed {
 	font-size: 28rpx;
-	background:#82E26E;
-	color: #000000;
+	background: rgba(103, 194, 57, 0.2);
+	color: rgba(103, 194, 57, 1);
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2676,8 +2676,8 @@ button[disabled] {
  */
 .request_status_refused {
 	font-size: 28rpx;
-	background: #F33140;
-	color: #000000;
+	background: rgba(245, 108, 108, 0.2);
+	color: rgba(245, 108, 108, 1);
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2687,8 +2687,8 @@ button[disabled] {
  */
 .request_status_handling {
 	font-size: 28rpx;
-	background: #3C9CFF;
-	color: #000000;
+	background: rgba(60, 156, 255, 0.2);
+	color: rgba(60, 156, 255, 1);
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2699,7 +2699,7 @@ button[disabled] {
 .request_status_partial {
 	font-size: 28rpx;
 	background: #D3FF3C;
-	color: #000000;
+	color: #ffffff;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2710,7 +2710,7 @@ button[disabled] {
 .request_status_completed {
 	font-size: 28rpx;
 	background: #D3FF3C;
-	color: #000000;
+	color: #ffffff;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2721,7 +2721,7 @@ button[disabled] {
 .request_status_abort {
 	font-size: 28rpx;
 	background: #F33140;
-	color: #000000;
+	color: #ffffff;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }
@@ -2732,7 +2732,7 @@ button[disabled] {
 .request_status_cancelled {
 	font-size: 28rpx;
 	background: #F33140;
-	color: #000000;
+	color: #ffffff;
 	padding: 10rpx 20rpx 10rpx 20rpx;
 	border-radius: 10rpx;
 }

pages/message/index.vue

@@ -24,9 +24,8 @@
 					<uni-list :border="true" v-for="(item, index) in allMessageList " :key="item.id">
 						<uni-list-chat :title="item.templateNickname" avatar="/static/images/message.svg" clickable
 							:note="item.templateContent" :time="formatDate(item.createTime)" badge-positon="left"
-							
-							@click="jumpdetails(item)"
-							:class="item.readStatus == false?'':'hasread'" is=""></uni-list-chat>
+							@click="jumpdetails(item)" :class="item.readStatus == false?'':'hasread'" is="">
+						</uni-list-chat>
 						<u-line color="#909399" />
 					</uni-list>
 				</uni-list>
@@ -310,13 +309,13 @@
 		right: -40rpx;
 		background-color: red;
 		color: #FFFFFF;
-		font-size: .7rem;
+		/* font-size: .7rem; */
 		display: inline-block;
-		width: 46rpx;
-		height: 46rpx;
+		width: 36rpx;
+		height: 36rpx;
 		margin-bottom: 10upx;
 		text-align: center;
-		line-height: 46rpx;
+		line-height: 36rpx;
 		border-radius: 50%;
 		overflow: hidden;
 		margin-left: 10upx;