From 863712fa1a71ac06d0090cab6b520808b9520ddb Mon Sep 17 00:00:00 2001
From: mujinxia <1764373892@qq.com>
Date: Sat, 24 Feb 2024 18:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js             |  10 +-
 pages/news1/help.vue    | 383 +++++++++++++++++++++-------------------
 pages/news1/setting.vue |  29 ++-
 3 files changed, 228 insertions(+), 194 deletions(-)

diff --git a/api/user.js b/api/user.js
index 2934823..a81879d 100644
--- a/api/user.js
+++ b/api/user.js
@@ -6,10 +6,14 @@ const api = {
   assets: 'user/assets',
   bindMobile: 'user/bindMobile',
   personal: 'user/personal',
-  todoCounts: "order/todoCounts"
+  todoCounts: "order/todoCounts",
+  delUser: "user/delete",
 }
-
-// 当前登录的用户信息
+// 注销
+export const delUser = (param) => {
+  return request.post(api.delUser, param)
+}
+ // 当前登录的用户信息
 export const info = (param, option) => {
   const options = {
     isPrompt: true, //（默认 true 说明：本接口抛出的错误是否提示）
diff --git a/pages/news1/help.vue b/pages/news1/help.vue
index 363431d..c30d75a 100644
--- a/pages/news1/help.vue
+++ b/pages/news1/help.vue
@@ -2,17 +2,19 @@
 	<view class="help">
 		<view class="helpContent">
 			<view class="helpTitle">帮助中心</view>
-			<view class="helpItem" v-for="(item,index) in itemList" :key="index">
+			<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>
-					<image :src="item.img_url" class="titleIcon" mode="widthFix"></image>
+					<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>
+						<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.child" :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>
@@ -20,12 +22,12 @@
 		<view class="footer">
 			<view class="btn">
 				<button type="default" open-type="contact" class="infoBtn">
-					<image  :src="$picUrl+'/static/news1/n7.png'" mode="widthFix"></image>在线客服（9:00-22:00）
+					<image :src="$picUrl + '/static/news1/n7.png'" mode="widthFix"></image>在线客服（9:00-22:00）
 				</button>
 
 			</view>
 		</view>
-		<view class="dialog" v-if="dialog" @click="dialog=false">
+		<view class="dialog" v-if="dialog" @click="dialog = false">
 			<view class="content">
 				<rich-text :nodes="strings"></rich-text>
 			</view>
@@ -34,217 +36,230 @@
 </template>
 
 <script>
-	import * as help from '@/api/help'
-	export default {
-		data() {
-			return {
-				itemList: [],
-				strings: '',
-				dialog: false,
-			}
-		},
-		onShow() {
-			this.getHelpList()
+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)
+			})
 		},
-		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;
-						}
-
-					})
-					.finally(() => that.isLoading = false)
-			},
-			openContent(item) {
-				uni.navigateTo({
-					url:'/pages/news/rules/index?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 => {
+							item.childArr = [] 
+							item.childArr = item.child.slice(0, 9)
+						})
+					}
+
 				})
-				// this.strings = item.content
-				// this.dialog = true
-			},
-		}
+				.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;
-	}
+page {
+	min-height: 100%;
+	padding-bottom: 120upx;
+}
 
