blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-06 03:58:00 +08:00
Code Issues Projects Releases Wiki Activity

!11 回滚上次提交

Browse Source 
Merge pull request !11 from unset/master
This commit is contained in:
unset 2018-07-30 14:00:21 +08:00 committed by Zhao
commit 312f5980e5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/admin/controller/Fields.php
View File

@ -167,12 +167,7 @@ class Fields extends Base {
return $this->buildFailed(ReturnCode::EXCEPTION, 'JSON数据格式有误'); return $this->buildFailed(ReturnCode::EXCEPTION, 'JSON数据格式有误');
} }
AdminList::update(['returnStr' => json_encode($data)], ['hash' => $hash]); AdminList::update(['returnStr' => json_encode($data)], ['hash' => $hash]);
//如果json字符串中data不存在或者data内容为空,则不进行handle处理 $this->handle($data['data'], $dataArr);
if(!isset($data['data']) || sizeof($data['data']) == 0){
$dataArr = [];
}else{
$this->handle($data['data'], $dataArr);
}
$old = (new AdminFields())->where([ $old = (new AdminFields())->where([
'hash' => $hash, 'hash' => $hash,
'type' => $type 'type' => $type

2
application/wiki/view/index/detail.html
View File

@ -37,7 +37,7 @@
<div class="ui vertical menu" style="width: 100%;overflow: auto;"> <div class="ui vertical menu" style="width: 100%;overflow: auto;">
{volist name="apiList" id="vo"} {volist name="apiList" id="vo"}
<a class="{if condition="$hash == $vo['hash']"}active{/if} teal item" href="{:url('/wiki/detail/'.$groupHash.'/'.$vo["hash"])}"> <a class="{if condition="$hash == $vo['hash']"}active{/if} teal item" href="{:url('/wiki/detail/'.$groupHash.'/'.$vo["hash"])}">
{:substr($vo['hash'], 0, 11)}...（{:mb_substr($vo['info'], 0, 3)}...） {:mb_substr($vo['info'], 0, 11)}...
<div class="ui {if condition="$hash == $vo['hash']"}teal{/if} label"> &gt; </div> <div class="ui {if condition="$hash == $vo['hash']"}teal{/if} label"> &gt; </div>
</a> </a>
{/volist} {/volist}