郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 96928507798ae7d9f4f4372dc794de98eba65b1d 1 个父辈 e46d47ef
1 个管道 的构建 通过 耗费 10 秒

修改下订单留言备注非必填

内嵌 并排对比
正在显示 5 个修改的文件 包含 281 行增加 和 134 行删除
... ... @@ -2,7 +2,11 @@
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,21 +28,149 @@
</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="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" />
<state relative-caret-position="911">
<caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
<folding>
<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#3049#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#6355#6608#0#PHP" expanded="false" />
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#9088#0#PHP" expanded="false" />
<element signature="e#9111#9642#0#PHP" expanded="false" />
<element signature="e#9648#9928#0#PHP" expanded="false" />
<element signature="e#9933#10325#0#PHP" expanded="false" />
<element signature="e#10331#10615#0#PHP" expanded="false" />
<element signature="e#10620#11565#0#PHP" expanded="false" />
<element signature="e#11571#11859#0#PHP" expanded="false" />
<element signature="e#11864#12803#0#PHP" expanded="false" />
<element signature="e#12809#13390#0#PHP" expanded="false" />
<element signature="e#13395#14945#0#PHP" expanded="false" />
<element signature="e#14951#15407#0#PHP" expanded="false" />
<element signature="e#15412#17480#0#PHP" expanded="false" />
<element signature="e#17503#17858#0#PHP" expanded="false" />
<element signature="e#17864#18605#0#PHP" expanded="false" />
<element signature="e#18610#20063#0#PHP" expanded="false" />
<element signature="e#20069#20530#0#PHP" expanded="false" />
<element signature="e#20535#23662#0#PHP" expanded="false" />
<element signature="e#23668#24277#0#PHP" expanded="false" />
<element signature="e#24282#25567#0#PHP" expanded="false" />
<element signature="e#25573#25930#0#PHP" expanded="false" />
<element signature="e#25935#26918#0#PHP" expanded="false" />
<element signature="e#26924#27276#0#PHP" expanded="false" />
<element signature="e#27281#28390#0#PHP" expanded="false" />
<element signature="e#28396#28751#0#PHP" expanded="false" />
<element signature="e#28756#30183#0#PHP" expanded="false" />
<element signature="e#30189#30613#0#PHP" expanded="false" />
<element signature="e#30618#31229#0#PHP" expanded="false" />
<element signature="e#31235#31731#0#PHP" expanded="false" />
<element signature="e#31736#35394#0#PHP" expanded="false" />
<element signature="e#32548#33675#0#PHP" expanded="false" />
<element signature="e#35400#35684#0#PHP" expanded="false" />
<element signature="e#35689#36368#0#PHP" expanded="false" />
<element signature="e#36389#36708#0#PHP" expanded="false" />
<element signature="e#36714#37122#0#PHP" expanded="false" />
<element signature="e#37128#37887#0#PHP" expanded="false" />
<element signature="e#37906#38770#0#PHP" expanded="false" />
<element signature="e#38796#39196#0#PHP" expanded="false" />
<element signature="e#39219#39792#0#PHP" expanded="false" />
<element signature="e#39815#40625#0#PHP" expanded="false" />
<element signature="e#40631#41230#0#PHP" expanded="false" />
<element signature="e#41235#42199#0#PHP" expanded="false" />
<element signature="e#42205#42872#0#PHP" expanded="false" />
<element signature="e#42877#43918#0#PHP" expanded="false" />
<element signature="e#43924#44587#0#PHP" expanded="false" />
<element signature="e#44592#45619#0#PHP" expanded="false" />
<element signature="e#45626#46057#0#PHP" expanded="false" />
<element signature="e#46062#46640#0#PHP" expanded="false" />
<element signature="e#46646#47075#0#PHP" expanded="false" />
<element signature="e#47080#47682#0#PHP" expanded="false" />
<element signature="e#47688#48115#0#PHP" expanded="false" />
<element signature="e#48120#48686#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4961#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="630">
<caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
<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#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13417#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="249">
<caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4697#0#PHP" expanded="false" />
<element signature="e#4703#5016#0#PHP" expanded="false" />
<element signature="e#5021#5396#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -101,8 +233,6 @@
<option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
... ... @@ -112,9 +242,11 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/jifendetail.html" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.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/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
</list>
</option>
</component>
... ... @@ -133,10 +265,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="108" />
<option name="y" value="79" />
<option name="x" value="210" />
<option name="y" value="58" />
<option name="width" value="1618" />
<option name="height" value="1096" />
<option name="height" value="1092" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -153,6 +285,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -182,7 +315,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
... ... @@ -301,18 +433,22 @@
<workItem from="1576298110450" duration="8414000" />
<workItem from="1576455946584" duration="1141000" />
<workItem from="1576459063836" duration="389000" />
<workItem from="1576463908857" duration="1749000" />
<workItem from="1576463908857" duration="1900000" />
<workItem from="1576498945104" duration="2021000" />
<workItem from="1576501257741" duration="90000" />
<workItem from="1576549607137" duration="1339000" />
<workItem from="1576722212421" duration="195000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="575781000" />
<option name="totallyTimeSpent" value="579577000" />
</component>
<component name="ToolWindowManager">
<frame x="108" y="79" width="1618" height="1096" extended-state="1" />
<frame x="210" y="58" width="1618" height="1092" extended-state="1" />
<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.19640565" 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.20667523" 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" />
... ... @@ -358,18 +494,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="15" />
<option name="time" value="18" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
... ... @@ -468,13 +597,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-689">
<caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="686">
... ... @@ -545,20 +667,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="139">
<caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
</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="690">
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
... ... @@ -689,63 +797,61 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
<folding>
<element signature="e#324#941#0#PHP" expanded="false" />
<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#4852#5588#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-804">
<caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />
<folding>
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="400">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="15" lean-forward="true" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
<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="125">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<state relative-caret-position="556">
<caret line="456" column="5" lean-forward="false" selection-start-line="456" selection-start-column="5" selection-end-line="456" selection-end-column="5" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#5028#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6508#0#PHP" expanded="false" />
<element signature="e#6514#6857#0#PHP" expanded="false" />
<element signature="e#6862#7343#0#PHP" expanded="false" />
<element signature="e#7349#7640#0#PHP" expanded="false" />
<element signature="e#7645#7996#0#PHP" expanded="false" />
<element signature="e#8002#8355#0#PHP" expanded="false" />
<element signature="e#8360#8765#0#PHP" expanded="false" />
<element signature="e#8771#9154#0#PHP" expanded="false" />
<element signature="e#9159#9826#0#PHP" expanded="false" />
<element signature="e#9832#10276#0#PHP" expanded="false" />
<element signature="e#10281#11128#0#PHP" expanded="false" />
<element signature="e#11134#11402#0#PHP" expanded="false" />
<element signature="e#11407#11879#0#PHP" expanded="false" />
<element signature="e#11885#12191#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="930">
<caret line="987" column="5" lean-forward="true" selection-start-line="987" selection-start-column="5" selection-end-line="987" selection-end-column="5" />
<state relative-caret-position="911">
<caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
... ... @@ -792,44 +898,90 @@
<element signature="e#31736#35394#0#PHP" expanded="false" />
<element signature="e#32548#33675#0#PHP" expanded="false" />
<element signature="e#35400#35684#0#PHP" expanded="false" />
<element signature="e#35689#36325#0#PHP" expanded="false" />
<element signature="e#36346#36665#0#PHP" expanded="false" />
<element signature="e#36671#37079#0#PHP" expanded="false" />
<element signature="e#37085#37844#0#PHP" expanded="false" />
<element signature="e#37863#38727#0#PHP" expanded="false" />
<element signature="e#38753#39153#0#PHP" expanded="false" />
<element signature="e#39176#39749#0#PHP" expanded="false" />
<element signature="e#39772#40582#0#PHP" expanded="false" />
<element signature="e#40588#41187#0#PHP" expanded="false" />
<element signature="e#41192#42156#0#PHP" expanded="false" />
<element signature="e#42162#42829#0#PHP" expanded="false" />
<element signature="e#42834#43875#0#PHP" expanded="false" />
<element signature="e#43881#44544#0#PHP" expanded="false" />
<element signature="e#44549#45576#0#PHP" expanded="false" />
<element signature="e#45583#46014#0#PHP" expanded="false" />
<element signature="e#46019#46597#0#PHP" expanded="false" />
<element signature="e#46603#47032#0#PHP" expanded="false" />
<element signature="e#47037#47639#0#PHP" expanded="false" />
<element signature="e#47645#48072#0#PHP" expanded="false" />
<element signature="e#48077#48643#0#PHP" expanded="false" />
<element signature="e#35689#36368#0#PHP" expanded="false" />
<element signature="e#36389#36708#0#PHP" expanded="false" />
<element signature="e#36714#37122#0#PHP" expanded="false" />
<element signature="e#37128#37887#0#PHP" expanded="false" />
<element signature="e#37906#38770#0#PHP" expanded="false" />
<element signature="e#38796#39196#0#PHP" expanded="false" />
<element signature="e#39219#39792#0#PHP" expanded="false" />
<element signature="e#39815#40625#0#PHP" expanded="false" />
<element signature="e#40631#41230#0#PHP" expanded="false" />
<element signature="e#41235#42199#0#PHP" expanded="false" />
<element signature="e#42205#42872#0#PHP" expanded="false" />
<element signature="e#42877#43918#0#PHP" expanded="false" />
<element signature="e#43924#44587#0#PHP" expanded="false" />
<element signature="e#44592#45619#0#PHP" expanded="false" />
<element signature="e#45626#46057#0#PHP" expanded="false" />
<element signature="e#46062#46640#0#PHP" expanded="false" />
<element signature="e#46646#47075#0#PHP" expanded="false" />
<element signature="e#47080#47682#0#PHP" expanded="false" />
<element signature="e#47688#48115#0#PHP" expanded="false" />
<element signature="e#48120#48686#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4961#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="630">
<caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
<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#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13417#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="509">
<caret line="204" column="34" lean-forward="true" selection-start-line="204" selection-start-column="34" selection-end-line="204" selection-end-column="34" />
<state relative-caret-position="249">
<caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
<folding>
<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#3049#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#6355#6608#0#PHP" expanded="false" />
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4697#0#PHP" expanded="false" />
<element signature="e#4703#5016#0#PHP" expanded="false" />
<element signature="e#5021#5396#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -373,7 +373,6 @@ class HomeController extends RestBaseController
'service_id'=>'require',
'total'=>'require',
'sub_time'=>'require',
'content'=>'require'
]);
$validate->message([
'homeaddress_id'=>'预约家政地址不能为空',
... ... @@ -381,7 +380,6 @@ class HomeController extends RestBaseController
'service_id'=>'服务类目不能为空',
'total'=>'所需积分不能为空',
'sub_time'=>'预约时间不能为空',
'content'=>'留言备注不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
... ...
... ... @@ -414,7 +414,6 @@ class ShopgoodsController extends RestBaseController
'total'=>'require',
'goods_money'=>'require',
'express'=>'require',
'content'=>'require'
]);
$validate->message([
'shoprecycle_id'=>'收货地址不能为空',
... ... @@ -423,7 +422,6 @@ class ShopgoodsController extends RestBaseController
'goods_money'=>'商品金额不能为空',
'total'=>'总价不能为空',
'express'=>'配送方式不能为空',
'content'=>'留言备注不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
... ...
... ... @@ -163,14 +163,12 @@ class SubscribeController extends RestBaseController
'image' => 'require',
'attr_id'=>'require',
'sub_time'=>'require',
'content'=>'require'
]);
$validate->message([
'recycle_id'=>'上门回收地址不能为空',
'image'=>'图片不能为空',
'attr_id'=>'回收商品不能为空',
'sub_time'=>'预约时间不能为空',
'content'=>'留言备注不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
... ...
... ... @@ -1124,6 +1124,7 @@ class UserController extends RestBaseController
{
$user_id = $this->getUserId();
$url = $this->request->param('route');
$url .= $url.'?user_id='.$user_id;
if(empty($url)){
$this->error(['code'=>40005,'msg'=>'缺少必要参数']);
}
... ...