diff --git a/application/admin/controller/wechat/Autoreply.php b/application/admin/controller/wechat/Autoreply.php index 2b62300..fe1977c 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 3bee637..bed7c2e 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 ba7e891..77349e9 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 a2a5720..e7b4d55 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 70c64d2..2e683f8 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 7889f36..24ecce1 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 9570579..4e9672e 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});