-	.help {
+.help {
 
-		height: 100%;
+	height: 100%;
 
-		.helpContent {
-			margin: 20upx;
-			background: #fff;
-			border-radius: 20upx;
-			overflow: hidden;
-			padding: 20upx;
-			padding-bottom: 160rpx;
+	.helpContent {
+		margin: 20upx;
+		background: #fff;
+		border-radius: 20upx;
+		overflow: hidden;
+		padding: 20upx;
+		padding-bottom: 160rpx;
 
-			.helpTitle {
-				font-size: 32upx;
-				color: #000000;
-				padding: 20upx 0;
-				font-weight: bold;
-				// border-bottom: 3upx solid #dfdbdb;
-			}
+		.helpTitle {
+			font-size: 32upx;
+			color: #000000;
+			padding: 20upx 0;
+			font-weight: bold;
+			// border-bottom: 3upx solid #dfdbdb;
+		}
+
+		.border {
+			border-bottom: 1px solid #dfdbdb;
+		}
+
+		.helpItem {
+			display: flex;
+			color: #333333;
+			font-size: 28upx;
+			min-height: 90rpx;
+			border-top: 1px solid #dfdbdb;
 
-			.helpItem {
+			.helpMain {
+				width: 180upx;
+				// height: 178upx;
+				min-height: 180rpx;
+				border-right: 1px solid #dfdbdb;
+				flex-shrink: 0;
 				display: flex;
-				color: #333333;
-				font-size: 28upx;
-				border-top: 1px solid #dfdbdb;
-
-				.helpMain {
-					width: 180upx;
-					height: 180upx;
-					border-right: 1px solid #dfdbdb;
-					flex-shrink: 0;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-					position: relative;
-
-					.titleIcon {
-						width: 50upx;
-						height: auto;
-					}
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+				position: relative;
+				border-bottom: 1px solid #dfdbdb;
+
+				.titleIcon {
+					width: 50upx;
+					height: auto;
+				}
 
-					.mainText {
-						margin-top: 8upx;
+				.mainText {
+					margin-top: 8upx;
 
-						text {
-							color: #333333;
-							font-size: 28upx;
-							margin-left: 5upx;
-						}
+					text {
+						color: #333333;
+						font-size: 28upx;
+						margin-left: 5upx;
 					}
+				}
 
-					.zhishi {
-						position: absolute;
-						right: -5px;
-						background: #fff;
-						top: 50%;
-						transform: translateY(-50%);
+				.zhishi {
+					position: absolute;
+					right: -5px;
+					background: #fff;
+					top: 50%;
+					transform: translateY(-50%);
 
-					}
 				}
+			}
 
-				.mainItem {
-					display: flex;
-					flex-wrap: wrap;
-					align-items: center;
-					width: calc(100% - 90px);
-
-					.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;
-					}
+			.mainItem {
+				display: flex;
+				flex-wrap: wrap;
+				// align-items: center;
+				width: calc(100% - 90px);
 
-					:first-child {
-						border-right: 1px solid #dfdbdb;
-					}
+				.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;
+				}
 
-					:nth-child(2n) {
-						border-left: 1px solid #dfdbdb;
-					}
+				// :first-child {
+				// 	border-right: 1px solid #dfdbdb;
+				// }
 
-					:last-child {
-						border-left: 1px solid #dfdbdb;
-					}
+				// :nth-child(2n) {
+				// 	border-left: 1px solid #dfdbdb;
+				// }
 
-					:nth-child(3) {
-						border-right: 1px solid #dfdbdb;
-					}
-				}
+				// :last-child {
+				// 	border-left: 1px solid #dfdbdb;
+				// }
+
+				// :nth-child(3) {
+				// 	border-right: 1px solid #dfdbdb;
+				// }
 			}
 		}
+	}
 
-		.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; 
+	.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;
+
+			image {
+				width: 54upx;
+				height: auto;
+			}
+
+			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 {
-					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;
-				}
+				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;
-
-		.content {
-			height: 60%;
-			width: 80%;
-			overflow: auto;
-		}
+.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;
 	}
-	
+}
 </style>
\ No newline at end of file
diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue
index de46b3d..81c165c 100644
--- a/pages/news1/setting.vue
+++ b/pages/news1/setting.vue
@@ -171,13 +171,28 @@ export default {
 				content: '',
 				success(o) {
 					if (o.confirm) {
-						uni.removeStorage('token');
-						uni.removeStorage('userInfo');
-						uni.clearStorageSync()
-						uni.clearStorage()
-						uni.reLaunch({
-							url: '/pages/login/index'
-						})
+						userApi.delUser({})
+							.then(res => {
+								if (res.status == 200) {
+									uni.showToast({
+										title: '注销成功',
+										icon: 'none',
+										duration: 2000
+									})
+									uni.removeStorage('token');
+									uni.removeStorage('userInfo');
+									uni.clearStorageSync()
+									uni.clearStorage() 
+									setTimeout(function () {
+										uni.reLaunch({
+											url: '/pages/login/index'
+										})
+									}, 2000);
+
+								}
+							})
+							.finally()
+
 					}
 				}
 			});