From 5cd0f3d3c4b63b9bddd8dedbedcef8374409fcf6 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 1 Mar 2024 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9=E5=8F=8A?=
 =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83ui=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news1/help.vue | 380 ++++++++++++++++++++++---------------------
 pages/user/index.vue |   2 +-
 2 files changed, 193 insertions(+), 189 deletions(-)

diff --git a/pages/news1/help.vue b/pages/news1/help.vue
index c30d75a..5f919d5 100644
--- a/pages/news1/help.vue
+++ b/pages/news1/help.vue
@@ -5,16 +5,15 @@
 			<view class="helpItem" :class="((index == itemList.length - 1) && item.child.length == 0) ? 'border' : ''"
 				v-for="(item, index) in itemList" :key="index">
 				<view class="helpMain" @click="goListPage(item)">
-					<u-icon name="arrow-left" class="zhishi" color="#dfdbdb" size="28"></u-icon>
 					<u-icon name="question-circle"></u-icon>
-					<!-- <image :src="item.img_url" class="titleIcon" mode="widthFix"></image> -->
 					<view class="mainText">
 						<text>{{ item.name }}</text>
 						<u-icon name="arrow-right" v-if="item.name != ''" color="#8B8B8B" size="22"></u-icon>
 					</view>
 				</view>
 				<view class="mainItem">
-					<view class="itemText" v-for="(p, i) in item.childArr" :key="i" @click="openContent(p)">{{ p.title }}
+					<view class="itemText" v-for="(p, i) in item.childArr" :key="i" @click="openContent(p)">
+						{{ p.title }}
 					</view>
 				</view>
 			</view>
@@ -36,230 +35,235 @@
 </template>
 
 <script>
