郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 aa2a1c51e16aff668570af7d1282fbb9df0d3539 1 个父辈 d7afa4ea
1 个管道 的构建 通过 耗费 1 秒

添加ID

内嵌 并排对比
正在显示 2 个修改的文件 包含 89 行增加 和 89 行删除
... ... @@ -28,8 +28,8 @@
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<caret line="800" column="5" lean-forward="true" selection-start-line="800" selection-start-column="5" selection-end-line="800" selection-end-column="5" />
<state relative-caret-position="277">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -55,45 +55,45 @@
<element signature="e#12118#12699#0#PHP" expanded="false" />
<element signature="e#12704#14092#0#PHP" expanded="false" />
<element signature="e#14098#14554#0#PHP" expanded="false" />
<element signature="e#14559#16507#0#PHP" expanded="false" />
<element signature="e#16530#16885#0#PHP" expanded="false" />
<element signature="e#16891#17604#0#PHP" expanded="false" />
<element signature="e#17609#19066#0#PHP" expanded="false" />
<element signature="e#19072#19533#0#PHP" expanded="false" />
<element signature="e#19538#22558#0#PHP" expanded="false" />
<element signature="e#22564#23173#0#PHP" expanded="false" />
<element signature="e#23178#24463#0#PHP" expanded="false" />
<element signature="e#24469#24826#0#PHP" expanded="false" />
<element signature="e#24831#25712#0#PHP" expanded="false" />
<element signature="e#25718#26070#0#PHP" expanded="false" />
<element signature="e#26075#27153#0#PHP" expanded="false" />
<element signature="e#27159#27514#0#PHP" expanded="false" />
<element signature="e#27519#28613#0#PHP" expanded="false" />
<element signature="e#28619#29043#0#PHP" expanded="false" />
<element signature="e#29048#29659#0#PHP" expanded="false" />
<element signature="e#29665#30161#0#PHP" expanded="false" />
<element signature="e#30166#31464#0#PHP" expanded="false" />
<element signature="e#31470#31754#0#PHP" expanded="false" />
<element signature="e#31759#32395#0#PHP" expanded="false" />
<element signature="e#32416#32735#0#PHP" expanded="false" />
<element signature="e#32741#33149#0#PHP" expanded="false" />
<element signature="e#33155#33914#0#PHP" expanded="false" />
<element signature="e#33933#34797#0#PHP" expanded="false" />
<element signature="e#34823#35223#0#PHP" expanded="false" />
<element signature="e#35246#35819#0#PHP" expanded="false" />
<element signature="e#35842#36652#0#PHP" expanded="false" />
<element signature="e#36658#37257#0#PHP" expanded="false" />
<element signature="e#37262#38226#0#PHP" expanded="false" />
<element signature="e#38232#38899#0#PHP" expanded="false" />
<element signature="e#38904#39945#0#PHP" expanded="false" />
<element signature="e#39951#40614#0#PHP" expanded="false" />
<element signature="e#40619#41646#0#PHP" expanded="false" />
<element signature="e#41653#42084#0#PHP" expanded="false" />
<element signature="e#42089#42667#0#PHP" expanded="false" />
<element signature="e#42673#43102#0#PHP" expanded="false" />
<element signature="e#43107#43709#0#PHP" expanded="false" />
<element signature="e#43715#44142#0#PHP" expanded="false" />
<element signature="e#44147#44713#0#PHP" expanded="false" />
<element signature="e#14559#16522#0#PHP" expanded="false" />
<element signature="e#16545#16900#0#PHP" expanded="false" />
<element signature="e#16906#17619#0#PHP" expanded="false" />
<element signature="e#17624#19081#0#PHP" expanded="false" />
<element signature="e#19087#19548#0#PHP" expanded="false" />
<element signature="e#19553#22575#0#PHP" expanded="false" />
<element signature="e#22581#23190#0#PHP" expanded="false" />
<element signature="e#23195#24480#0#PHP" expanded="false" />
<element signature="e#24486#24843#0#PHP" expanded="false" />
<element signature="e#24848#25729#0#PHP" expanded="false" />
<element signature="e#25735#26087#0#PHP" expanded="false" />
<element signature="e#26092#27170#0#PHP" expanded="false" />
<element signature="e#27176#27531#0#PHP" expanded="false" />
<element signature="e#27536#28630#0#PHP" expanded="false" />
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31481#0#PHP" expanded="false" />
<element signature="e#31487#31771#0#PHP" expanded="false" />
<element signature="e#31776#32412#0#PHP" expanded="false" />
<element signature="e#32433#32752#0#PHP" expanded="false" />
<element signature="e#32758#33166#0#PHP" expanded="false" />
<element signature="e#33172#33931#0#PHP" expanded="false" />
<element signature="e#33950#34814#0#PHP" expanded="false" />
<element signature="e#34840#35240#0#PHP" expanded="false" />
<element signature="e#35263#35836#0#PHP" expanded="false" />
<element signature="e#35859#36669#0#PHP" expanded="false" />
<element signature="e#36675#37274#0#PHP" expanded="false" />
<element signature="e#37279#38243#0#PHP" expanded="false" />
<element signature="e#38249#38916#0#PHP" expanded="false" />
<element signature="e#38921#39962#0#PHP" expanded="false" />
<element signature="e#39968#40631#0#PHP" expanded="false" />
<element signature="e#40636#41663#0#PHP" expanded="false" />
<element signature="e#41670#42101#0#PHP" expanded="false" />
<element signature="e#42106#42684#0#PHP" expanded="false" />
<element signature="e#42690#43119#0#PHP" expanded="false" />
<element signature="e#43124#43726#0#PHP" expanded="false" />
<element signature="e#43732#44159#0#PHP" expanded="false" />
<element signature="e#44164#44730#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -225,8 +225,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="172" />
<option name="y" value="37" />
<option name="x" value="376" />
<option name="y" value="29" />
<option name="width" value="1582" />
<option name="height" value="1056" />
</component>
... ... @@ -375,15 +375,15 @@
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="7216000" />
<workItem from="1575506248144" duration="7718000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="473925000" />
<option name="totallyTimeSpent" value="474427000" />
</component>
<component name="ToolWindowManager">
<frame x="172" y="37" width="1582" height="1056" extended-state="0" />
<frame x="376" y="29" width="1582" height="1056" extended-state="0" />
<editor active="true" />
<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.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -883,8 +883,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<caret line="800" column="5" lean-forward="true" selection-start-line="800" selection-start-column="5" selection-end-line="800" selection-end-column="5" />
<state relative-caret-position="277">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -910,45 +910,45 @@
<element signature="e#12118#12699#0#PHP" expanded="false" />
<element signature="e#12704#14092#0#PHP" expanded="false" />
<element signature="e#14098#14554#0#PHP" expanded="false" />
<element signature="e#14559#16507#0#PHP" expanded="false" />
<element signature="e#16530#16885#0#PHP" expanded="false" />
<element signature="e#16891#17604#0#PHP" expanded="false" />
<element signature="e#17609#19066#0#PHP" expanded="false" />
<element signature="e#19072#19533#0#PHP" expanded="false" />
<element signature="e#19538#22558#0#PHP" expanded="false" />
<element signature="e#22564#23173#0#PHP" expanded="false" />
<element signature="e#23178#24463#0#PHP" expanded="false" />
<element signature="e#24469#24826#0#PHP" expanded="false" />
<element signature="e#24831#25712#0#PHP" expanded="false" />
<element signature="e#25718#26070#0#PHP" expanded="false" />
<element signature="e#26075#27153#0#PHP" expanded="false" />
<element signature="e#27159#27514#0#PHP" expanded="false" />
<element signature="e#27519#28613#0#PHP" expanded="false" />
<element signature="e#28619#29043#0#PHP" expanded="false" />
<element signature="e#29048#29659#0#PHP" expanded="false" />
<element signature="e#29665#30161#0#PHP" expanded="false" />
<element signature="e#30166#31464#0#PHP" expanded="false" />
<element signature="e#31470#31754#0#PHP" expanded="false" />
<element signature="e#31759#32395#0#PHP" expanded="false" />
<element signature="e#32416#32735#0#PHP" expanded="false" />
<element signature="e#32741#33149#0#PHP" expanded="false" />
<element signature="e#33155#33914#0#PHP" expanded="false" />
<element signature="e#33933#34797#0#PHP" expanded="false" />
<element signature="e#34823#35223#0#PHP" expanded="false" />
<element signature="e#35246#35819#0#PHP" expanded="false" />
<element signature="e#35842#36652#0#PHP" expanded="false" />
<element signature="e#36658#37257#0#PHP" expanded="false" />
<element signature="e#37262#38226#0#PHP" expanded="false" />
<element signature="e#38232#38899#0#PHP" expanded="false" />
<element signature="e#38904#39945#0#PHP" expanded="false" />
<element signature="e#39951#40614#0#PHP" expanded="false" />
<element signature="e#40619#41646#0#PHP" expanded="false" />
<element signature="e#41653#42084#0#PHP" expanded="false" />
<element signature="e#42089#42667#0#PHP" expanded="false" />
<element signature="e#42673#43102#0#PHP" expanded="false" />
<element signature="e#43107#43709#0#PHP" expanded="false" />
<element signature="e#43715#44142#0#PHP" expanded="false" />
<element signature="e#44147#44713#0#PHP" expanded="false" />
<element signature="e#14559#16522#0#PHP" expanded="false" />
<element signature="e#16545#16900#0#PHP" expanded="false" />
<element signature="e#16906#17619#0#PHP" expanded="false" />
<element signature="e#17624#19081#0#PHP" expanded="false" />
<element signature="e#19087#19548#0#PHP" expanded="false" />
<element signature="e#19553#22575#0#PHP" expanded="false" />
<element signature="e#22581#23190#0#PHP" expanded="false" />
<element signature="e#23195#24480#0#PHP" expanded="false" />
<element signature="e#24486#24843#0#PHP" expanded="false" />
<element signature="e#24848#25729#0#PHP" expanded="false" />
<element signature="e#25735#26087#0#PHP" expanded="false" />
<element signature="e#26092#27170#0#PHP" expanded="false" />
<element signature="e#27176#27531#0#PHP" expanded="false" />
<element signature="e#27536#28630#0#PHP" expanded="false" />
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31481#0#PHP" expanded="false" />
<element signature="e#31487#31771#0#PHP" expanded="false" />
<element signature="e#31776#32412#0#PHP" expanded="false" />
<element signature="e#32433#32752#0#PHP" expanded="false" />
<element signature="e#32758#33166#0#PHP" expanded="false" />
<element signature="e#33172#33931#0#PHP" expanded="false" />
<element signature="e#33950#34814#0#PHP" expanded="false" />
<element signature="e#34840#35240#0#PHP" expanded="false" />
<element signature="e#35263#35836#0#PHP" expanded="false" />
<element signature="e#35859#36669#0#PHP" expanded="false" />
<element signature="e#36675#37274#0#PHP" expanded="false" />
<element signature="e#37279#38243#0#PHP" expanded="false" />
<element signature="e#38249#38916#0#PHP" expanded="false" />
<element signature="e#38921#39962#0#PHP" expanded="false" />
<element signature="e#39968#40631#0#PHP" expanded="false" />
<element signature="e#40636#41663#0#PHP" expanded="false" />
<element signature="e#41670#42101#0#PHP" expanded="false" />
<element signature="e#42106#42684#0#PHP" expanded="false" />
<element signature="e#42690#43119#0#PHP" expanded="false" />
<element signature="e#43124#43726#0#PHP" expanded="false" />
<element signature="e#43732#44159#0#PHP" expanded="false" />
<element signature="e#44164#44730#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -542,7 +542,7 @@ class UserController extends RestBaseController
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
$v['shopgoods_id'] = Db::name('shopgoods')
->where('id',$v['shopgoods_id'])
->field('goods_name,thumbnail,price')
->field('id as goods_id,goods_name,thumbnail,price')
->find();
}
$this->success('SUCCESS',$data);
... ... @@ -698,7 +698,7 @@ class UserController extends RestBaseController
}
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
$home = Db::name('home')->where('id',$v['home_id'])->field('home_name')->find();
$v['home_id'] = $home['home_name'];
$v['home_name'] = $home['home_name'];
$service = Db::name('service')->where('id',$v['service_id'])->field('sever_name,price')->find();
$v['service_id'] = $service['sever_name'];
$v['price'] = $service['price'];
... ...