郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 2dd4daac64a61954be6080534ddbb12d49ed97e5 1 个父辈 18c379ea
1 个管道 的构建 通过 耗费 1 秒

修改首页图片

内嵌 并排对比
正在显示 2 个修改的文件 包含 104 行增加 和 110 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,42 +24,44 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="157" column="41" lean-forward="true" selection-start-line="157" selection-start-column="41" selection-end-line="157" selection-end-column="41" />
<state relative-caret-position="182">
<caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#2268#3059#0#PHP" expanded="false" />
<element signature="e#3065#3374#0#PHP" expanded="false" />
<element signature="e#5277#5756#0#PHP" expanded="false" />
<element signature="e#5761#6328#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="159" column="47" lean-forward="true" selection-start-line="159" selection-start-column="47" selection-end-line="159" selection-end-column="47" />
<folding>
<element signature="e#40#78#0#PHP" expanded="true" />
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
<element signature="e#1855#1936#0#PHP" expanded="false" />
<element signature="e#1941#3993#0#PHP" expanded="false" />
<element signature="e#4000#4023#0#PHP" expanded="false" />
<element signature="e#4028#4287#0#PHP" expanded="false" />
<element signature="e#4294#4343#0#PHP" expanded="false" />
<element signature="e#4348#4776#0#PHP" expanded="false" />
<element signature="e#4783#4847#0#PHP" expanded="false" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -125,7 +126,6 @@
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
... ... @@ -137,6 +137,7 @@
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
<option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
</list>
</option>
</component>
... ... @@ -155,8 +156,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="81" />
<option name="y" value="58" />
<option name="x" value="8" />
<option name="y" value="102" />
<option name="width" value="1618" />
<option name="height" value="1023" />
</component>
... ... @@ -186,25 +187,20 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wechat" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="cert" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -315,18 +311,18 @@
<workItem from="1575527294268" duration="10705000" />
<workItem from="1575543830603" duration="2980000" />
<workItem from="1575592067577" duration="15900000" />
<workItem from="1575615529386" duration="5898000" />
<workItem from="1575615529386" duration="6506000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="517295000" />
<option name="totallyTimeSpent" value="517903000" />
</component>
<component name="ToolWindowManager">
<frame x="81" y="58" width="1618" height="1023" extended-state="1" />
<frame x="8" y="102" width="1618" height="1023" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -622,48 +618,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="244" column="29" lean-forward="false" selection-start-line="244" selection-start-column="29" selection-end-line="244" selection-end-column="29" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6514#0#PHP" expanded="false" />
<element signature="e#6520#6863#0#PHP" expanded="false" />
<element signature="e#6868#7349#0#PHP" expanded="false" />
<element signature="e#7355#7646#0#PHP" expanded="false" />
<element signature="e#7651#8002#0#PHP" expanded="false" />
<element signature="e#8008#8361#0#PHP" expanded="false" />
<element signature="e#8366#8771#0#PHP" expanded="false" />
<element signature="e#8777#9160#0#PHP" expanded="false" />
<element signature="e#9165#9832#0#PHP" expanded="false" />
<element signature="e#9838#10282#0#PHP" expanded="false" />
<element signature="e#10287#11134#0#PHP" expanded="false" />
<element signature="e#11140#11408#0#PHP" expanded="false" />
<element signature="e#11413#11885#0#PHP" expanded="false" />
<element signature="e#11891#12197#0#PHP" expanded="false" />
<element signature="e#12202#13845#0#PHP" expanded="false" />
<element signature="e#13866#14185#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="725">
... ... @@ -888,6 +842,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#2268#3059#0#PHP" expanded="false" />
<element signature="e#3065#3374#0#PHP" expanded="false" />
<element signature="e#5277#5756#0#PHP" expanded="false" />
<element signature="e#5761#6328#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
... ... @@ -907,20 +879,43 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="157" column="41" lean-forward="true" selection-start-line="157" selection-start-column="41" selection-end-line="157" selection-end-column="41" />
<state relative-caret-position="182">
<caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#2268#3059#0#PHP" expanded="false" />
<element signature="e#3065#3374#0#PHP" expanded="false" />
<element signature="e#5277#5756#0#PHP" expanded="false" />
<element signature="e#5761#6328#0#PHP" expanded="false" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -196,11 +196,10 @@ class RecycleController extends RestBaseController
*
*/
public function build(){
$data = Db::name('pic')
$data = Db::name('build')
->where('id',1)
->field('id,thumbnail')
->find();
$data['thumbnail'] = cmf_get_image_url($data['thumbnail']);
$this->success('SUCCESS',$data);
}
... ...