-import * as help from '@/api/help'
-export default {
-	data() {
-		return {
-			itemList: [],
-			strings: '',
-			dialog: false,
-		}
-	},
-	onShow() {
-		this.getHelpList()
-	},
-	methods: {
-		goListPage(item) {
-			uni.navigateTo({
-				url: '/pages/news/rules/rulesList?itemInfo=' + JSON.stringify(item)
-			})
+	import * as help from '@/api/help'
+	export default {
+		data() {
+			return {
+				itemList: [],
+				strings: '',
+				dialog: false,
+			}
 		},
-		getHelpList() {
-			const that = this
-			help.helpList()
-				.then(res => {
-					if (res.status == 200) {
-						that.itemList = res.data.list;
-						that.itemList.map(item => {
-							item.childArr = [] 
-							item.childArr = item.child.slice(0, 9)
-						})
-					}
+		onShow() {
+			this.getHelpList()
+		},
+		methods: {
+			goListPage(item) {
+				uni.navigateTo({
+					url: '/pages/news/rules/rulesList?itemInfo=' + JSON.stringify(item)
+				})
+			},
+			getHelpList() {
+				const that = this
+				help.helpList()
+					.then(res => {
+						if (res.status == 200) {
+							that.itemList = res.data.list;
+							that.itemList.map(item => {
+								if (item.child.length > 0) {
+									if (parseInt(item.child.length % 4) == 1) {
+										item.child.push({}, {}, {})
+									}
+									if (parseInt(item.child.length % 4) == 2) {
+										item.child.push({}, {})
+									}
+									if (parseInt(item.child.length % 4) == 3) {
+										item.child.push({})
+									}
+								}
+								item.childArr = []
+								item.childArr = item.child.slice(0, 9)
+							})
+						}
 
+					})
+					.finally(() => that.isLoading = false)
+			},
+			openContent(item) {
+				uni.navigateTo({
+					url: '/pages/news/rules/index?itemInfo=' + JSON.stringify(item)
 				})
-				.finally(() => that.isLoading = false)
-		},
-		openContent(item) {
-			uni.navigateTo({
-				url: '/pages/news/rules/index?itemInfo=' + JSON.stringify(item)
-			})
-		},
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-page {
-	min-height: 100%;
-	padding-bottom: 120upx;
-}
-
-.help {
-
-	height: 100%;
+	page {
+		min-height: 100%;
+		padding-bottom: 120upx;
+	}
 
-	.helpContent {
-		margin: 20upx;
-		background: #fff;
-		border-radius: 20upx;
-		overflow: hidden;
-		padding: 20upx;
-		padding-bottom: 160rpx;
+	.help {
 
-		.helpTitle {
-			font-size: 32upx;
-			color: #000000;
-			padding: 20upx 0;
-			font-weight: bold;
-			// border-bottom: 3upx solid #dfdbdb;
-		}
+		height: 100%;
 
-		.border {
-			border-bottom: 1px solid #dfdbdb;
-		}
+		.helpContent {
+			margin: 20upx;
+			background: #fff;
+			border-radius: 20upx;
+			overflow: hidden;
+			padding: 20upx;
+			padding-bottom: 160rpx;
 
-		.helpItem {
-			display: flex;
-			color: #333333;
-			font-size: 28upx;
-			min-height: 90rpx;
-			border-top: 1px solid #dfdbdb;
+			.helpTitle {
+				font-size: 32upx;
+				color: #000000;
+				padding: 20upx 0;
+				font-weight: bold;
+			}
 
-			.helpMain {
-				width: 180upx;
-				// height: 178upx;
-				min-height: 180rpx;
-				border-right: 1px solid #dfdbdb;
-				flex-shrink: 0;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				position: relative;
+			.border {
 				border-bottom: 1px solid #dfdbdb;
+			}
 
-				.titleIcon {
-					width: 50upx;
-					height: auto;
-				}
+			.helpItem {
+				display: flex;
+				color: #333333;
+				font-size: 28upx;
+				min-height: 220rpx;
+				border-top: 1px solid #dfdbdb;
 
-				.mainText {
-					margin-top: 8upx;
+				.helpMain {
+					width: 180upx;
+					// height: 178upx;
+					min-height: 180rpx;
+					border-right: 1px solid #dfdbdb;
+					flex-shrink: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					position: relative;
 
-					text {
-						color: #333333;
-						font-size: 28upx;
-						margin-left: 5upx;
+					.titleIcon {
+						width: 50upx;
+						height: auto;
 					}
-				}
 
-				.zhishi {
-					position: absolute;
-					right: -5px;
-					background: #fff;
-					top: 50%;
-					transform: translateY(-50%);
+					.mainText {
+						margin-top: 8upx;
 
-				}
-			}
+						text {
+							color: #333333;
+							font-size: 28upx;
+							margin-left: 5upx;
+						}
+					}
 
-			.mainItem {
-				display: flex;
-				flex-wrap: wrap;
-				// align-items: center;
-				width: calc(100% - 90px);
+					.zhishi {
+						position: absolute;
+						right: -5px;
+						background: #fff;
+						top: 50%;
+						transform: translateY(-50%);
 
-				.itemText {
-					width: 50%;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					text-align: center;
-					// padding: 24upx 16upx;
-					height: 90upx;
-					line-height: 90upx;
-					padding: 0 10upx;
-					border-bottom: 1px solid #dfdbdb;
-					border-left: 1px solid #dfdbdb;
+					}
 				}
 
-				// :first-child {
-				// 	border-right: 1px solid #dfdbdb;
-				// }
-
-				// :nth-child(2n) {
-				// 	border-left: 1px solid #dfdbdb;
-				// }
+				.mainItem {
+					display: flex;
+					flex-wrap: wrap;
+					width: calc(100% - 90px);
+					margin: 20rpx 20rpx 20rpx 40rpx;
 
-				// :last-child {
-				// 	border-left: 1px solid #dfdbdb;
-				// }
-
-				// :nth-child(3) {
-				// 	border-right: 1px solid #dfdbdb;
-				// }
-			}
-		}
-	}
+					.itemText {
+						width: 50%;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						text-align: center;
+						height: 90upx;
+						line-height: 90upx;
+						padding: 0 10upx;
+						border-top: 1px solid #dfdbdb;
+						border-left: 1px solid #dfdbdb;
+					}
 
-	.footer {
-		position: fixed;
-		z-index: 9;
-		bottom: 0;
-		width: 100%;
-		background-color: #fff;
-		padding: 30rpx;
+					.itemText:nth-child(odd) {
+						border-left: none;
+					}
 
-		.btn {
-			height: 100upx;
-			background: #FE6048;
-			border-radius: 28px 28px 28px 28px;
-			opacity: 1;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+					.itemText:nth-child(1) {
+						border-top: 0;
+						padding-right: 1px;
+					}
 
-			image {
-				width: 54upx;
-				height: auto;
+					.itemText:nth-child(2) {
+						border-top: 0;
+					}
+				}
 			}
+		}
 
-			text {
-				font-size: 28upx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 600;
-				color: #FFFFFF;
-				margin-left: 100upx;
+		.footer {
+			position: fixed;
+			z-index: 9;
+			bottom: 0;
+			width: 100%;
+			background-color: #fff;
+			padding: 30rpx;
 
-			}
+			.btn {
+				height: 100upx;
+				background: #FE6048;
+				border-radius: 28px 28px 28px 28px;
+				opacity: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 
-			.infoBtn {
 				image {
 					width: 54upx;
 					height: auto;
-					margin-right: 100rpx;
 				}
 
-				text-align: center;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100%;
-				height: 100%;
-				background: #FE6048;
-				border-radius: 28px 28px 28px 28px;
-				color: #FFFFFF;
+				text {
+					font-size: 28upx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 600;
+					color: #FFFFFF;
+					margin-left: 100upx;
+
+				}
+
+				.infoBtn {
+					image {
+						width: 54upx;
+						height: auto;
+						margin-right: 100rpx;
+					}
+
+					text-align: center;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 100%;
+					height: 100%;
+					background: #FE6048;
+					border-radius: 28px 28px 28px 28px;
+					color: #FFFFFF;
+				}
 			}
 		}
 	}
-}
 
-.dialog {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background: rgba(0, 0, 0, 0.8);
-	color: #fff;
+	.dialog {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: rgba(0, 0, 0, 0.8);
+		color: #fff;
 
-	.content {
-		height: 60%;
-		width: 80%;
-		overflow: auto;
+		.content {
+			height: 60%;
+			width: 80%;
+			overflow: auto;
+		}
 	}
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index bf29f68..c309505 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -269,7 +269,7 @@
 						<view class="text-group_21">
 							<text class="text_71"
 								v-if="orderTodoInfo.recovery_order.already_number">{{orderTodoInfo.recovery_order.already_number>=100?"99+":orderTodoInfo.recovery_order.already_number}}</text>
-							<text class="text_81">{{userInfo.user_type == 40?'已验收':'已完成'}}</text>
+							<text class="text_81">已验收</text>
 						</view>
 					</view>
 					<view class="image-text_21" @click="toRecovery(3)">