优化

pages/index/index.vue

@@ -276,7 +276,7 @@
 					</view>
 				</view>
 				<!-- 最新公告 -->
-				<view class="announcement" v-if="gongao.length != 0">
+				<!-- <view class="announcement" v-if="gongao.length != 0">
 					<view class="announcementbox">
 						<view class="anount">最新公告</view>
 						<view class="anounts flex align-center" v-if="gongao.length > 0">
@@ -287,8 +287,8 @@
 							</view>
 						</view>
 					</view>
-				</view>
-				<view v-if="gridlist.length != 0">
+				</view> -->
+				<!-- <view v-if="gridlist.length != 0">
 					<u-grid :col="4" :border="false">
 						<u-grid-item bg-color="#f2f2f7">
 							<view v-for="(item, index) in gridlist" :key="index" style="text-align: center;"
@@ -300,7 +300,7 @@
 						</u-grid-item>
 
 					</u-grid>
-				</view>
+				</view> -->
 
 				<!-- 筛选 -->
 				<!-- :style="{ paddingTop: (12 + statusBarHeight) + 'px !important' }" -->

pages/msg/index.vue

@@ -3,14 +3,14 @@
 		<!-- 顶部导航栏 -->
 		<view class="nav-header">
 			<view class="nav-left" @click="goSearch">
-				<u-icon name="search" color="rgba(56, 58, 63, 1)" size="32"></u-icon>
+				<u-icon name="search" color="rgba(56, 58, 63, 1)" size="40"></u-icon>
 			</view>
 			<view class="nav-center">
 				<text class="nav-title">消息</text>
 			</view>
 			<view class="nav-right">
-				<u-icon name="bell" color="rgba(56, 58, 63, 1)" size="32" style="margin-right: 20rpx;"></u-icon>
-				<u-icon name="setting" color="rgba(56, 58, 63, 1)" size="32" @click="showSettingsModal"></u-icon>
+				<u-icon name="bell" color="rgba(56, 58, 63, 1)" size="40" style="margin-right: 20rpx;"></u-icon>
+				<u-icon name="setting" color="rgba(56, 58, 63, 1)" size="40" @click="showSettingsModal"></u-icon>
 			</view>
 		</view>
 		
@@ -66,17 +66,19 @@
 						<u-image shape="circle" width='80rpx' height="80rpx" :src="item.avatar"></u-image>
 						<!-- <view class="online-dot"></view> -->
 					</view>
-					<view class="flex-sub margin-left-sm">
+					<view class="flex-sub margin-left-sm" style="overflow: hidden;">
 						<view class="flex justify-between align-center">
-							<view class="text-white flex align-center userNameleng">
-								<view class="text-white" style="font-size: 28rpx;">
+							<view class="text-white flex align-center" style="flex: 1;overflow: hidden;">
+								<view class="text-white" style="font-size: 30rpx;">
 									{{item.userName}}
 								</view>
-								<text class="text-grey"
-									style="font-size: 22rpx;margin-left: 10rpx;"><text v-if="item.companyName">{{item.companyName}} |</text> {{item.stationName}}
+								<text class="text-grey userNameleng" style="font-size: 26rpx;margin-left: 10rpx;">
+									<text v-if="item.companyName">{{item.companyName}} |</text> 
+									{{item.stationName}}{{item.stationName}}{{item.stationName}}
 								</text>
 							</view>
-							<view class="text-grey">{{item.messageTime?getMonthOrDay(item.messageTime):''}}</view>
+							<view class="text-grey" style="flex-shrink: 0;margin-left: 10rpx;">
+							{{item.messageTime?getMonthOrDay(item.messageTime):''}}</view>
 						</view>
 						<view class="flex justify-between" style="margin-top: 10rpx;">
 							<view class="text-grey" v-if="item.messageType == 1||item.messageType == 10">{{item.content}}</view>
@@ -592,7 +594,8 @@
 		}
 
 		.userNameleng {
-			width: 80%;
+			// width: 80%;
+			flex: 1;
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;

pages/my/index.vue

@@ -781,7 +781,7 @@
 				<view class="report-btn" @click="showReportModal = false">确认</view>
 			</view>
 		</u-popup>
-		<u-popup v-model="showNotice" mode="center">
+		<u-popup v-model="showNotice" mode="center" :mask-close-able="false">
 			<view class="flex flex-direction" style="background-color: rgba(0, 0, 0, 0.6);height: 85vh;">
 				<view class="pop-image" v-if="userType == 1">
 					<image src="/static/images/hxr.jpg"></image>
@@ -914,7 +914,7 @@ export default {
 			if(this.userType){
 				this.showNotice = true;
 			}
-		},1500)
+		},1000)
 	},
 	onUnload() {
 		uni.$off('changeRole')