郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c6ede7f5deca6a9d16098b27bc112bed390db3d4 1 个父辈 5bcf69b6
1 个管道 的构建 失败 耗费 4 秒

修改字段

内嵌 并排对比
正在显示 3 个修改的文件 包含 133 行增加 和 79 行删除
... ... @@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<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$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,12 +14,88 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="fapiao.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<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="368">
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
<folding />
<state relative-caret-position="187">
<caret line="1979" column="38" lean-forward="true" selection-start-line="1979" selection-start-column="38" selection-end-line="1979" selection-end-column="38" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#1266#2890#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6073#0#PHP" expanded="false" />
<element signature="e#6079#6916#0#PHP" expanded="false" />
<element signature="e#6921#9116#0#PHP" expanded="false" />
<element signature="e#9122#9802#0#PHP" expanded="false" />
<element signature="e#9807#10715#0#PHP" expanded="false" />
<element signature="e#10721#11510#0#PHP" expanded="false" />
<element signature="e#11515#12863#0#PHP" expanded="false" />
<element signature="e#12869#13571#0#PHP" expanded="false" />
<element signature="e#13576#14886#0#PHP" expanded="false" />
<element signature="e#14892#15468#0#PHP" expanded="false" />
<element signature="e#15473#16085#0#PHP" expanded="false" />
<element signature="e#16091#16807#0#PHP" expanded="false" />
<element signature="e#16812#19352#0#PHP" expanded="false" />
<element signature="e#19358#20260#0#PHP" expanded="false" />
<element signature="e#20265#23083#0#PHP" expanded="false" />
<element signature="e#23089#23466#0#PHP" expanded="false" />
<element signature="e#23471#23792#0#PHP" expanded="false" />
<element signature="e#23798#24303#0#PHP" expanded="false" />
<element signature="e#24308#24559#0#PHP" expanded="false" />
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
<element signature="e#26298#27067#0#PHP" expanded="false" />
<element signature="e#27073#27436#0#PHP" expanded="false" />
<element signature="e#27441#27632#0#PHP" expanded="false" />
<element signature="e#27638#27996#0#PHP" expanded="false" />
<element signature="e#28001#28192#0#PHP" expanded="false" />
<element signature="e#28198#29341#0#PHP" expanded="false" />
<element signature="e#29346#32011#0#PHP" expanded="false" />
<element signature="e#32017#32515#0#PHP" expanded="false" />
<element signature="e#32520#34266#0#PHP" expanded="false" />
<element signature="e#34272#34685#0#PHP" expanded="false" />
<element signature="e#34690#35169#0#PHP" expanded="false" />
<element signature="e#35175#35709#0#PHP" expanded="false" />
<element signature="e#35714#37099#0#PHP" expanded="false" />
<element signature="e#37105#37759#0#PHP" expanded="false" />
<element signature="e#37764#39779#0#PHP" expanded="false" />
<element signature="e#39785#40545#0#PHP" expanded="false" />
<element signature="e#40550#43259#0#PHP" expanded="false" />
<element signature="e#43285#44116#0#PHP" expanded="false" />
<element signature="e#44122#44542#0#PHP" expanded="false" />
<element signature="e#44547#45030#0#PHP" expanded="false" />
<element signature="e#45036#45842#0#PHP" expanded="false" />
<element signature="e#45847#49005#0#PHP" expanded="false" />
<element signature="e#49020#50355#0#PHP" expanded="false" />
<element signature="e#50371#51405#0#PHP" expanded="false" />
<element signature="e#51411#52169#0#PHP" expanded="false" />
<element signature="e#52174#55917#0#PHP" expanded="false" />
<element signature="e#55923#56315#0#PHP" expanded="false" />
<element signature="e#56320#57272#0#PHP" expanded="false" />
<element signature="e#57296#57869#0#PHP" expanded="false" />
<element signature="e#57875#58474#0#PHP" expanded="false" />
<element signature="e#58479#59406#0#PHP" expanded="false" />
<element signature="e#59412#60126#0#PHP" expanded="false" />
<element signature="e#60132#60559#0#PHP" expanded="false" />
<element signature="e#60564#61033#0#PHP" expanded="false" />
<element signature="e#61040#62245#0#PHP" expanded="false" />
<element signature="e#62250#63953#0#PHP" expanded="false" />
<element signature="e#62397#62736#1#PHP" expanded="false" />
<element signature="e#62766#63120#1#PHP" expanded="false" />
<element signature="e#63959#64651#0#PHP" expanded="false" />
<element signature="e#64776#64913#1#PHP" expanded="false" />
<element signature="e#64943#65083#1#PHP" expanded="false" />
<element signature="e#65094#65185#0#PHP" expanded="false" />
<element signature="e#66174#66258#0#PHP" expanded="false" />
<element signature="e#67543#68052#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -101,8 +178,8 @@
<option value="$PROJECT_DIR$/application/admin/controller/Suggest.php" />
<option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/suggest.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -120,11 +197,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="215" />
<option name="y" value="115" />
<component name="ProjectFrameBounds">
<option name="x" value="606" />
<option name="y" value="50" />
<option name="width" value="1569" />
<option name="height" value="956" />
<option name="height" value="949" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -159,27 +236,14 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="order" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -280,7 +344,7 @@
<workItem from="1575959458925" duration="956000" />
<workItem from="1575979358020" duration="2589000" />
<workItem from="1576028218954" duration="680000" />
<workItem from="1576128183316" duration="3635000" />
<workItem from="1576128183316" duration="6352000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -307,7 +371,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="393869000" />
<option name="totallyTimeSpent" value="396586000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -319,8 +383,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="215" y="115" width="1569" height="956" extended-state="1" />
<editor active="true" />
<frame x="606" y="50" width="1569" height="949" 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.22332671" 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" />
... ... @@ -329,7 +392,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47496948" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47413793" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -948,10 +1011,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="1972" column="31" lean-forward="true" selection-start-line="1972" selection-start-column="31" selection-end-line="1972" selection-end-column="31" />
<state relative-caret-position="187">
<caret line="1979" column="38" lean-forward="true" selection-start-line="1979" selection-start-column="38" selection-end-line="1979" selection-end-column="38" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -1022,21 +1093,15 @@
<element signature="e#62250#63953#0#PHP" expanded="false" />
<element signature="e#62397#62736#1#PHP" expanded="false" />
<element signature="e#62766#63120#1#PHP" expanded="false" />
<element signature="e#63959#64825#0#PHP" expanded="false" />
<element signature="e#64830#67365#0#PHP" expanded="false" />
<element signature="e#66002#66086#0#PHP" expanded="false" />
<element signature="e#67371#67880#0#PHP" expanded="false" />
<element signature="e#63959#64651#0#PHP" expanded="false" />
<element signature="e#64776#64913#1#PHP" expanded="false" />
<element signature="e#64943#65083#1#PHP" expanded="false" />
<element signature="e#65094#65185#0#PHP" expanded="false" />
<element signature="e#66174#66258#0#PHP" expanded="false" />
<element signature="e#67543#68052#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -1859,8 +1859,6 @@ class User extends Api
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="order_id", type="inter", required=true, description="订单ID")
* @ApiParams (name="pic_id", type="inter", required=false, description="图片ID")
* @ApiParams (name="video_id", type="inter", required=false, description="视频ID")
* @ApiParams (name="name", type="string", required=true, description="使用人")
* @ApiParams (name="use", type="string", required=true, description="用途")
* @ApiParams (name="tel", type="string", required=true, description="联系方式")
... ... @@ -1874,9 +1872,7 @@ class User extends Api
public function show()
{
$param = $this->request->param();
// $common = new Common();
// $common->test_pdf('jinglogn','','','','','');
//验证器验证
$validate = new Validate([
'order_id'=>'require',
'name'=>'require',
... ... @@ -1892,18 +1888,31 @@ class User extends Api
if (!$validate->check($param)) {
$this->error($validate->getError());
}
$res['user_id'] = $this->uid;
$res['order_id'] = $param['order_id'];
$res['name'] = $param['name'];
$res['use'] = $param['use'];
$res['tel'] = $param['tel'];
$res['createtime'] = time();
if(!empty($param['pic_id'])){
$res['pic_id'] = $param['pic_id'];
}
if(!empty($param['video_id'])){
$res['video_id'] = $param['video_id'];
$order_id = explode(',',$param['order_id']);
//循环查询每个订单中的图片ID以及视频ID
foreach ($order_id as $key=>$val){
//查询出该订单的内容
$order = Db::name('order')
->where('id',$val)
->find();
//判读图片和视频是否为空
if(!empty($order['pic_id'])){
//如果图片ID不为空
$res['pic_id'] = $order_id['pic_id'];
}
if(!empty($order['video_id'])){
//如果视频ID不为空
$video_id = unserialize($order['video_id']);
$res['video_id'] = array_column($video_id,'id');
}
}
print_r($res);die;
//判断是否已经下载过授权书
$info = Db::name('shou')
... ... @@ -1968,7 +1977,7 @@ class User extends Api
{
$param = $this->request->param();
$param['user_id'] = $this->uid;
$param['createtiem'] = time();
$param['createtime'] = time();
$validate = new Validate([
'title'=>'require',
'content'=>'require',
... ...
... ... @@ -4199,18 +4199,6 @@
<td>订单ID</td>
</tr>
<tr>
<td>pic_id</td>
<td>inter</td>
<td>否</td>
<td>图片ID</td>
</tr>
<tr>
<td>video_id</td>
<td>inter</td>
<td>否</td>
<td>视频ID</td>
</tr>
<tr>
<td>name</td>
<td>string</td>
<td>是</td>
... ... @@ -4262,14 +4250,6 @@
<input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单ID" name="order_id">
</div>
<div class="form-group">
<label class="control-label" for="pic_id">pic_id</label>
<input type="inter" class="form-control input-sm" id="pic_id" placeholder="图片ID" name="pic_id">
</div>
<div class="form-group">
<label class="control-label" for="video_id">video_id</label>
<input type="inter" class="form-control input-sm" id="video_id" placeholder="视频ID" name="video_id">
</div>
<div class="form-group">
<label class="control-label" for="name">name</label>
<input type="string" class="form-control input-sm" id="name" required placeholder="使用人" name="name">
</div>
... ... @@ -7286,7 +7266,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-12-12 14:14:30 </div>
Generated on 2019-12-12 15:08:55 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...