郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 9675c7e2f6862e2e0e934cab6951b4c743b4f15a 1 个父辈 5131c140
1 个管道 的构建 通过 耗费 0 秒

搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 35 行增加 和 16 行删除
... ... @@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -19,8 +17,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="523">
<caret line="199" column="0" lean-forward="true" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" />
<state relative-caret-position="254">
<caret line="219" column="17" lean-forward="true" selection-start-line="219" selection-start-column="17" selection-end-line="219" selection-end-column="17" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#312#384#0#PHP" expanded="false" />
... ... @@ -112,8 +110,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="434" />
<option name="y" value="58" />
<option name="x" value="362" />
<option name="y" value="79" />
<option name="width" value="1589" />
<option name="height" value="930" />
</component>
... ... @@ -209,7 +207,7 @@
<workItem from="1574122453532" duration="15780000" />
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="3635000" />
<workItem from="1574146994475" duration="4250000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -222,7 +220,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="51988000" />
<option name="totallyTimeSpent" value="52603000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -234,7 +232,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="434" y="58" width="1589" height="930" extended-state="0" />
<frame x="362" y="79" width="1589" height="930" extended-state="0" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18574232" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -641,8 +639,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="523">
<caret line="199" column="0" lean-forward="true" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" />
<state relative-caret-position="254">
<caret line="219" column="17" lean-forward="true" selection-start-line="219" selection-start-column="17" selection-end-line="219" selection-end-column="17" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#312#384#0#PHP" expanded="false" />
... ...
... ... @@ -166,7 +166,7 @@ class User extends Api
* @ApiMethod (POST)
* @ApiRoute (/api/user/search)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片 （视频为1 图片为2）")
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片 （视频为1 图片为2 精美大片为3）")
* @ApiParams (name="keyword", type="string", required=true, description="关键字")
* @ApiReturn({
"code": 1,
... ... @@ -196,8 +196,29 @@ class User extends Api
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}elseif($type_id == 2){
$where['keyword'] = ['like',"%$keyword%"];
$where['title'] = ['like',"%$keyword%"];
$data = Db::name('pic')
->where($where)
->order('id desc')
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('SUCCESS',$data);
}else{
$where['keyword'] = ['like',"%$keyword%"];
$data = Db::name('wonderful')
->where($where)
->order('id desc')
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}
}else{
$this->error(['code'=>2,'msg'=>'请输入关键字']);
... ...
... ... @@ -1598,7 +1598,7 @@
<td>type_id</td>
<td>inter</td>
<td>否</td>
<td>视频/图片 （视频为1 图片为2）</td>
<td>视频/图片 （视频为1 图片为2 精美大片为3）</td>
</tr>
<tr>
<td>keyword</td>
... ... @@ -1637,7 +1637,7 @@
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/search" method="POST" name="form11" id="form11">
<div class="form-group">
<label class="control-label" for="type_id">type_id</label>
<input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片 （视频为1 图片为2）" name="type_id">
<input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片 （视频为1 图片为2 精美大片为3）" name="type_id">
</div>
<div class="form-group">
<label class="control-label" for="keyword">keyword</label>
... ... @@ -1698,7 +1698,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-19 16:03:49 </div>
Generated on 2019-11-19 16:14:05 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...