我的审批红点提醒

pages/mine/mine.vue

@@ -24,6 +24,7 @@
 			<view class="line" v-if="false"></view>
 			<view class="line" v-if="false"></view>
 			<view class="item" @click="linkTo('/pages/mine/myApproval/myApproval')" v-if="isShow('我的审批')">
 			<view class="item" @click="linkTo('/pages/mine/myApproval/myApproval')" v-if="isShow('我的审批')">
 				<view class="name">我的审批</view>
 				<view class="name">我的审批</view>
+				<view class="red-dot"></view>
 				<image src="../../static/right-arrow.png" class="image"></image>
 				<image src="../../static/right-arrow.png" class="image"></image>
 			</view>
 			</view>
 			<view class="line" v-if="isShow('我的审批')"></view>
 			<view class="line" v-if="isShow('我的审批')"></view>
@@ -252,6 +253,14 @@
 					color: #333;
 					color: #333;
 				}
 				}
 
 
+				.red-dot {
+					width: 20rpx;
+					height: 20rpx;
+					border-radius: 10rpx;
+					background-color: #FF0000;
+					margin-right: 30rpx;
+				}
+
 				image {
 				image {
 					width: 15rpx;
 					width: 15rpx;
 					height: 28rpx;
 					height: 28rpx;

pages/mine/myApproval/myApproval.vue

@@ -20,7 +20,7 @@
 				<view class="item">截止时间：{{endeTime(item.create_time)}}</view>
 				<view class="item">截止时间：{{endeTime(item.create_time)}}</view>
 				<view class="bottom-line">
 				<view class="bottom-line">
 					<view class="leave-time">剩余时间：{{leaveTime(item.create_time)}}</view>
 					<view class="leave-time">剩余时间：{{leaveTime(item.create_time)}}</view>
-					<view class="btn" @click="pass(index)">审批通过</view>
+					<view class="btn" @click="pass(index)" v-if="leaveTime(item.create_time)!='0秒'">审批通过</view>
 				</view>
 				</view>
 				<view class="line"></view>
 				<view class="line"></view>
 			</view>
 			</view>
@@ -230,7 +230,7 @@
 	.column-list-item {
 	.column-list-item {
 		background-color: #FFFFFF;
 		background-color: #FFFFFF;
 		display: flex;
 		display: flex;
-		margin-bottom: 20rpx;
+		// margin-bottom: 20rpx;
 		border-radius: 30rpx;
 		border-radius: 30rpx;
 		flex-direction: column;
 		flex-direction: column;
 		padding: 30rpx;
 		padding: 30rpx;
@@ -268,7 +268,7 @@
 
 
 		.line {
 		.line {
 			width: 630rpx;
 			width: 630rpx;
-			margin: 30rpx 0;
+			margin: 30rpx 0 0 0;
 			height: 0.5px;
 			height: 0.5px;
 			background: rgba(0, 0, 0, 0.2);
 			background: rgba(0, 0, 0, 0.2);
 		}
 		}