rabin hace 7 años
padre
commit
25d1925663
Se han modificado 4 ficheros con 51 adiciones y 7 borrados
  1. 14 5
      admin/page/farm.py
  2. 13 0
      admin/static/js/main.js
  3. 23 2
      front/api/login.py
  4. 1 0
      model/farm_user_wechat.py

+ 14 - 5
admin/page/farm.py

@@ -136,11 +136,11 @@ class user_wechat_path(Load):
 			,width = '600'
 			,height = '400'
 			,add = False
-			#,edit = False
+			,edit = False
 			,search = (('label-1','cdate-time-start','cdate-time-end','farm_id-select-','uid-input-'), (u'日期范围',u'开始时间',u'截止时间','选择农场',u'用户id'))
-			,thead = (u'所属农场', u'微信昵称', u'微信openid', u'更新时间')
-			,tbody = ('farm','nickname','openid', 'cdate')
-			,state = True
+			,thead = (u'所属农场', u'微信昵称', u'微信openid', u'更新时间', u'封禁')
+			,tbody = ('farm','nickname','openid', 'cdate', 'ban')
+			#,state = True
 		)
 
 		self.data['common']['search_farm_id-select-'] = Demeter.config['setting']['farmList']
@@ -150,6 +150,11 @@ class user_wechat_path(Load):
 			for key, value in enumerate(self.data['list']):
 				farm = self.service('common').one('farm', id=value['farm_id'])
 				self.data['list'][key]['farm'] = farm['name']
+
+				if value['status'] == True:
+					self.data['list'][key]['ban'] = '<a href="javascript:;" alt="点此恢复" onclick="oper(this,\''+value['id']+'\', \'/farm/user_wechat_update\', \'False\')">已封禁</a>'
+				else:
+					self.data['list'][key]['ban'] = '<a href="javascript:;" alt="点此封禁" onclick="oper(this,\''+value['id']+'\', \'/farm/user_wechat_update\', \'True\')">封禁</a>'
 		self.commonView('list')
 
 class user_wechat_update_path(Load):
@@ -171,4 +176,8 @@ class user_wechat_update_path(Load):
 	@Web.auth
 	@Web.setting
 	def delete(self):
-		self.commonDelete('farm_user_wechat')
+		id = self.input('id')
+		update = {}
+		update['status'] = self.input('status', True)
+		self.service('common').update('farm_user_wechat', id, update)
+		#self.commonDelete('farm_user_wechat')

+ 13 - 0
admin/static/js/main.js

@@ -119,6 +119,19 @@ function notice(msg) {
 function show(title, url, w, h, full) {
     x_admin_show(title, url, w, h, full)
 }
+
+function oper(obj, id, url, status) {
+    layer.confirm('确认要进行此项操作吗?',function(index){
+    	data = {}
+    	data.id = id
+    	data.status = status
+       	request('delete', url, data, function(msg)
+        {
+        	location.reload();
+        })
+    });
+}
+
 function del(obj, id, url) {
     layer.confirm('确认要删除吗?',function(index){
     	data = {}

+ 23 - 2
front/api/login.py

@@ -43,7 +43,11 @@ class login_path(Load):
 					else:
 						#self.set_secure_cookie('user', str(user['id']))
 						#self.redirect('/')
-						self.out('yes', {'uid':user['id']})
+						if state['status']:
+							state['status'] = 1
+						else:
+							state['status'] = 2
+						self.out('yes', {'uid':user['id'], 'wid':state['id'], 'status': state['status']})
 					return
 		else:
 			self.out('手机号或密码错误,登录失败')
@@ -75,4 +79,21 @@ class login_path(Load):
 			update['session_key'] = data['session_key']
 			update['uid'] = uid
 			self.service('common').update('farm_user_wechat', False, update)
-		return True
+			wechat = self.service('common').one('farm_user_wechat', uid=uid, openid=data['openid'])
+		return wechat
+
+class check_path(Load):
+	@Web.setting
+	def get(self):
+		wid = self.input('wid')
+		uid = self.input('uid')
+		if wid and uid:
+			wechat = self.service('common').one('farm_user_wechat', wid=wid)
+			if wechat:
+				if wechat['status']:
+					wechat['status'] = 1
+				else:
+					wechat['status'] = 2
+				self.out('yes', {'uid':uid, 'wid':wid, 'status': wechat['status']})
+			else:
+				self.out('yes', {'uid':uid, 'wid':wid, 'status': 3})

+ 1 - 0
model/farm_user_wechat.py

@@ -16,5 +16,6 @@ class Farm_user_wechat(Model):
 	uid = Fields(type='uuid', comment='用户id')
 	openid = Fields(type='varchar(50)', comment='wx openid')
 	session_key = Fields(type='varchar(50)', comment='session_key')
+	status = Fields(type='boolean', default='False', comment='封禁状态true为封禁false为非封禁')
 	state = Fields(type='boolean', default='True', comment='数据存在状态')
 	cdate = Fields(type='int', default='time', comment='创建时间')