处理冲突

pages/early_warning_list/early_warning_list.js

@@ -1,6 +1,7 @@
 // pages/early_warning_list/early_warning_list.js
 import http from '../../base/httputil'
 const app = getApp()
+
 Page({
 
   /**

pages/early_warning_list/early_warning_list.json

@@ -7,5 +7,4 @@
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "预警"
 
-  
 }

pages/early_warning_list/early_warning_list.wxml

@@ -29,4 +29,4 @@
     </view>
     </view>
 
-</view>
+</view>

pages/notice/notice_details.js

@@ -26,7 +26,6 @@ Page({
         noticeTime: details.createTime,
         noticeContent: details.noticeContent
       })
-  
   },
 
   /**