郭盛 / scrap · 提交

转到一个项目

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

修改后台坐标问题

内嵌 并排对比
正在显示 4 个修改的文件 包含 216 行增加 和 231 行删除
... ... @@ -4,6 +4,8 @@
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,98 +27,15 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<state relative-caret-position="400">
<caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" 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#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="210">
<caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" />
<folding>
<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#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29709#0#PHP" expanded="false" />
<element signature="e#29715#30139#0#PHP" expanded="false" />
<element signature="e#30144#30755#0#PHP" expanded="false" />
<element signature="e#30761#31257#0#PHP" expanded="false" />
<element signature="e#31262#34624#0#PHP" expanded="false" />
<element signature="e#32064#33191#0#PHP" expanded="false" />
<element signature="e#34630#34914#0#PHP" expanded="false" />
<element signature="e#34919#35555#0#PHP" expanded="false" />
<element signature="e#35576#35895#0#PHP" expanded="false" />
<element signature="e#35901#36309#0#PHP" expanded="false" />
<element signature="e#36315#37074#0#PHP" expanded="false" />
<element signature="e#37093#37957#0#PHP" expanded="false" />
<element signature="e#37983#38383#0#PHP" expanded="false" />
<element signature="e#38406#38979#0#PHP" expanded="false" />
<element signature="e#39002#39812#0#PHP" expanded="false" />
<element signature="e#39818#40417#0#PHP" expanded="false" />
<element signature="e#40422#41386#0#PHP" expanded="false" />
<element signature="e#41392#42059#0#PHP" expanded="false" />
<element signature="e#42064#43105#0#PHP" expanded="false" />
<element signature="e#43111#43774#0#PHP" expanded="false" />
<element signature="e#43779#44806#0#PHP" expanded="false" />
<element signature="e#44813#45244#0#PHP" expanded="false" />
<element signature="e#45249#45827#0#PHP" expanded="false" />
<element signature="e#45833#46262#0#PHP" expanded="false" />
<element signature="e#46267#46869#0#PHP" expanded="false" />
<element signature="e#46875#47302#0#PHP" expanded="false" />
<element signature="e#47307#47873#0#PHP" expanded="false" />
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -177,7 +96,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$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
... ... @@ -188,11 +106,12 @@
<option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<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$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
</list>
</option>
</component>
... ... @@ -210,11 +129,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="483" />
<option name="y" value="69" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="237" />
<option name="y" value="72" />
<option name="width" value="1618" />
<option name="height" value="1024" />
<option name="height" value="1008" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -231,6 +150,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
... ... @@ -239,29 +159,10 @@
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" 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" />
</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" />
</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="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -372,18 +273,17 @@
<workItem from="1576027263250" duration="3000" />
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="7947000" />
<workItem from="1576066696521" duration="71000" />
<workItem from="1576066696521" duration="5462000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="537884000" />
<option name="totallyTimeSpent" value="543275000" />
</component>
<component name="ToolWindowManager">
<frame x="483" y="69" width="1618" height="1024" extended-state="0" />
<editor active="true" />
<frame x="237" y="72" width="1618" height="1008" extended-state="1" />
<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.18292683" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18292683" 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" />
... ... @@ -429,7 +329,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="12" />
<option name="time" value="13" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -535,13 +435,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/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$/app/admin/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -584,13 +477,6 @@
</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">
<caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -675,24 +561,11 @@
</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="229">
<caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
</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="479">
<caret line="125" column="29" lean-forward="false" selection-start-line="125" selection-start-column="29" selection-end-line="125" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -714,6 +587,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#130#169#0#PHP" expanded="false" />
<element signature="e#262#1148#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -745,17 +622,24 @@
</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="325">
<caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="62" selection-end-column="31" />
</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" />
<folding>
<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#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" />
</folding>
</state>
</provider>
</entry>
... ... @@ -763,6 +647,9 @@
<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" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -770,6 +657,30 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#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#13484#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -791,10 +702,40 @@
</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="1259">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
<folding>
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
</folding>
</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="525">
<caret line="91" column="26" lean-forward="false" selection-start-line="91" selection-start-column="26" selection-end-line="91" selection-end-column="26" />
<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#3059#0#PHP" expanded="false" />
<element signature="e#3065#3374#0#PHP" expanded="false" />
<element signature="e#3379#5269#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#6334#6587#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="210">
<caret line="953" column="7" lean-forward="true" selection-start-line="953" selection-start-column="7" selection-end-line="953" selection-end-column="7" />
<state relative-caret-position="268">
<caret line="595" column="0" lean-forward="true" selection-start-line="595" selection-start-column="0" selection-end-line="595" selection-end-column="0" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -811,57 +752,94 @@
<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#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29709#0#PHP" expanded="false" />
<element signature="e#29715#30139#0#PHP" expanded="false" />
<element signature="e#30144#30755#0#PHP" expanded="false" />
<element signature="e#30761#31257#0#PHP" expanded="false" />
<element signature="e#31262#34624#0#PHP" expanded="false" />
<element signature="e#32064#33191#0#PHP" expanded="false" />
<element signature="e#34630#34914#0#PHP" expanded="false" />
<element signature="e#34919#35555#0#PHP" expanded="false" />
<element signature="e#35576#35895#0#PHP" expanded="false" />
<element signature="e#35901#36309#0#PHP" expanded="false" />
<element signature="e#36315#37074#0#PHP" expanded="false" />
<element signature="e#37093#37957#0#PHP" expanded="false" />
<element signature="e#37983#38383#0#PHP" expanded="false" />
<element signature="e#38406#38979#0#PHP" expanded="false" />
<element signature="e#39002#39812#0#PHP" expanded="false" />
<element signature="e#39818#40417#0#PHP" expanded="false" />
<element signature="e#40422#41386#0#PHP" expanded="false" />
<element signature="e#41392#42059#0#PHP" expanded="false" />
<element signature="e#42064#43105#0#PHP" expanded="false" />
<element signature="e#43111#43774#0#PHP" expanded="false" />
<element signature="e#43779#44806#0#PHP" expanded="false" />
<element signature="e#44813#45244#0#PHP" expanded="false" />
<element signature="e#45249#45827#0#PHP" expanded="false" />
<element signature="e#45833#46262#0#PHP" expanded="false" />
<element signature="e#46267#46869#0#PHP" expanded="false" />
<element signature="e#46875#47302#0#PHP" expanded="false" />
<element signature="e#47307#47873#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#15027#0#PHP" expanded="false" />
<element signature="e#15033#15489#0#PHP" expanded="false" />
<element signature="e#15494#17562#0#PHP" expanded="false" />
<element signature="e#17585#17940#0#PHP" expanded="false" />
<element signature="e#17946#18659#0#PHP" expanded="false" />
<element signature="e#18664#20121#0#PHP" expanded="false" />
<element signature="e#20127#20588#0#PHP" expanded="false" />
<element signature="e#20593#23720#0#PHP" expanded="false" />
<element signature="e#23726#24335#0#PHP" expanded="false" />
<element signature="e#24340#25625#0#PHP" expanded="false" />
<element signature="e#25631#25988#0#PHP" expanded="false" />
<element signature="e#25993#26905#0#PHP" expanded="false" />
<element signature="e#26911#27263#0#PHP" expanded="false" />
<element signature="e#27268#28377#0#PHP" expanded="false" />
<element signature="e#28383#28738#0#PHP" expanded="false" />
<element signature="e#28743#30170#0#PHP" expanded="false" />
<element signature="e#30176#30600#0#PHP" expanded="false" />
<element signature="e#30605#31216#0#PHP" expanded="false" />
<element signature="e#31222#31718#0#PHP" expanded="false" />
<element signature="e#31723#35085#0#PHP" expanded="false" />
<element signature="e#32525#33652#0#PHP" expanded="false" />
<element signature="e#35091#35375#0#PHP" expanded="false" />
<element signature="e#35380#36016#0#PHP" expanded="false" />
<element signature="e#36037#36356#0#PHP" expanded="false" />
<element signature="e#36362#36770#0#PHP" expanded="false" />
<element signature="e#36776#37535#0#PHP" expanded="false" />
<element signature="e#37554#38418#0#PHP" expanded="false" />
<element signature="e#38444#38844#0#PHP" expanded="false" />
<element signature="e#38867#39440#0#PHP" expanded="false" />
<element signature="e#39463#40273#0#PHP" expanded="false" />
<element signature="e#40279#40878#0#PHP" expanded="false" />
<element signature="e#40883#41847#0#PHP" expanded="false" />
<element signature="e#41853#42520#0#PHP" expanded="false" />
<element signature="e#42525#43566#0#PHP" expanded="false" />
<element signature="e#43572#44235#0#PHP" expanded="false" />
<element signature="e#44240#45267#0#PHP" expanded="false" />
<element signature="e#45274#45705#0#PHP" expanded="false" />
<element signature="e#45710#46288#0#PHP" expanded="false" />
<element signature="e#46294#46723#0#PHP" expanded="false" />
<element signature="e#46728#47330#0#PHP" expanded="false" />
<element signature="e#47336#47763#0#PHP" expanded="false" />
<element signature="e#47768#48334#0#PHP" expanded="false" />
</folding>
</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">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2065#2422#0#PHP" expanded="false" />
<element signature="e#4089#4555#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/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" />
<folding>
<element signature="e#266#1001#0#PHP" expanded="false" />
<element signature="e#1016#2171#0#PHP" expanded="false" />
<element signature="e#2186#3928#0#PHP" expanded="false" />
<element signature="e#3943#4413#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="400">
<caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -271,6 +271,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',0)
->field('id,num,create_time,sub_time,attr_id')
->order('id desc')
->select()
->toArray();
$res = $this->r_foreach($data);
... ... @@ -281,6 +282,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',1)
->field('id,num,create_time,sub_time,attr_id')
->order('id desc')
->select()
->toArray();
$res = $this->r_foreach($data);
... ... @@ -291,6 +293,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',2)
->field('id,num,create_time,sub_time,attr_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -385,6 +388,7 @@ class UserController extends RestBaseController
$list = Db::name('shoporder')
->where('id',$id)
->find();
$info['total'] = $list['total'];
$info['type'] = 7;
$info['create_time'] = time();
... ... @@ -396,14 +400,10 @@ class UserController extends RestBaseController
$now_integral = $login['now_integral'] + $list['total'];
$update_time = time();
Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
$data = Db::name('shoporder')
Db::name('shoporder')
->where('id',$id)
->delete();
if($data){
$this->success('SUCCESS');
}else{
$this->error('sql语句执行失败');
}
$this->success('SUCCESS');
}
/**
... ... @@ -439,14 +439,10 @@ class UserController extends RestBaseController
$now_integral = $login['now_integral'] + $list['total'];
$update_time = time();
Db::name('integral')->where('user_id',$user_id)->update(['now_integral'=>$now_integral,'update_time'=>$update_time]);
$data = Db::name('subhome')
Db::name('subhome')
->where('id',$id)
->delete();
if($data){
$this->success('SUCCESS');
}else{
$this->error('sql语句执行失败');
}
$this->success('SUCCESS');
}
/**
... ... @@ -476,14 +472,15 @@ class UserController extends RestBaseController
$user_id = $this->getUserId();
//接收订单ID
$id = $this->request->param('order_id');
if(empty($id)){
$this->error(['code'=>41006,'msg'=>'缺少必要参数']);
}
$res = Db::name('subscribe')
->where('id',$id)
->find();
$data['status'] = $res['status'];
if(empty($res)){
$this->error(['code'=>2,'msg'=>'数据错误']);
}
$data['num'] = $res['num'];
$data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
$recycle_id = Db::name('recycle')->where('id',$res['recycle_id'])->field('address')->find();
... ... @@ -502,7 +499,12 @@ class UserController extends RestBaseController
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
$data['get_integral'] = $res['get_integral'];
$serve = Db::name('recyclefee')->where('id',1)->field('fee')->find();
$data['serve'] = $serve['fee'];
$data['status'] = $res['status'];
if($data['status'] == 1 || $data['status'] == 0){
$data['serve'] = $serve['fee']."%";
}else{
$data['serve'] = ceil($data['get_integral']*(5/100));
}
$this->success('SUCCESS',$data);
}
... ... @@ -535,6 +537,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('orderstatus',1)
->field('id,number,create_time,num,shopgoods_id')
->order('id desc')
->select()
->toArray();
$data = $this->s_foreach($data);
... ... @@ -545,6 +548,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('orderstatus',2)
->field('id,number,create_time,num,shopgoods_id')
->order('id desc')
->select()
->toArray();
$data = $this->s_foreach($data);
... ... @@ -555,6 +559,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('orderstatus',3)
->field('id,number,create_time,num,shopgoods_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -678,6 +683,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',1)
->field('id,num,create_time,sub_time,home_id,service_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -695,6 +701,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',2)
->field('id,num,create_time,sub_time,home_id,service_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -712,6 +719,7 @@ class UserController extends RestBaseController
->where('user_id',$user_id)
->where('status',3)
->field('id,num,create_time,sub_time,home_id,service_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -809,6 +817,7 @@ class UserController extends RestBaseController
$data = Db::name('subscribe')
->where($where)
->field('id,num,create_time,sub_time,attr_id')
->order('id desc')
->select()
->toArray();
foreach ($data as &$v){
... ... @@ -850,6 +859,7 @@ class UserController extends RestBaseController
$list = Db::name('collector')
->where('user_id',$user_id)
->where('status',1)
->order('id desc')
->column('order_id');
foreach ($list as &$val){
$val = Db::name('subscribe')
... ... @@ -898,6 +908,7 @@ class UserController extends RestBaseController
$list = Db::name('collector')
->where('user_id',$user_id)
->where('status',2)
->order('id desc')
->column('order_id');
foreach ($list as &$val){
... ...
... ... @@ -56,16 +56,15 @@ class PointController extends AdminBaseController
$this->error($validate->getError());
}
//获取经纬度
$url = 'https://apis.map.qq.com/ws/geocoder/v1/?address='.$param['address'].'&key=LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH';
$url = "https://apis.map.qq.com/ws/geocoder/v1/?address=$param[address]&key=GUNBZ-MJZCU-NRTVH-2JYRC-4HFAH-44FWM";
$result=file_get_contents($url);
$res=json_decode($result,true);
print_r($res);exit;
//经度
$param['lng']= $res['result']['location']['lng'];
//纬度
$param['lat']= $res['result']['location']['lat'];
Db::name('point')
->insert($param);
$this->success('添加成功！','index');
... ... @@ -74,8 +73,6 @@ class PointController extends AdminBaseController
return $this->fetch();
}
}
public function map()
{
$location = $this->request->param('location');
... ... @@ -107,7 +104,7 @@ class PointController extends AdminBaseController
$this->error($validate->getError());
}
//获取经纬度
$url='http://api.map.baidu.com/geocoder/v2/?address='.$param['address'].'&output=json&ak=cIGo3zYrN4WOEnMDSbxynUi9M20i9IgY';
$url = "https://apis.map.qq.com/ws/geocoder/v1/?address=$param[address]&key=GUNBZ-MJZCU-NRTVH-2JYRC-4HFAH-44FWM";
$result=file_get_contents($url);
$res=json_decode($result,true);
//经度
... ...
... ... @@ -115,5 +115,4 @@ class ShoporderController extends AdminBaseController
}
}
}
}
\ No newline at end of file
... ...