刘拾玖 пре 4 месеци
родитељ
комит
bd62f947a2
3 измењених фајлова са 96 додато и 48 уклоњено
  1. 5 4
      pages/feedback/FeedbackList.vue
  2. 57 35
      pages/feedback/details.vue
  3. 34 9
      pages/feedback/index.vue

+ 5 - 4
pages/feedback/FeedbackList.vue

@@ -67,8 +67,7 @@
 		background-color: #F6F7F8;
 		background-color: #F6F7F8;
 		height: 100%;
 		height: 100%;
 		.feedback-list {
 		.feedback-list {
-			height: 100%;
-			padding: 32rpx 40rpx 40rpx;
+			padding: 32rpx 40rpx 0rpx;
 			background-color: #F6F7F8;
 			background-color: #F6F7F8;
 			.loop-list-item {
 			.loop-list-item {
 				min-height: 200rpx;
 				min-height: 200rpx;
@@ -106,8 +105,7 @@
 						}
 						}
 					}
 					}
 					.part-line {
 					.part-line {
-						width: 100%;
-						border: 1px solid #EFEFEF;
+						border-top: 1px solid #EFEFEF;
 						margin: 10rpx 0 20rpx;
 						margin: 10rpx 0 20rpx;
 					}
 					}
 					.text-content {
 					.text-content {
@@ -134,11 +132,14 @@
 					}
 					}
 				}
 				}
 			}
 			}
+			
 		}
 		}
+		
 		::v-deep .scroll-view {
 		::v-deep .scroll-view {
 			height: calc(100%);
 			height: calc(100%);
 			background-color: transparent !important;
 			background-color: transparent !important;
 		}
 		}
+
 		::v-deep .no-data {
 		::v-deep .no-data {
 			margin-top: 0;
 			margin-top: 0;
 			padding-top: 160rpx;
 			padding-top: 160rpx;

+ 57 - 35
pages/feedback/details.vue

@@ -42,17 +42,19 @@
 				<view class="schedule-title">进度</view>
 				<view class="schedule-title">进度</view>
 				<view class="schedule-timeline">
 				<view class="schedule-timeline">
 					 <view class="step-item" v-for="(item,index) in timeLine" :key="index">
 					 <view class="step-item" v-for="(item,index) in timeLine" :key="index">
-						<view class="step_great_circle"></view>
-						<view class="step-content">
-							<view class="step-title">{{ item.desc }}</view>
-							<view class="step-desc">{{ formatDate(item.time,'{y}-{m}-{d} {h}:{i}:{s}')}}</view>
-							 <div class="step-line" v-if="index + 1 == timeLine.length ? false : true" ></div>
+						<view class="step_circle_item">
+							<view class="dot"></view>
+							<view class="line"></view>
+						</view>
+						<view class="step_content_item">
+							<view class="step_content">{{ item.desc }}</view>
+							<view class="step_date">{{ formatDate(item.time,'{y}-{m}-{d} {h}:{i}:{s}')}}</view>
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</pub-loading-view>
 		</pub-loading-view>
-		<view v-if="!disabledRef" class="pub-button is-bg large" @click="onConfirm">确定</view>
+		<view v-if="!disabledRef" class="pub-button is-bg large submit" @click="onConfirm">提交</view>
 	</view>
 	</view>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
@@ -334,37 +336,57 @@
 				font-weight: 600;
 				font-weight: 600;
 			}
 			}
 			.schedule-timeline {
 			.schedule-timeline {
-			    margin: 20px 10px 0;
+			    padding: 20px 10px 0;
 			    overflow: auto;
 			    overflow: auto;
 			    .step-item {
 			    .step-item {
-			      position: relative;
-			      display: flex;
-			      align-items: flex-start;
-			      margin-bottom: 10rpx;
-			      .step_great_circle {
-			        width: 20rpx;
-			        height: 20rpx;
-			        border-radius: 50%;
-			        background-color: #D8D8D8;
-			        margin: 12rpx 20rpx 0 0;
-			      }
-			      .step-content {
-			        width: 100%;
-			        padding: 4rpx 10rpx 20rpx;
-			        display: flex;
-			        flex-direction: column;
-			        color: #686B73;
-			      }
-			      .step-line {
-			        position: absolute;
-			        top: 38rpx;
-			        left: 8rpx;
-			        bottom: -15rpx;
-			        width: 2rpx;
-			        background-color: #EFEFEF;
-			      }
-			    }
-			  }
+					color: $uni-text-color-grey;
+					display: flex;
+					min-height: 140rpx;
+					.step_circle_item {
+						padding-top: 4rpx;
+						@include flex;
+						flex-direction: column;
+						margin-right: 24rpx;
+						
+						.dot {
+							width: 24rpx;
+							height: 24rpx;
+							background: $uni-border-color;
+							border-radius: 50%;
+						}
+						
+						.line {
+							flex: 1;
+							border-left: 1px solid $uni-border-color;
+							margin: 12rpx 0;
+						}
+					}
+					.step_content_item {
+						width: 100%;
+						margin-bottom: 32rpx;
+						font-size: 24rpx;
+						.step_content {
+							font-size: 28rpx;
+							line-height: $uni-line-height-base;
+							margin-bottom: 16rpx;
+						}
+						
+						.step_date {
+							margin-bottom: 8rpx;
+						}
+					}
+					&:last-child {
+						.step_circle_item {
+							.line {
+								display: none;
+							}
+						}
+					}
+				}
+			}
+			.submit {
+				margin: 0 32rpx 16rpx;
+			}
 		}
 		}
 	}
 	}
 </style>
 </style>

