Merge branch 'hotfix/member_lock' into dev

master
yulingwei 5 years ago
commit 65552a6dae

@ -837,8 +837,8 @@ class MemberController extends ThinkController
*/ */
public function lock_status($id="", $lock_status, $accounts = "") public function lock_status($id="", $lock_status, $accounts = "")
{ {
if ($accounts) $map['account'] = ['in', array_unique(explode(',', $accounts))]; if ($accounts) $map['account'] = ['in', array_unique(explode("\n", $accounts))];
if ($id) $map['id'] = ['in', array_unique(explode(',', $id))]; if ($id) $map['id'] = ['in', array_unique(explode("\n", $id))];
$users = M('user', 'tab_')->where($map)->field('id')->select(); $users = M('user', 'tab_')->where($map)->field('id')->select();
$res = M('user', 'tab_')->where($map)->setField(['lock_status' => $lock_status]); $res = M('user', 'tab_')->where($map)->setField(['lock_status' => $lock_status]);
if ($res) { if ($res) {

@ -501,7 +501,7 @@ $(function(){
function shenhe(status){ function shenhe(status){
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
return $(elem).val(); return $(elem).val();
}).get().join(','); }).get().join("\n");
var desc = ''; var desc = '';
if (status == 0) { if (status == 0) {
desc = '锁定'; desc = '锁定';
@ -511,8 +511,8 @@ $(function(){
layer.prompt({ layer.prompt({
formType: 2, formType: 2,
value: text, value: text,
placeholder : '玩家账号(英文逗号隔开', placeholder : '玩家账号(一个账号一行',
title: '请输入要'+desc+'的玩家账号(英文逗号隔开)', title: '请输入要'+desc+'的玩家账号(一个账号一行)',
area: ['800px', '350px'] //自定义文本域宽高 area: ['800px', '350px'] //自定义文本域宽高
}, function(value, index, elem){ }, function(value, index, elem){
if(value=='') { if(value=='') {

Loading…
Cancel
Save