郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 54ee924644c61b12a561258edcc689fb8b65bf30 1 个父辈 aece1585
1 个管道 的构建 通过 耗费 8 秒

修改评价图片不显示问题

内嵌 并排对比
正在显示 5 个修改的文件 包含 204 行增加 和 242 行删除
... ... @@ -2,8 +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$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,11 +28,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<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="652">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<state relative-caret-position="188">
<caret line="1043" column="14" lean-forward="true" selection-start-line="1043" selection-start-column="14" selection-end-line="1043" selection-end-column="14" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -72,103 +75,28 @@
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31481#0#PHP" expanded="false" />
<element signature="e#31487#31771#0#PHP" expanded="false" />
<element signature="e#31776#32412#0#PHP" expanded="false" />
<element signature="e#32433#32752#0#PHP" expanded="false" />
<element signature="e#32758#33166#0#PHP" expanded="false" />
<element signature="e#33172#33931#0#PHP" expanded="false" />
<element signature="e#33950#34814#0#PHP" expanded="false" />
<element signature="e#34840#35240#0#PHP" expanded="false" />
<element signature="e#35263#35836#0#PHP" expanded="false" />
<element signature="e#35859#36669#0#PHP" expanded="false" />
<element signature="e#36675#37274#0#PHP" expanded="false" />
<element signature="e#37279#38243#0#PHP" expanded="false" />
<element signature="e#38249#38916#0#PHP" expanded="false" />
<element signature="e#38921#39962#0#PHP" expanded="false" />
<element signature="e#39968#40631#0#PHP" expanded="false" />
<element signature="e#40636#41663#0#PHP" expanded="false" />
<element signature="e#41670#42101#0#PHP" expanded="false" />
<element signature="e#42106#42684#0#PHP" expanded="false" />
<element signature="e#42690#43119#0#PHP" expanded="false" />
<element signature="e#43124#43726#0#PHP" expanded="false" />
<element signature="e#43732#44159#0#PHP" expanded="false" />
<element signature="e#44164#44730#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="486">
<caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />
<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#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#4382#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="111" column="13" lean-forward="true" selection-start-line="111" selection-start-column="13" selection-end-line="111" selection-end-column="13" />
<folding>
<element signature="e#324#855#0#PHP" expanded="false" />
<element signature="e#930#1766#0#PHP" expanded="false" />
<element signature="e#1772#1853#0#PHP" expanded="false" />
<element signature="e#3883#4142#0#PHP" expanded="false" />
<element signature="e#4149#4198#0#PHP" expanded="false" />
<element signature="e#4203#4631#0#PHP" expanded="false" />
<element signature="e#4637#4701#0#PHP" expanded="false" />
<element signature="e#4706#5580#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<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" />
<element signature="e#30183#31895#0#PHP" expanded="false" />
<element signature="e#31901#32185#0#PHP" expanded="false" />
<element signature="e#32190#32826#0#PHP" expanded="false" />
<element signature="e#32847#33166#0#PHP" expanded="false" />
<element signature="e#33172#33580#0#PHP" expanded="false" />
<element signature="e#33586#34345#0#PHP" expanded="false" />
<element signature="e#34364#35228#0#PHP" expanded="false" />
<element signature="e#35254#35654#0#PHP" expanded="false" />
<element signature="e#35677#36250#0#PHP" expanded="false" />
<element signature="e#36273#37083#0#PHP" expanded="false" />
<element signature="e#37089#37688#0#PHP" expanded="false" />
<element signature="e#37693#38657#0#PHP" expanded="false" />
<element signature="e#38663#39330#0#PHP" expanded="false" />
<element signature="e#39335#40376#0#PHP" expanded="false" />
<element signature="e#40382#41045#0#PHP" expanded="false" />
<element signature="e#41050#42077#0#PHP" expanded="false" />
<element signature="e#42084#42515#0#PHP" expanded="false" />
<element signature="e#42520#43098#0#PHP" expanded="false" />
<element signature="e#43104#43533#0#PHP" expanded="false" />
<element signature="e#43538#44140#0#PHP" expanded="false" />
<element signature="e#44146#44573#0#PHP" expanded="false" />
<element signature="e#44578#45144#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -235,16 +163,16 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<option value="$PROJECT_DIR$/api/index/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/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.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" />
</list>
</option>
</component>
... ... @@ -262,11 +190,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="218" />
<option name="y" value="394" />
<component name="ProjectFrameBounds">
<option name="x" value="146" />
<option name="y" value="76" />
<option name="width" value="1700" />
<option name="height" value="1051" />
<option name="height" value="1040" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -413,15 +341,15 @@
<workItem from="1575431441427" duration="8414000" />
<workItem from="1575444399653" duration="12810000" />
<workItem from="1575462840839" duration="250000" />
<workItem from="1575506248144" duration="10390000" />
<workItem from="1575506248144" duration="15103000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="477099000" />
<option name="totallyTimeSpent" value="481812000" />
</component>
<component name="ToolWindowManager">
<frame x="218" y="394" width="1700" height="1051" extended-state="1" />
<frame x="146" y="76" 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.16158536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -475,13 +403,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="543">
... ... @@ -684,13 +605,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="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
... ... @@ -705,20 +619,6 @@
</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="402">
<caret line="128" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="204" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2228">
<caret line="114" column="63" lean-forward="false" selection-start-line="114" selection-start-column="63" selection-end-line="114" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6">
... ... @@ -726,13 +626,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
<provider selected="true" editor-type-id="images">
<state />
... ... @@ -891,10 +784,109 @@
</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">
<caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="314">
<caret line="61" column="0" lean-forward="true" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
<folding>
<element signature="e#324#855#0#PHP" expanded="false" />
<element signature="e#861#925#0#PHP" expanded="false" />
<element signature="e#930#1766#0#PHP" expanded="false" />
<element signature="e#1772#1853#0#PHP" expanded="false" />
<element signature="e#1858#3848#0#PHP" expanded="false" />
<element signature="e#3855#3878#0#PHP" expanded="false" />
<element signature="e#3883#4142#0#PHP" expanded="false" />
<element signature="e#4149#4198#0#PHP" expanded="false" />
<element signature="e#4203#4631#0#PHP" expanded="false" />
<element signature="e#4637#4701#0#PHP" expanded="false" />
<element signature="e#4706#5580#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="486">
<caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />
<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#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#4382#0#PHP" expanded="false" />
</folding>
</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">
<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 />
</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">
<caret line="106" column="70" lean-forward="true" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="96" column="70" lean-forward="true" selection-start-line="96" selection-start-column="70" selection-end-line="96" selection-end-column="70" />
<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="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3591#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
<folding>
<element signature="e#243#1652#0#PHP" expanded="false" />
<element signature="e#1669#3046#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="652">
<caret line="549" column="5" lean-forward="true" selection-start-line="549" selection-start-column="5" selection-end-line="549" selection-end-column="5" />
<state relative-caret-position="188">
<caret line="1043" column="14" lean-forward="true" selection-start-line="1043" selection-start-column="14" selection-end-line="1043" selection-end-column="14" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
... ... @@ -937,78 +929,28 @@
<element signature="e#28636#29060#0#PHP" expanded="false" />
<element signature="e#29065#29676#0#PHP" expanded="false" />
<element signature="e#29682#30178#0#PHP" expanded="false" />
<element signature="e#30183#31481#0#PHP" expanded="false" />
<element signature="e#31487#31771#0#PHP" expanded="false" />
<element signature="e#31776#32412#0#PHP" expanded="false" />
<element signature="e#32433#32752#0#PHP" expanded="false" />
<element signature="e#32758#33166#0#PHP" expanded="false" />
<element signature="e#33172#33931#0#PHP" expanded="false" />
<element signature="e#33950#34814#0#PHP" expanded="false" />
<element signature="e#34840#35240#0#PHP" expanded="false" />
<element signature="e#35263#35836#0#PHP" expanded="false" />
<element signature="e#35859#36669#0#PHP" expanded="false" />
<element signature="e#36675#37274#0#PHP" expanded="false" />
<element signature="e#37279#38243#0#PHP" expanded="false" />
<element signature="e#38249#38916#0#PHP" expanded="false" />
<element signature="e#38921#39962#0#PHP" expanded="false" />
<element signature="e#39968#40631#0#PHP" expanded="false" />
<element signature="e#40636#41663#0#PHP" expanded="false" />
<element signature="e#41670#42101#0#PHP" expanded="false" />
<element signature="e#42106#42684#0#PHP" expanded="false" />
<element signature="e#42690#43119#0#PHP" expanded="false" />
<element signature="e#43124#43726#0#PHP" expanded="false" />
<element signature="e#43732#44159#0#PHP" expanded="false" />
<element signature="e#44164#44730#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</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">
<caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
<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="486">
<caret line="100" column="42" lean-forward="false" selection-start-line="100" selection-start-column="42" selection-end-line="100" selection-end-column="42" />
<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#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#4382#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="111" column="13" lean-forward="true" selection-start-line="111" selection-start-column="13" selection-end-line="111" selection-end-column="13" />
<folding>
<element signature="e#324#855#0#PHP" expanded="false" />
<element signature="e#930#1766#0#PHP" expanded="false" />
<element signature="e#1772#1853#0#PHP" expanded="false" />
<element signature="e#3883#4142#0#PHP" expanded="false" />
<element signature="e#4149#4198#0#PHP" expanded="false" />
<element signature="e#4203#4631#0#PHP" expanded="false" />
<element signature="e#4637#4701#0#PHP" expanded="false" />
<element signature="e#4706#5580#0#PHP" expanded="false" />
<element signature="e#30183#31895#0#PHP" expanded="false" />
<element signature="e#31901#32185#0#PHP" expanded="false" />
<element signature="e#32190#32826#0#PHP" expanded="false" />
<element signature="e#32847#33166#0#PHP" expanded="false" />
<element signature="e#33172#33580#0#PHP" expanded="false" />
<element signature="e#33586#34345#0#PHP" expanded="false" />
<element signature="e#34364#35228#0#PHP" expanded="false" />
<element signature="e#35254#35654#0#PHP" expanded="false" />
<element signature="e#35677#36250#0#PHP" expanded="false" />
<element signature="e#36273#37083#0#PHP" expanded="false" />
<element signature="e#37089#37688#0#PHP" expanded="false" />
<element signature="e#37693#38657#0#PHP" expanded="false" />
<element signature="e#38663#39330#0#PHP" expanded="false" />
<element signature="e#39335#40376#0#PHP" expanded="false" />
<element signature="e#40382#41045#0#PHP" expanded="false" />
<element signature="e#41050#42077#0#PHP" expanded="false" />
<element signature="e#42084#42515#0#PHP" expanded="false" />
<element signature="e#42520#43098#0#PHP" expanded="false" />
<element signature="e#43104#43533#0#PHP" expanded="false" />
<element signature="e#43538#44140#0#PHP" expanded="false" />
<element signature="e#44146#44573#0#PHP" expanded="false" />
<element signature="e#44578#45144#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -963,33 +963,49 @@ class UserController extends RestBaseController
if(empty($order_id)){
$this->error('缺少必要参数');
}
//对应的数据加入回收员已完成订单中
$data['order_id'] = $order_id;
$data['user_id'] = $user_id;
$data['create_time'] = time();
$data['status'] = 2;
Db::name('subscribe')
->where('id',$order_id)
->update(['status'=>2,'get_integral'=>$get_integral]);
//查询我的积分信息
$info = Db::name('integral')
->where('user_id',$user_id)
->find();
$res['num'] = $info['num'] + 1;
$res['add_total'] = $info['add_total'] + $get_integral;
$res['now_integral'] = $info['now_integral'] + $get_integral;
Db::name('integral')
->where('user_id',$user_id)
->update($res);
$info['user_id'] = $user_id;
$info['total'] = $get_integral;
$info['create_time'] = time();
$info['type'] = 5;
Db::name('detail')->insertGetId($info);
$res = Db::name('collector')
->insertGetId($data);
if($res){
$this->success('接单成功');
}else{
$this->error('sql语句错误');
//添加对应的积分明细
$detail['user_id'] = $user_id;
$detail['total'] = $get_integral;
$detail['create_time'] = time();
$detail['type'] = 5;
// 启动事务
Db::startTrans();
try{
$res = Db::name('subscribe')
->where('id',$order_id)
->update(['status'=>2,'get_integral'=>$get_integral]);
$integral = Db::name('integral')
->where('user_id',$user_id)
->update($res);
$detail = Db::name('detail')->insertGetId($detail);
//对应的数据加入回收员已完成订单中
$collector = Db::name('collector')
->insertGetId($data);
if($res && $integral && $detail && $collector){
// 提交事务
Db::commit();
}
$this->success('成功');
} catch (\Exception $e) {
// 回滚事务
Db::rollback();
$this->success('sql运行失败');
}
}
... ...
... ... @@ -55,19 +55,22 @@ class ShoporderController extends AdminBaseController
$id = $this->request->param('id');
if($this->request->isPost()){
$param = $this->request->param();
//没有任何状态的改变 未发货
if($param['status'] == 1){
$this->success('更新成功!');
}
//如果已发货 但是 快递单号是空状态
if($param['status'] == 2 && empty($param['express_num'])){
$this->error('请填写快递单号');
}
//如果已发货 并且 快递单号不是空状态
if($param['status'] == 2 && !empty($param['express_num'])){
Db::name('shoporder')
->where('id',$id)
->update($param);
Db::name('shoporder')
->where('id',$id)
->update(['orderstatus'=>2]);
->update(['orderstatus'=>2,'fa_time'=>time()]);
$this->success('更新成功!');
}else{
Db::name('shoporder')
... ...
... ... @@ -57,8 +57,8 @@ class SubhomeController extends AdminBaseController
$param = $this->request->param();
$data = Db::name('subhome')
->where('id',$id)
->update($param);
if($data){
->update(['status'=>$param['status']]);
if(!empty($data)){
$this->success('更新成功!');
}else{
$this->error('sql运行失败');
... ...
... ... @@ -94,6 +94,7 @@
<label><input type="radio" class="status" name="status" value="3" id="status"
<eq name="$data.status" value="3">checked</eq>
/>已完成 </label>
<input type="hidden" name="id" value="{$data.id}">
</td>
</tr>
<tr>
... ...