edit

front/api/farm.py

@@ -118,7 +118,7 @@ class msg_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('msg', state=True, page=True)
+		self.data['list'] = self.service('common').list('msg', search={'farm_id':self.data['setting']['farm']}, page=True, order='status asc, cdate desc')
 		for key, value in enumerate(self.data['list']):
 			self.data['list'][key]['cdates'] = Demeter.date(value['cdate'])
 			type_info = self.service('common').one('msg_type', id=value['type_id'])

front/api/main.py

@@ -39,5 +39,8 @@ class index_path(Load):
 		self.data['farm'] = self.service('common').one('farm', id=Demeter.config['setting']['farm'])
 
 		# 获取消息数量
-		self.data['msg'] = len(self.service('common').list('msg', search={'farm_id': Demeter.config['setting']['farm'], 'status': False}))
+		self.data['setting']['msg'] = len(self.service('common').list('msg', search={'status':False, "farm_id":self.data['setting']['farm']}, limit='0,100'))
+		if self.data['setting']['msg'] > 99:
+			self.data['setting']['msg'] = str(99) + '+'
+
 		self.out('yes', self.data)