Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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) {

Application/Admin/View/DeductBindRecord/deductBindBalance.html

@@ -69,7 +69,7 @@
                 <tr>
                     <td class="l">账户余额：</td>
                     <td class="r">
-                        <span class="balance">0.00</span>平台币
+                        <span class="balance">0.00</span>绑定币
                     </td>
                 </tr>
                 <tr>

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=='') {

Application/Media/View/default/Index/hezuo.html

@@ -76,7 +76,6 @@
     <a class="side_tabbar" style="z-index: 1" href="http://wpa.qq.com/msgrd?v=3&amp;uin={:C('PC_SET_SERVER_QQ')}&amp;site=qq&amp;menu=yes" target="_blank">
         <img src="__IMG__/index_about/qrcode.png" alt="">
     </a>
-
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
     <script src="__JS__/collaborate.js" type="text/javascript"></script>
     <!-- WPA start -->