From 1b62e2c4e3c89672b2ee3117b9677a4050fdce08 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sun, 21 May 2017 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=AE=A1=E7=90=86=E7=BC=96=E8=BE=91=E6=97=B6=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E7=9A=84BUG=20=E7=A7=BB=E9=99=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84console.log=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=A7=86=E5=9B=BE=E4=B8=AD=E7=9A=84=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/wechat/Autoreply.php | 1 +
 application/admin/view/user/user/add.phtml        | 2 +-
 application/admin/view/user/user/edit.phtml       | 2 +-
 application/admin/view/wechat/autoreply/edit.html | 2 +-
 public/assets/js/backend/general/attachment.js    | 1 -
 public/assets/js/backend/general/profile.js       | 1 -
 public/assets/js/bootstrap-table-commonsearch.js  | 2 --
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/application/admin/controller/wechat/Autoreply.php b/application/admin/controller/wechat/Autoreply.php
index 2b62300f..fe1977cb 100644
--- a/application/admin/controller/wechat/Autoreply.php
+++ b/application/admin/controller/wechat/Autoreply.php
@@ -43,6 +43,7 @@ class Autoreply extends Backend
         $response = WechatResponse::get(['eventkey' => $row['eventkey']]);
         $this->view->assign("response", $response);
         $this->view->assign("row", $row);
+        return $this->view->fetch();
     }
 
 }
diff --git a/application/admin/view/user/user/add.phtml b/application/admin/view/user/user/add.phtml
index 3bee637f..bed7c2e4 100644
--- a/application/admin/view/user/user/add.phtml
+++ b/application/admin/view/user/user/add.phtml
@@ -179,7 +179,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_status();}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
     </div>
     <div class="form-group hide layer-footer">
diff --git a/application/admin/view/user/user/edit.phtml b/application/admin/view/user/user/edit.phtml
index ba7e8913..77349e9f 100644
--- a/application/admin/view/user/user/edit.phtml
+++ b/application/admin/view/user/user/edit.phtml
@@ -174,7 +174,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_status(NULL, $row['status']);}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
     <div class="form-group hide layer-footer">
diff --git a/application/admin/view/wechat/autoreply/edit.html b/application/admin/view/wechat/autoreply/edit.html
index a2a57202..e7b4d55e 100644
--- a/application/admin/view/wechat/autoreply/edit.html
+++ b/application/admin/view/wechat/autoreply/edit.html
@@ -44,7 +44,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2"><?= __('Status') ?>:</label>
         <div class="col-xs-12 col-sm-8">
-            <?= build_status(NULL, $row['status']); ?>
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
     <div class="form-group hide layer-footer">
diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js
index 70c64d25..2e683f8b 100644
--- a/public/assets/js/backend/general/attachment.js
+++ b/public/assets/js/backend/general/attachment.js
@@ -54,7 +54,6 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
             },
             formatter: {
                 thumb: function (value, row, index) {
-                    //console.log(row);
                     if (row.mimetype.indexOf("image") > -1) {
                         var reg = /ajax\/upload$/;
                         if (reg.test(Config.upload.uploadurl)) {
diff --git a/public/assets/js/backend/general/profile.js b/public/assets/js/backend/general/profile.js
index 7889f361..24ecce17 100755
--- a/public/assets/js/backend/general/profile.js
+++ b/public/assets/js/backend/general/profile.js
@@ -47,7 +47,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
                 var url = Config.upload.cdnurl + response.url;
                 $(".profile-user-img").prop("src", url);
             };
-            console.log(Upload);
         }
     };
     return Controller;
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 95705791..4e9672ed 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -138,7 +138,6 @@
     };
 
     var isSearchAvailble = function (that) {
-        console.log('isSearchAvailble');
         //只支持服务端搜索
         if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) {
             return false;
@@ -293,7 +292,6 @@
             return;
         }
         if (!firstLoad) {
-            console.log(122);
             var height = parseInt($(".bootstrap-table").height());
             height += 10;
             $("#" + this.options.idTable).bootstrapTable("resetView", {height: height});