提交

pages/pest/index.vue

@@ -6,7 +6,7 @@
 			<ui-tabs :list="tabs" :active="params.code" @clickTab="clickPestTab"></ui-tabs>
 		</ui-sticky>
 		<!-- 病虫害百科列表 -->
-		<view class="page-panel pest-panel">
+		<view class="page-panel pest-panel" v-if="pestList.length>0">
 			<block v-for="(item,index) in pestList" :key="index">
 				<view class="pest-item" @click="openPestsInfo(item)">
 					<image class="pic" mode="aspectFill" :src="item.img_urls"></image>
@@ -15,7 +15,9 @@
 					</view>
 				</view>
 			</block>
-			<ui-empty v-if="pestList.length==0"></ui-empty>
+		</view>
+		<view class="page-panel" v-if="pestList.length==0">
+			<ui-empty></ui-empty>
 		</view>
 	</view>
 </template>

pages/warn/index.vue

@@ -17,12 +17,10 @@
 			</view>
 			<!-- 气象，墒情 预警 -->
 			<view class="ui-card warn-item" v-if="warnTab==2 ||warnTab==3">
-				<view class="ui-card warn-item">
-					<view class="title">{{item.ekey}}</view>
-					<view class="subtitle">设备ID：{{item.device_id}}</view>
-					<view class="paragraph">{{item.warning_content}}</view>
-					<text class="time">{{item.upltime | timeFrom}}</text>
-				</view>
+				<view class="title">{{item.ekey}}</view>
+				<view class="subtitle">设备ID：{{item.device_id}}</view>
+				<view class="paragraph">{{item.warning_content}}</view>
+				<text class="time">{{item.upltime | timeFrom}}</text>
 			</view>
 		</block>
 		<ui-empty v-if="warningList.length==0" text="暂无预警信息"></ui-empty>
@@ -82,16 +80,16 @@
 			},
 			// 获取预警列表
 			async getWarningList() {
-				let  params={};
-				if(this.warnTab==2 || this.warnTab==3){
-					params.device_type = this.warnTab ==2 ? 5 : 8;
+				let params = {};
+				if (this.warnTab == 2 || this.warnTab == 3) {
+					params.device_type = this.warnTab == 2 ? 5 : 8;
 				}
 				const handleList = {
 					1: getPestWarningList, // 丛海
 					2: getWeatherWarningList, // 气象
 					3: getWeatherWarningList, // 墒情
 				}
-				
+
 				const {
 					data,
 					nusm