+ 34 - 9
pages/feedback/index.vue

@@ -26,6 +26,11 @@
 			<image class="add-icon" src="/static/image/add-icon.svg" mode="aspectFit"></image>
 			<image class="add-icon" src="/static/image/add-icon.svg" mode="aspectFit"></image>
 			<view class="add-title">登记</view>
 			<view class="add-title">登记</view>
 		</view>
 		</view>
+		<!-- 脚注 -->
+		<view class="footnote_content">
+			<view>本服务由重庆两江新区社会发展局提供</view>
+			<view class="footnote_phone">服务咨询热线:<view class="phone_text" @click="makeCall">023-67685085</view></view>
+		</view>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -167,6 +172,10 @@
 		getList();
 		getList();
 	}
 	}
 	
 	
+	const makeCall = ()=> {
+		window.location.href = 'tel:023-67685085';
+	}
+	
 	const onClick = (e)=> {
 	const onClick = (e)=> {
 		link.goBJDetails(e.id)
 		link.goBJDetails(e.id)
 	}
 	}
@@ -192,7 +201,7 @@
   display: flex;
   display: flex;
   background-color: #f2f2f2;
   background-color: #f2f2f2;
   flex-direction: column;
   flex-direction: column;
-  height: calc(100vh - 120rpx);
+  height: calc(100vh - 84rpx);
   position: relative;
   position: relative;
 
 
   .scroll-view {
   .scroll-view {
@@ -211,7 +220,7 @@
     line-height: 88rpx;
     line-height: 88rpx;
     text-align: center;
     text-align: center;
     font-size: 24rpx;
     font-size: 24rpx;
-    font-weight: 350;
+    font-weight: 400;
     position: relative; /* 添加相对定位 */
     position: relative; /* 添加相对定位 */
     box-sizing: border-box; /* 确保边框在总宽度内计算 */
     box-sizing: border-box; /* 确保边框在总宽度内计算 */
 
 
@@ -229,13 +238,13 @@
     }
     }
 
 
     &.activite {
     &.activite {
-      color: #1E92F0;
-
-      &::after {
-        background: #1E92F0;
-        height: 4rpx;
-        width: 50%;
-      }
+		font-weight: 600;
+		color: #1E92F0;
+		&::after {
+			background: #1E92F0;
+			height: 4rpx;
+			width: 50%;
+		}
     }
     }
   }
   }
 
 
@@ -265,5 +274,21 @@
 		  font-weight: 600;
 		  font-weight: 600;
 	  }
 	  }
   }
   }
+  .footnote_content {
+	  background-color: #F6F7F8;
+	  @include flex-center;
+	  height: 136rpx;
+	  flex-direction: column;
+	  font-weight: 400;
+	  font-size: 24rpx;
+	  color: #B3B5B9;
+	  line-height: 40rpx;
+	  .footnote_phone {
+		display: flex;
+		.phone_text {
+			color: #1E92F0;
+		}
+	  }
+  }
 }
 }
 </style>
 </style>