新增的功能

pages/mypage/mypage.vue

@@ -27,7 +27,6 @@
 			</view>
 			<view class="" style="display: flex;">
 			
-			
 			<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
 				<div @click="navigateToSubPage(index)">
 					<div class="funcIcon">
@@ -253,7 +252,6 @@
 		color: white;
 		background-color: #007afd;
 	}
-<<<<<<< HEAD
 	.xjxList{
 		display: flex;
 		flex-direction: column;
@@ -262,6 +260,3 @@
 		height: 20vh;
 	}
 </style>
-=======
-</style>
->>>>>>> 7aeb4aa5a071cd3d557c15ebc6cd5b0525da319b

pages/wtcl/detail/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view :style="{height:'100vh',overflow:'auto'}">
 		<u-status-bar></u-status-bar>
-		<u-navbar title="预警" :autoBack="true" :titleStyle="{
+		<u-navbar title="问题处理" :autoBack="true" :titleStyle="{
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>