From f3baedb948b03254ba9a19b982241b5de6d46393 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 10:10:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Media/View/default/Index/hezuo.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/Application/Media/View/default/Index/hezuo.html b/Application/Media/View/default/Index/hezuo.html
index 58045ff5c..c357556ae 100644
--- a/Application/Media/View/default/Index/hezuo.html
+++ b/Application/Media/View/default/Index/hezuo.html
@@ -76,7 +76,6 @@
-
From 34d424887d01d7f0397c44598f816747ecbf8bb7 Mon Sep 17 00:00:00 2001
From: zhengyongxing
Date: Thu, 28 Nov 2019 10:24:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/DeductBindRecord/deductBindBalance.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Admin/View/DeductBindRecord/deductBindBalance.html b/Application/Admin/View/DeductBindRecord/deductBindBalance.html
index c6a001e74..01a6956bb 100644
--- a/Application/Admin/View/DeductBindRecord/deductBindBalance.html
+++ b/Application/Admin/View/DeductBindRecord/deductBindBalance.html
@@ -69,7 +69,7 @@
账户余额: |
- 0.00平台币
+ 0.00绑定币
|
From 7a767466ef2a6ed08f29149436d156e8c8a448a2 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Thu, 28 Nov 2019 10:36:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=81=E5=8F=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/MemberController.class.php | 4 ++--
Application/Admin/View/Member/user_info.html | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index fd7a178c4..afde5599c 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -837,8 +837,8 @@ class MemberController extends ThinkController
*/
public function lock_status($id="", $lock_status, $accounts = "")
{
- if ($accounts) $map['account'] = ['in', array_unique(explode(',', $accounts))];
- if ($id) $map['id'] = ['in', array_unique(explode(',', $id))];
+ if ($accounts) $map['account'] = ['in', array_unique(explode("\n", $accounts))];
+ if ($id) $map['id'] = ['in', array_unique(explode("\n", $id))];
$users = M('user', 'tab_')->where($map)->field('id')->select();
$res = M('user', 'tab_')->where($map)->setField(['lock_status' => $lock_status]);
if ($res) {
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index 1dfdca0d9..62cb6dc49 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -501,7 +501,7 @@ $(function(){
function shenhe(status){
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
return $(elem).val();
- }).get().join(',');
+ }).get().join("\n");
var desc = '';
if (status == 0) {
desc = '锁定';
@@ -511,8 +511,8 @@ $(function(){
layer.prompt({
formType: 2,
value: text,
- placeholder : '玩家账号(英文逗号隔开)',
- title: '请输入要'+desc+'的玩家账号(英文逗号隔开)',
+ placeholder : '玩家账号(一个账号一行)',
+ title: '请输入要'+desc+'的玩家账号(一个账号一行)',
area: ['800px', '350px'] //自定义文本域宽高
}, function(value, index, elem){
if(value=='') {