郭盛 / scrap · 提交

转到一个项目

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

修改评价内容

内嵌 并排对比
正在显示 5 个修改的文件 包含 278 行增加 和 138 行删除
... ... @@ -2,7 +2,10 @@
<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/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<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/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -98,20 +101,138 @@
</provider>
</entry>
</file>
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<state relative-caret-position="753">
<caret line="166" column="0" lean-forward="false" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#608#970#0#PHP" expanded="false" />
<element signature="e#975#1835#0#PHP" expanded="false" />
<element signature="e#1841#2078#0#PHP" expanded="false" />
<element signature="e#2083#2781#0#PHP" expanded="false" />
<element signature="e#2787#3029#0#PHP" expanded="false" />
<element signature="e#3035#3272#0#PHP" expanded="false" />
<element signature="e#3277#3349#0#PHP" expanded="false" />
<element signature="e#3355#3834#0#PHP" expanded="false" />
<element signature="e#3839#4406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<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>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="188" column="29" lean-forward="false" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6248#0#PHP" expanded="false" />
<element signature="e#6254#6572#0#PHP" expanded="false" />
<element signature="e#6577#6953#0#PHP" expanded="false" />
<element signature="e#6959#7314#0#PHP" expanded="false" />
<element signature="e#7319#7728#0#PHP" expanded="false" />
<element signature="e#7734#8119#0#PHP" expanded="false" />
<element signature="e#8124#8795#0#PHP" expanded="false" />
<element signature="e#8801#9247#0#PHP" expanded="false" />
<element signature="e#9252#10103#0#PHP" expanded="false" />
<element signature="e#10109#10379#0#PHP" expanded="false" />
<element signature="e#10384#10860#0#PHP" expanded="false" />
<element signature="e#10866#11496#0#PHP" expanded="false" />
<element signature="e#11501#13433#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4637#0#PHP" expanded="false" />
<element signature="e#4643#4956#0#PHP" expanded="false" />
<element signature="e#4961#5336#0#PHP" expanded="false" />
<element signature="e#5342#5694#0#PHP" expanded="false" />
<element signature="e#5699#6107#0#PHP" expanded="false" />
<element signature="e#6113#6495#0#PHP" expanded="false" />
<element signature="e#6500#7170#0#PHP" expanded="false" />
<element signature="e#7176#7619#0#PHP" expanded="false" />
<element signature="e#7624#8474#0#PHP" expanded="false" />
<element signature="e#8480#8747#0#PHP" expanded="false" />
<element signature="e#8752#9227#0#PHP" expanded="false" />
<element signature="e#9233#9783#0#PHP" expanded="false" />
<element signature="e#9788#11648#0#PHP" expanded="false" />
<element signature="e#10208#10435#1#PHP" expanded="false" />
<element signature="e#10465#10696#1#PHP" expanded="false" />
<element signature="e#11654#12021#0#PHP" expanded="false" />
<element signature="e#12026#12466#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -165,7 +286,6 @@
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
... ... @@ -180,14 +300,15 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/PayController.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$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.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" />
</list>
</option>
</component>
... ... @@ -206,8 +327,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="267" />
<option name="y" value="75" />
<option name="x" value="294" />
<option name="y" value="56" />
<option name="width" value="1700" />
<option name="height" value="1040" />
</component>
... ... @@ -251,6 +372,13 @@
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -357,15 +485,15 @@
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="15103000" />
<workItem from="1575527294268" duration="1104000" />
<workItem from="1575527294268" duration="1927000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="482916000" />
<option name="totallyTimeSpent" value="483739000" />
</component>
<component name="ToolWindowManager">
<frame x="267" y="75" width="1700" height="1040" extended-state="0" />
<frame x="294" y="56" width="1700" height="1040" 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.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -647,13 +775,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -668,48 +789,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="450">
<caret line="78" column="0" lean-forward="false" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
<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#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="669">
... ... @@ -726,81 +805,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="244" column="7" lean-forward="true" selection-start-line="244" selection-start-column="7" selection-end-line="244" selection-end-column="7" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4539#0#PHP" expanded="false" />
<element signature="e#4545#4858#0#PHP" expanded="false" />
<element signature="e#4863#5238#0#PHP" expanded="false" />
<element signature="e#5244#5596#0#PHP" expanded="false" />
<element signature="e#5601#6009#0#PHP" expanded="false" />
<element signature="e#6015#6397#0#PHP" expanded="false" />
<element signature="e#6402#7072#0#PHP" expanded="false" />
<element signature="e#7078#7521#0#PHP" expanded="false" />
<element signature="e#7526#8376#0#PHP" expanded="false" />
<element signature="e#8382#8649#0#PHP" expanded="false" />
<element signature="e#8654#9129#0#PHP" expanded="false" />
<element signature="e#9135#9685#0#PHP" expanded="false" />
<element signature="e#9690#11550#0#PHP" expanded="false" />
<element signature="e#10110#10337#1#PHP" expanded="false" />
<element signature="e#10367#10598#1#PHP" expanded="false" />
<element signature="e#11556#11923#0#PHP" expanded="false" />
<element signature="e#11928#12368#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="434" column="129" lean-forward="false" selection-start-line="432" selection-start-column="12" selection-end-line="434" selection-end-column="129" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-529">
... ... @@ -938,17 +942,145 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="156" column="24" lean-forward="false" selection-start-line="156" selection-start-column="24" selection-end-line="156" selection-end-column="24" />
<state relative-caret-position="753">
<caret line="166" column="0" lean-forward="false" selection-start-line="166" selection-start-column="0" selection-end-line="166" selection-end-column="0" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#608#970#0#PHP" expanded="false" />
<element signature="e#975#1835#0#PHP" expanded="false" />
<element signature="e#1841#2078#0#PHP" expanded="false" />
<element signature="e#2083#2781#0#PHP" expanded="false" />
<element signature="e#2787#3029#0#PHP" expanded="false" />
<element signature="e#3035#3272#0#PHP" expanded="false" />
<element signature="e#3277#3349#0#PHP" expanded="false" />
<element signature="e#3355#3834#0#PHP" expanded="false" />
<element signature="e#3839#4406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
<folding />
</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$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="188" column="29" lean-forward="false" selection-start-line="188" selection-start-column="29" selection-end-line="188" selection-end-column="29" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6248#0#PHP" expanded="false" />
<element signature="e#6254#6572#0#PHP" expanded="false" />
<element signature="e#6577#6953#0#PHP" expanded="false" />
<element signature="e#6959#7314#0#PHP" expanded="false" />
<element signature="e#7319#7728#0#PHP" expanded="false" />
<element signature="e#7734#8119#0#PHP" expanded="false" />
<element signature="e#8124#8795#0#PHP" expanded="false" />
<element signature="e#8801#9247#0#PHP" expanded="false" />
<element signature="e#9252#10103#0#PHP" expanded="false" />
<element signature="e#10109#10379#0#PHP" expanded="false" />
<element signature="e#10384#10860#0#PHP" expanded="false" />
<element signature="e#10866#11496#0#PHP" expanded="false" />
<element signature="e#11501#13433#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1726#0#PHP" expanded="false" />
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2125#2642#0#PHP" expanded="false" />
<element signature="e#2647#3162#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4637#0#PHP" expanded="false" />
<element signature="e#4643#4956#0#PHP" expanded="false" />
<element signature="e#4961#5336#0#PHP" expanded="false" />
<element signature="e#5342#5694#0#PHP" expanded="false" />
<element signature="e#5699#6107#0#PHP" expanded="false" />
<element signature="e#6113#6495#0#PHP" expanded="false" />
<element signature="e#6500#7170#0#PHP" expanded="false" />
<element signature="e#7176#7619#0#PHP" expanded="false" />
<element signature="e#7624#8474#0#PHP" expanded="false" />
<element signature="e#8480#8747#0#PHP" expanded="false" />
<element signature="e#8752#9227#0#PHP" expanded="false" />
<element signature="e#9233#9783#0#PHP" expanded="false" />
<element signature="e#9788#11648#0#PHP" expanded="false" />
<element signature="e#10208#10435#1#PHP" expanded="false" />
<element signature="e#10465#10696#1#PHP" expanded="false" />
<element signature="e#11654#12021#0#PHP" expanded="false" />
<element signature="e#12026#12466#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -165,6 +165,7 @@ class HomeController extends RestBaseController
->select()
->toArray();
foreach ($res as &$v){
$v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
$v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
}
... ...
... ... @@ -161,5 +161,11 @@ class OrderController extends RestBaseController
$this->success('SUCCESS',$list);
}
//自动修改订单状态
public function update()
{
}
}
\ No newline at end of file
... ...
... ... @@ -254,6 +254,7 @@ class RecycleController extends RestBaseController
->select()
->toArray();
foreach ($res as &$v){
$v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
$v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
}
$this->success('SUCCESS',$res);
... ...
... ... @@ -204,7 +204,7 @@ class ShopgoodsController extends RestBaseController
->select()
->toArray();
foreach ($res as &$v){
$v['content'] = strip_tags(cmf_replace_content_file_url(htmlspecialchars_decode($v['content'])));
$v['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($v['content']));
$v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
}
... ...