mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复微信自动管理编辑时空白的BUG 

移除代码中的console.log
修复部分视图中的调用错误
pull/323483/MERGE
Karson 2017-05-21 18:37:37 +08:00
parent 103e3902e4
commit 1b62e2c4e3
7 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/controller/wechat/Autoreply.php
View File

@ -43,6 +43,7 @@ class Autoreply extends Backend
$response = WechatResponse::get(['eventkey' => $row['eventkey']]); $response = WechatResponse::get(['eventkey' => $row['eventkey']]);
$this->view->assign("response", $response); $this->view->assign("response", $response);
$this->view->assign("row", $row); $this->view->assign("row", $row);
return $this->view->fetch();
} }
} }

2
application/admin/view/user/user/add.phtml
View File

@ -179,7 +179,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
{:build_status();} {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
</div> </div>
</div> </div>
<div class="form-group hide layer-footer"> <div class="form-group hide layer-footer">

2
application/admin/view/user/user/edit.phtml
View File

@ -174,7 +174,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8"> <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> </div>
<div class="form-group hide layer-footer"> <div class="form-group hide layer-footer">

2
application/admin/view/wechat/autoreply/edit.html
View File

@ -44,7 +44,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?= __('Status') ?>:</label> <label class="control-label col-xs-12 col-sm-2"><?= __('Status') ?>:</label>
<div class="col-xs-12 col-sm-8"> <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> </div>
<div class="form-group hide layer-footer"> <div class="form-group hide layer-footer">

1
public/assets/js/backend/general/attachment.js
View File

@ -54,7 +54,6 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
}, },
formatter: { formatter: {
thumb: function (value, row, index) { thumb: function (value, row, index) {
//console.log(row);
if (row.mimetype.indexOf("image") > -1) { if (row.mimetype.indexOf("image") > -1) {
var reg = /ajax\/upload$/; var reg = /ajax\/upload$/;
if (reg.test(Config.upload.uploadurl)) { if (reg.test(Config.upload.uploadurl)) {

1
public/assets/js/backend/general/profile.js
View File

@ -47,7 +47,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
var url = Config.upload.cdnurl + response.url; var url = Config.upload.cdnurl + response.url;
$(".profile-user-img").prop("src", url); $(".profile-user-img").prop("src", url);
}; };
console.log(Upload);
} }
}; };
return Controller; return Controller;

2
public/assets/js/bootstrap-table-commonsearch.js
View File

@ -138,7 +138,6 @@
}; };
var isSearchAvailble = function (that) { var isSearchAvailble = function (that) {
console.log('isSearchAvailble');
//只支持服务端搜索 //只支持服务端搜索
if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) { if (!that.options.commonSearch || that.options.sidePagination != 'server' || !that.options.url) {
return false; return false;
@ -293,7 +292,6 @@
return; return;
} }
if (!firstLoad) { if (!firstLoad) {
console.log(122);
var height = parseInt($(".bootstrap-table").height()); var height = parseInt($(".bootstrap-table").height());
height += 10; height += 10;
$("#" + this.options.idTable).bootstrapTable("resetView", {height: height}); $("#" + this.options.idTable).bootstrapTable("resetView", {height: height});