郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 53d1284d5b487f43cc7d7a85403cf0d9eb2ceb5a 1 个父辈 6740aab3
1 个管道 的构建 通过 耗费 6 秒

修改授权书

内嵌 并排对比
正在显示 3 个修改的文件 包含 538 行增加 和 324 行删除
... ... @@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -16,8 +18,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="1771" column="0" lean-forward="true" selection-start-line="1771" selection-start-column="0" selection-end-line="1771" selection-end-column="0" />
<state relative-caret-position="567">
<caret line="1975" column="13" lean-forward="true" selection-start-line="1975" selection-start-column="13" selection-end-line="1975" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -89,22 +91,230 @@
<element signature="e#62397#62736#1#PHP" expanded="false" />
<element signature="e#62766#63120#1#PHP" expanded="false" />
<element signature="e#63959#64651#0#PHP" expanded="false" />
<element signature="e#64656#68103#0#PHP" expanded="false" />
<element signature="e#64776#64913#1#PHP" expanded="false" />
<element signature="e#64943#65083#1#PHP" expanded="false" />
<element signature="e#65094#65185#0#PHP" expanded="false" />
<element signature="e#68109#68618#0#PHP" expanded="false" />
<element signature="e#68623#69295#0#PHP" expanded="false" />
<element signature="e#65593#65839#0#PHP" expanded="false" />
<element signature="e#66449#66617#0#PHP" expanded="false" />
<element signature="e#66695#67706#0#PHP" expanded="false" />
<element signature="e#67768#68147#0#PHP" expanded="false" />
<element signature="e#68566#69075#0#PHP" expanded="false" />
<element signature="e#69080#69752#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<file leaf-file-name="Common.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="604">
<caret line="83" column="16" lean-forward="true" selection-start-line="83" selection-start-column="16" selection-end-line="83" selection-end-column="16" />
<folding>
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9986#10117#0#PHP" expanded="false" />
<element signature="e#10122#10720#0#PHP" expanded="false" />
<element signature="e#10726#10803#0#PHP" expanded="false" />
<element signature="e#10808#15071#0#PHP" expanded="false" />
<marker date="1576152130735" expanded="true" signature="1639:9362" ph="..." />
<marker date="1576152130735" expanded="false" signature="1657:1792" ph="..." />
<marker date="1576152130735" expanded="false" signature="1677:1743" ph="..." />
<marker date="1576152130735" expanded="false" signature="1816:1863" ph="..." />
<marker date="1576152130735" expanded="false" signature="1864:1902" ph="..." />
<marker date="1576152130735" expanded="true" signature="1926:1953" ph="..." />
<marker date="1576152130735" expanded="true" signature="1954:2109" ph="..." />
<marker date="1576152130735" expanded="true" signature="2110:3197" ph="..." />
<marker date="1576152130735" expanded="true" signature="2133:2149" ph="..." />
<marker date="1576152130735" expanded="true" signature="2150:3197" ph="..." />
<marker date="1576152130735" expanded="true" signature="2176:2203" ph="..." />
<marker date="1576152130735" expanded="true" signature="2176:2220" ph="..." />
<marker date="1576152130735" expanded="true" signature="2221:2299" ph="..." />
<marker date="1576152130735" expanded="true" signature="2251:2263" ph="..." />
<marker date="1576152130735" expanded="true" signature="2323:2350" ph="..." />
<marker date="1576152130735" expanded="true" signature="2323:2367" ph="..." />
<marker date="1576152130735" expanded="true" signature="2368:2446" ph="..." />
<marker date="1576152130735" expanded="true" signature="2399:2411" ph="..." />
<marker date="1576152130735" expanded="true" signature="2470:2497" ph="..." />
<marker date="1576152130735" expanded="true" signature="2470:2514" ph="..." />
<marker date="1576152130735" expanded="true" signature="2515:2593" ph="..." />
<marker date="1576152130735" expanded="true" signature="2546:2558" ph="..." />
<marker date="1576152130735" expanded="true" signature="2617:2644" ph="..." />
<marker date="1576152130735" expanded="true" signature="2617:2661" ph="..." />
<marker date="1576152130735" expanded="true" signature="2662:2743" ph="..." />
<marker date="1576152130735" expanded="true" signature="2693:2705" ph="..." />
<marker date="1576152130735" expanded="true" signature="2767:2811" ph="..." />
<marker date="1576152130735" expanded="true" signature="2812:2897" ph="..." />
<marker date="1576152130735" expanded="true" signature="2844:2856" ph="..." />
<marker date="1576152130735" expanded="true" signature="2921:2948" ph="..." />
<marker date="1576152130735" expanded="true" signature="2921:2965" ph="..." />
<marker date="1576152130735" expanded="true" signature="2966:3048" ph="..." />
<marker date="1576152130735" expanded="true" signature="3000:3012" ph="..." />
<marker date="1576152130735" expanded="true" signature="3072:3099" ph="..." />
<marker date="1576152130735" expanded="true" signature="3072:3116" ph="..." />
<marker date="1576152130735" expanded="true" signature="3117:3180" ph="..." />
<marker date="1576152130735" expanded="true" signature="3222:3628" ph="..." />
<marker date="1576152130735" expanded="false" signature="3250:3316" ph="..." />
<marker date="1576152130735" expanded="true" signature="3359:3404" ph="..." />
<marker date="1576152130735" expanded="true" signature="3438:3447" ph="..." />
<marker date="1576152130735" expanded="false" signature="3490:3499" ph="..." />
<marker date="1576152130735" expanded="true" signature="3528:3537" ph="..." />
<marker date="1576152130735" expanded="false" signature="3652:3670" ph="..." />
<marker date="1576152130735" expanded="true" signature="3671:3987" ph="..." />
<marker date="1576152130735" expanded="false" signature="3699:3765" ph="..." />
<marker date="1576152130735" expanded="false" signature="3804:3832" ph="..." />
<marker date="1576152130735" expanded="true" signature="3834:3840" ph=" " />
<marker date="1576152130735" expanded="true" signature="3840:3846" ph=" " />
<marker date="1576152130735" expanded="true" signature="3846:3852" ph=" " />
<marker date="1576152130735" expanded="true" signature="3852:3858" ph=" " />
<marker date="1576152130735" expanded="false" signature="3911:3920" ph="..." />
<marker date="1576152130735" expanded="false" signature="4011:4029" ph="..." />
<marker date="1576152130735" expanded="true" signature="4030:4389" ph="..." />
<marker date="1576152130735" expanded="false" signature="4058:4124" ph="..." />
<marker date="1576152130735" expanded="false" signature="4165:4210" ph="..." />
<marker date="1576152130735" expanded="false" signature="4212:4218" ph=" " />
<marker date="1576152130735" expanded="false" signature="4218:4224" ph=" " />
<marker date="1576152130735" expanded="false" signature="4224:4230" ph=" " />
<marker date="1576152130735" expanded="false" signature="4230:4236" ph=" " />
<marker date="1576152130735" expanded="false" signature="4319:4328" ph="..." />
<marker date="1576152130735" expanded="false" signature="4413:4460" ph="..." />
<marker date="1576152130735" expanded="false" signature="4462:4468" ph=" " />
<marker date="1576152130735" expanded="false" signature="4468:4474" ph=" " />
<marker date="1576152130735" expanded="false" signature="4474:4480" ph=" " />
<marker date="1576152130735" expanded="false" signature="4480:4486" ph=" " />
<marker date="1576152130735" expanded="false" signature="4541:4550" ph="..." />
<marker date="1576152130735" expanded="false" signature="4669:4716" ph="..." />
<marker date="1576152130735" expanded="false" signature="4718:4724" ph=" " />
<marker date="1576152130735" expanded="false" signature="4724:4730" ph=" " />
<marker date="1576152130735" expanded="false" signature="4730:4736" ph=" " />
<marker date="1576152130735" expanded="false" signature="4736:4742" ph=" " />
<marker date="1576152130735" expanded="false" signature="4796:4805" ph="..." />
<marker date="1576152130735" expanded="false" signature="4879:4895" ph="..." />
<marker date="1576152130735" expanded="false" signature="4948:4995" ph="..." />
<marker date="1576152130735" expanded="false" signature="4997:5003" ph=" " />
<marker date="1576152130735" expanded="false" signature="5003:5009" ph=" " />
<marker date="1576152130735" expanded="false" signature="5009:5015" ph=" " />
<marker date="1576152130735" expanded="false" signature="5015:5021" ph=" " />
<marker date="1576152130735" expanded="false" signature="5049:5075" ph="..." />
<marker date="1576152130735" expanded="false" signature="5161:5179" ph="..." />
<marker date="1576152130735" expanded="true" signature="5180:5778" ph="..." />
<marker date="1576152130735" expanded="false" signature="5208:5274" ph="..." />
<marker date="1576152130735" expanded="false" signature="5313:5360" ph="..." />
<marker date="1576152130735" expanded="false" signature="5362:5368" ph=" " />
<marker date="1576152130735" expanded="false" signature="5368:5374" ph=" " />
<marker date="1576152130735" expanded="false" signature="5374:5380" ph=" " />
<marker date="1576152130735" expanded="false" signature="5380:5386" ph=" " />
<marker date="1576152130735" expanded="false" signature="5471:5518" ph="..." />
<marker date="1576152130735" expanded="false" signature="5520:5526" ph=" " />
<marker date="1576152130735" expanded="false" signature="5526:5532" ph=" " />
<marker date="1576152130735" expanded="false" signature="5532:5538" ph=" " />
<marker date="1576152130735" expanded="false" signature="5538:5544" ph=" " />
<marker date="1576152130735" expanded="false" signature="5645:5692" ph="..." />
<marker date="1576152130735" expanded="false" signature="5694:5700" ph=" " />
<marker date="1576152130735" expanded="false" signature="5700:5706" ph=" " />
<marker date="1576152130735" expanded="false" signature="5706:5712" ph=" " />
<marker date="1576152130735" expanded="false" signature="5712:5718" ph=" " />
<marker date="1576152130735" expanded="false" signature="5802:5820" ph="..." />
<marker date="1576152130735" expanded="true" signature="5821:7504" ph="..." />
<marker date="1576152130735" expanded="false" signature="5849:5915" ph="..." />
<marker date="1576152130735" expanded="true" signature="5954:6001" ph="..." />
<marker date="1576152130735" expanded="false" signature="6003:6009" ph=" " />
<marker date="1576152130735" expanded="false" signature="6009:6015" ph=" " />
<marker date="1576152130735" expanded="false" signature="6015:6021" ph=" " />
<marker date="1576152130735" expanded="false" signature="6021:6027" ph=" " />
<marker date="1576152130735" expanded="false" signature="6053:6069" ph="..." />
<marker date="1576152130735" expanded="true" signature="6189:6236" ph="..." />
<marker date="1576152130735" expanded="false" signature="6238:6244" ph=" " />
<marker date="1576152130735" expanded="false" signature="6244:6250" ph=" " />
<marker date="1576152130735" expanded="false" signature="6250:6256" ph=" " />
<marker date="1576152130735" expanded="false" signature="6256:6262" ph=" " />
<marker date="1576152130735" expanded="true" signature="6414:6461" ph="..." />
<marker date="1576152130735" expanded="false" signature="6463:6469" ph=" " />
<marker date="1576152130735" expanded="false" signature="6469:6475" ph=" " />
<marker date="1576152130735" expanded="false" signature="6475:6481" ph=" " />
<marker date="1576152130735" expanded="false" signature="6481:6487" ph=" " />
<marker date="1576152130735" expanded="false" signature="6606:6653" ph="..." />
<marker date="1576152130735" expanded="false" signature="6655:6661" ph=" " />
<marker date="1576152130735" expanded="false" signature="6661:6667" ph=" " />
<marker date="1576152130735" expanded="false" signature="6667:6673" ph=" " />
<marker date="1576152130735" expanded="false" signature="6673:6679" ph=" " />
<marker date="1576152130735" expanded="false" signature="6763:6810" ph="..." />
<marker date="1576152130735" expanded="false" signature="6812:6818" ph=" " />
<marker date="1576152130735" expanded="false" signature="6818:6824" ph=" " />
<marker date="1576152130735" expanded="false" signature="6824:6830" ph=" " />
<marker date="1576152130735" expanded="false" signature="6830:6836" ph=" " />
<marker date="1576152130735" expanded="false" signature="6896:6943" ph="..." />
<marker date="1576152130735" expanded="false" signature="6945:6951" ph=" " />
<marker date="1576152130735" expanded="false" signature="6951:6957" ph=" " />
<marker date="1576152130735" expanded="false" signature="6957:6963" ph=" " />
<marker date="1576152130735" expanded="false" signature="6963:6969" ph=" " />
<marker date="1576152130735" expanded="false" signature="7153:7200" ph="..." />
<marker date="1576152130735" expanded="false" signature="7202:7208" ph=" " />
<marker date="1576152130735" expanded="false" signature="7208:7214" ph=" " />
<marker date="1576152130735" expanded="false" signature="7214:7220" ph=" " />
<marker date="1576152130735" expanded="false" signature="7220:7226" ph=" " />
<marker date="1576152130735" expanded="false" signature="7354:7401" ph="..." />
<marker date="1576152130735" expanded="false" signature="7403:7409" ph=" " />
<marker date="1576152130735" expanded="false" signature="7409:7415" ph=" " />
<marker date="1576152130735" expanded="false" signature="7415:7421" ph=" " />
<marker date="1576152130735" expanded="false" signature="7421:7427" ph=" " />
<marker date="1576152130735" expanded="false" signature="7528:7546" ph="..." />
<marker date="1576152130735" expanded="true" signature="7547:8047" ph="..." />
<marker date="1576152130735" expanded="false" signature="7575:7641" ph="..." />
<marker date="1576152130735" expanded="false" signature="7682:7729" ph="..." />
<marker date="1576152130735" expanded="false" signature="7731:7737" ph=" " />
<marker date="1576152130735" expanded="false" signature="7737:7743" ph=" " />
<marker date="1576152130735" expanded="false" signature="7743:7749" ph=" " />
<marker date="1576152130735" expanded="false" signature="7749:7755" ph=" " />
<marker date="1576152130735" expanded="false" signature="7867:7914" ph="..." />
<marker date="1576152130735" expanded="false" signature="7916:7922" ph=" " />
<marker date="1576152130735" expanded="false" signature="7922:7928" ph=" " />
<marker date="1576152130735" expanded="false" signature="7928:7934" ph=" " />
<marker date="1576152130735" expanded="false" signature="7934:7940" ph=" " />
<marker date="1576152130735" expanded="false" signature="8071:8089" ph="..." />
<marker date="1576152130735" expanded="true" signature="8090:9090" ph="..." />
<marker date="1576152130735" expanded="false" signature="8118:8184" ph="..." />
<marker date="1576152130735" expanded="false" signature="8223:8270" ph="..." />
<marker date="1576152130735" expanded="false" signature="8272:8278" ph=" " />
<marker date="1576152130735" expanded="false" signature="8278:8284" ph=" " />
<marker date="1576152130735" expanded="false" signature="8284:8290" ph=" " />
<marker date="1576152130735" expanded="false" signature="8290:8296" ph=" " />
<marker date="1576152130735" expanded="false" signature="8362:8409" ph="..." />
<marker date="1576152130735" expanded="false" signature="8411:8417" ph=" " />
<marker date="1576152130735" expanded="false" signature="8417:8423" ph=" " />
<marker date="1576152130735" expanded="false" signature="8423:8429" ph=" " />
<marker date="1576152130735" expanded="false" signature="8429:8435" ph=" " />
<marker date="1576152130735" expanded="false" signature="8492:8539" ph="..." />
<marker date="1576152130735" expanded="false" signature="8541:8547" ph=" " />
<marker date="1576152130735" expanded="false" signature="8547:8553" ph=" " />
<marker date="1576152130735" expanded="false" signature="8553:8559" ph=" " />
<marker date="1576152130735" expanded="false" signature="8559:8565" ph=" " />
<marker date="1576152130735" expanded="false" signature="8643:8690" ph="..." />
<marker date="1576152130735" expanded="false" signature="8692:8698" ph=" " />
<marker date="1576152130735" expanded="false" signature="8698:8704" ph=" " />
<marker date="1576152130735" expanded="false" signature="8704:8710" ph=" " />
<marker date="1576152130735" expanded="false" signature="8710:8716" ph=" " />
<marker date="1576152130735" expanded="false" signature="8809:8856" ph="..." />
<marker date="1576152130735" expanded="false" signature="8858:8864" ph=" " />
<marker date="1576152130735" expanded="false" signature="8864:8870" ph=" " />
<marker date="1576152130735" expanded="false" signature="8870:8876" ph=" " />
<marker date="1576152130735" expanded="false" signature="8876:8882" ph=" " />
<marker date="1576152130735" expanded="false" signature="8956:9003" ph="..." />
<marker date="1576152130735" expanded="false" signature="9005:9011" ph=" " />
<marker date="1576152130735" expanded="false" signature="9011:9017" ph=" " />
<marker date="1576152130735" expanded="false" signature="9017:9023" ph=" " />
<marker date="1576152130735" expanded="false" signature="9023:9029" ph=" " />
<marker date="1576152130735" expanded="false" signature="9114:9194" ph="..." />
<marker date="1576152130735" expanded="false" signature="9255:9335" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="545" column="5" lean-forward="true" selection-start-line="545" selection-start-column="5" selection-end-line="545" selection-end-column="5" />
<state relative-caret-position="575">
<caret line="798" column="0" lean-forward="true" selection-start-line="798" selection-start-column="0" selection-end-line="798" selection-end-column="0" />
<folding>
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
... ... @@ -194,7 +404,6 @@
<option value="$PROJECT_DIR$/application/admin/view/order/shou.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
... ... @@ -212,8 +421,9 @@
<option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/suggest.js" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
</list>
</option>
</component>
... ... @@ -231,11 +441,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="375" />
<option name="y" value="55" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="291" />
<option name="y" value="87" />
<option name="width" value="1569" />
<option name="height" value="937" />
<option name="height" value="930" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -259,24 +469,6 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -287,7 +479,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/micro" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -379,7 +571,7 @@
<workItem from="1575979358020" duration="2589000" />
<workItem from="1576028218954" duration="680000" />
<workItem from="1576128183316" duration="7364000" />
<workItem from="1576135696788" duration="8720000" />
<workItem from="1576135696788" duration="16525000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -406,7 +598,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="406318000" />
<option name="totallyTimeSpent" value="414123000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -418,10 +610,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="375" y="55" width="1569" height="937" extended-state="0" />
<editor active="true" />
<frame x="291" y="87" width="1569" height="930" extended-state="1" />
<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.17760105" sideWeight="0.5" order="1" 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.17760105" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" 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="0" 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.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -614,209 +805,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/pdf/2019120751985353pdf" />
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="179" column="5" lean-forward="false" selection-start-line="179" selection-start-column="5" selection-end-line="179" selection-end-column="5" />
<folding>
<element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9891#10022#0#PHP" expanded="false" />
<element signature="e#10027#10625#0#PHP" expanded="false" />
<element signature="e#10631#10708#0#PHP" expanded="false" />
<element signature="e#10713#14976#0#PHP" expanded="false" />
<marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." />
<marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." />
<marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." />
<marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." />
<marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." />
<marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." />
<marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." />
<marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." />
<marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." />
<marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." />
<marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." />
<marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." />
<marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." />
<marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." />
<marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." />
<marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." />
<marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." />
<marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." />
<marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." />
<marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." />
<marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." />
<marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." />
<marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." />
<marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." />
<marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." />
<marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." />
<marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." />
<marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." />
<marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." />
<marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." />
<marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." />
<marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." />
<marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." />
<marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." />
<marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " />
<marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " />
<marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " />
<marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " />
<marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." />
<marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." />
<marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." />
<marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." />
<marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." />
<marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." />
<marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." />
<marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " />
<marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " />
<marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " />
<marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " />
<marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." />
<marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." />
<marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." />
<marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." />
<marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." />
<marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " />
<marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " />
<marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " />
<marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " />
<marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." />
<marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." />
<marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " />
<marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " />
<marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " />
<marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " />
<marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." />
<marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." />
<marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " />
<marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " />
<marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " />
<marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " />
<marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." />
<marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." />
<marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." />
<marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " />
<marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " />
<marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " />
<marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " />
<marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." />
<marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." />
<marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." />
<marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." />
<marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." />
<marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " />
<marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " />
<marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " />
<marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " />
<marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." />
<marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " />
<marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " />
<marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " />
<marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " />
<marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." />
<marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " />
<marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " />
<marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " />
<marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " />
<marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." />
<marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." />
<marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." />
<marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." />
<marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " />
<marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " />
<marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " />
<marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " />
<marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." />
<marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." />
<marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " />
<marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " />
<marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " />
<marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " />
<marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." />
<marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " />
<marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " />
<marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " />
<marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " />
<marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." />
<marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " />
<marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " />
<marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " />
<marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " />
<marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." />
<marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " />
<marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " />
<marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " />
<marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " />
<marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." />
<marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " />
<marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " />
<marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " />
<marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " />
<marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." />
<marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " />
<marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " />
<marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " />
<marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " />
<marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." />
<marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " />
<marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " />
<marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " />
<marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " />
<marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." />
<marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." />
<marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." />
<marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." />
<marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " />
<marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " />
<marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " />
<marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " />
<marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." />
<marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " />
<marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " />
<marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " />
<marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " />
<marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." />
<marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." />
<marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." />
<marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." />
<marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " />
<marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " />
<marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " />
<marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " />
<marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." />
<marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " />
<marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " />
<marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " />
<marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " />
<marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." />
<marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " />
<marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " />
<marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " />
<marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " />
<marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." />
<marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " />
<marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " />
<marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " />
<marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " />
<marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." />
<marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " />
<marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " />
<marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " />
<marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " />
<marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." />
<marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " />
<marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " />
<marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " />
<marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " />
<marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." />
<marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
... ... @@ -1016,10 +1004,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="798" column="0" lean-forward="true" selection-start-line="798" selection-start-column="0" selection-end-line="798" selection-end-column="0" />
<folding>
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#16057#0#PHP" expanded="false" />
<element signature="e#7800#9209#0#PHP" expanded="false" />
<element signature="e#9238#13176#0#PHP" expanded="false" />
<element signature="e#14215#15990#0#PHP" expanded="false" />
<element signature="e#16063#16483#0#PHP" expanded="false" />
<element signature="e#16488#26512#0#PHP" expanded="false" />
<element signature="e#26529#26826#0#PHP" expanded="false" />
<element signature="e#26831#27224#0#PHP" expanded="false" />
<element signature="e#27251#30729#0#PHP" expanded="false" />
<element signature="e#30758#33662#0#PHP" expanded="false" />
<element signature="e#33695#39647#0#PHP" expanded="false" />
<element signature="e#34494#35486#0#PHP" expanded="false" />
<element signature="e#35532#39037#0#PHP" expanded="false" />
<element signature="e#37611#37998#0#PHP" expanded="false" />
<element signature="e#38059#39015#0#PHP" expanded="false" />
<element signature="e#39085#39187#0#PHP" expanded="false" />
<element signature="e#39676#46848#0#PHP" expanded="false" />
<element signature="e#46871#47088#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="1771" column="0" lean-forward="true" selection-start-line="1771" selection-start-column="0" selection-end-line="1771" selection-end-column="0" />
<state relative-caret-position="567">
<caret line="1975" column="13" lean-forward="true" selection-start-line="1975" selection-start-column="13" selection-end-line="1975" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -1091,44 +1111,218 @@
<element signature="e#62397#62736#1#PHP" expanded="false" />
<element signature="e#62766#63120#1#PHP" expanded="false" />
<element signature="e#63959#64651#0#PHP" expanded="false" />
<element signature="e#64656#68103#0#PHP" expanded="false" />
<element signature="e#64776#64913#1#PHP" expanded="false" />
<element signature="e#64943#65083#1#PHP" expanded="false" />
<element signature="e#65094#65185#0#PHP" expanded="false" />
<element signature="e#68109#68618#0#PHP" expanded="false" />
<element signature="e#68623#69295#0#PHP" expanded="false" />
<element signature="e#65593#65839#0#PHP" expanded="false" />
<element signature="e#66449#66617#0#PHP" expanded="false" />
<element signature="e#66695#67706#0#PHP" expanded="false" />
<element signature="e#67768#68147#0#PHP" expanded="false" />
<element signature="e#68566#69075#0#PHP" expanded="false" />
<element signature="e#69080#69752#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="545" column="5" lean-forward="true" selection-start-line="545" selection-start-column="5" selection-end-line="545" selection-end-column="5" />
<state relative-caret-position="604">
<caret line="83" column="16" lean-forward="true" selection-start-line="83" selection-start-column="16" selection-end-line="83" selection-end-column="16" />
<folding>
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#16057#0#PHP" expanded="false" />
<element signature="e#7800#9209#0#PHP" expanded="false" />
<element signature="e#9238#13176#0#PHP" expanded="false" />
<element signature="e#14215#15990#0#PHP" expanded="false" />
<element signature="e#16063#16483#0#PHP" expanded="false" />
<element signature="e#16488#26512#0#PHP" expanded="false" />
<element signature="e#26529#26826#0#PHP" expanded="false" />
<element signature="e#26831#27224#0#PHP" expanded="false" />
<element signature="e#27251#30729#0#PHP" expanded="false" />
<element signature="e#30758#33662#0#PHP" expanded="false" />
<element signature="e#33695#39647#0#PHP" expanded="false" />
<element signature="e#34494#35486#0#PHP" expanded="false" />
<element signature="e#35532#39037#0#PHP" expanded="false" />
<element signature="e#37611#37998#0#PHP" expanded="false" />
<element signature="e#38059#39015#0#PHP" expanded="false" />
<element signature="e#39085#39187#0#PHP" expanded="false" />
<element signature="e#39676#46848#0#PHP" expanded="false" />
<element signature="e#46871#47088#0#PHP" expanded="false" />
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9986#10117#0#PHP" expanded="false" />
<element signature="e#10122#10720#0#PHP" expanded="false" />
<element signature="e#10726#10803#0#PHP" expanded="false" />
<element signature="e#10808#15071#0#PHP" expanded="false" />
<marker date="1576152130735" expanded="true" signature="1639:9362" ph="..." />
<marker date="1576152130735" expanded="false" signature="1657:1792" ph="..." />
<marker date="1576152130735" expanded="false" signature="1677:1743" ph="..." />
<marker date="1576152130735" expanded="false" signature="1816:1863" ph="..." />
<marker date="1576152130735" expanded="false" signature="1864:1902" ph="..." />
<marker date="1576152130735" expanded="true" signature="1926:1953" ph="..." />
<marker date="1576152130735" expanded="true" signature="1954:2109" ph="..." />
<marker date="1576152130735" expanded="true" signature="2110:3197" ph="..." />
<marker date="1576152130735" expanded="true" signature="2133:2149" ph="..." />
<marker date="1576152130735" expanded="true" signature="2150:3197" ph="..." />
<marker date="1576152130735" expanded="true" signature="2176:2203" ph="..." />
<marker date="1576152130735" expanded="true" signature="2176:2220" ph="..." />
<marker date="1576152130735" expanded="true" signature="2221:2299" ph="..." />
<marker date="1576152130735" expanded="true" signature="2251:2263" ph="..." />
<marker date="1576152130735" expanded="true" signature="2323:2350" ph="..." />
<marker date="1576152130735" expanded="true" signature="2323:2367" ph="..." />
<marker date="1576152130735" expanded="true" signature="2368:2446" ph="..." />
<marker date="1576152130735" expanded="true" signature="2399:2411" ph="..." />
<marker date="1576152130735" expanded="true" signature="2470:2497" ph="..." />
<marker date="1576152130735" expanded="true" signature="2470:2514" ph="..." />
<marker date="1576152130735" expanded="true" signature="2515:2593" ph="..." />
<marker date="1576152130735" expanded="true" signature="2546:2558" ph="..." />
<marker date="1576152130735" expanded="true" signature="2617:2644" ph="..." />
<marker date="1576152130735" expanded="true" signature="2617:2661" ph="..." />
<marker date="1576152130735" expanded="true" signature="2662:2743" ph="..." />
<marker date="1576152130735" expanded="true" signature="2693:2705" ph="..." />
<marker date="1576152130735" expanded="true" signature="2767:2811" ph="..." />
<marker date="1576152130735" expanded="true" signature="2812:2897" ph="..." />
<marker date="1576152130735" expanded="true" signature="2844:2856" ph="..." />
<marker date="1576152130735" expanded="true" signature="2921:2948" ph="..." />
<marker date="1576152130735" expanded="true" signature="2921:2965" ph="..." />
<marker date="1576152130735" expanded="true" signature="2966:3048" ph="..." />
<marker date="1576152130735" expanded="true" signature="3000:3012" ph="..." />
<marker date="1576152130735" expanded="true" signature="3072:3099" ph="..." />
<marker date="1576152130735" expanded="true" signature="3072:3116" ph="..." />
<marker date="1576152130735" expanded="true" signature="3117:3180" ph="..." />
<marker date="1576152130735" expanded="true" signature="3222:3628" ph="..." />
<marker date="1576152130735" expanded="false" signature="3250:3316" ph="..." />
<marker date="1576152130735" expanded="true" signature="3359:3404" ph="..." />
<marker date="1576152130735" expanded="true" signature="3438:3447" ph="..." />
<marker date="1576152130735" expanded="false" signature="3490:3499" ph="..." />
<marker date="1576152130735" expanded="true" signature="3528:3537" ph="..." />
<marker date="1576152130735" expanded="false" signature="3652:3670" ph="..." />
<marker date="1576152130735" expanded="true" signature="3671:3987" ph="..." />
<marker date="1576152130735" expanded="false" signature="3699:3765" ph="..." />
<marker date="1576152130735" expanded="false" signature="3804:3832" ph="..." />
<marker date="1576152130735" expanded="true" signature="3834:3840" ph=" " />
<marker date="1576152130735" expanded="true" signature="3840:3846" ph=" " />
<marker date="1576152130735" expanded="true" signature="3846:3852" ph=" " />
<marker date="1576152130735" expanded="true" signature="3852:3858" ph=" " />
<marker date="1576152130735" expanded="false" signature="3911:3920" ph="..." />
<marker date="1576152130735" expanded="false" signature="4011:4029" ph="..." />
<marker date="1576152130735" expanded="true" signature="4030:4389" ph="..." />
<marker date="1576152130735" expanded="false" signature="4058:4124" ph="..." />
<marker date="1576152130735" expanded="false" signature="4165:4210" ph="..." />
<marker date="1576152130735" expanded="false" signature="4212:4218" ph=" " />
<marker date="1576152130735" expanded="false" signature="4218:4224" ph=" " />
<marker date="1576152130735" expanded="false" signature="4224:4230" ph=" " />
<marker date="1576152130735" expanded="false" signature="4230:4236" ph=" " />
<marker date="1576152130735" expanded="false" signature="4319:4328" ph="..." />
<marker date="1576152130735" expanded="false" signature="4413:4460" ph="..." />
<marker date="1576152130735" expanded="false" signature="4462:4468" ph=" " />
<marker date="1576152130735" expanded="false" signature="4468:4474" ph=" " />
<marker date="1576152130735" expanded="false" signature="4474:4480" ph=" " />
<marker date="1576152130735" expanded="false" signature="4480:4486" ph=" " />
<marker date="1576152130735" expanded="false" signature="4541:4550" ph="..." />
<marker date="1576152130735" expanded="false" signature="4669:4716" ph="..." />
<marker date="1576152130735" expanded="false" signature="4718:4724" ph=" " />
<marker date="1576152130735" expanded="false" signature="4724:4730" ph=" " />
<marker date="1576152130735" expanded="false" signature="4730:4736" ph=" " />
<marker date="1576152130735" expanded="false" signature="4736:4742" ph=" " />
<marker date="1576152130735" expanded="false" signature="4796:4805" ph="..." />
<marker date="1576152130735" expanded="false" signature="4879:4895" ph="..." />
<marker date="1576152130735" expanded="false" signature="4948:4995" ph="..." />
<marker date="1576152130735" expanded="false" signature="4997:5003" ph=" " />
<marker date="1576152130735" expanded="false" signature="5003:5009" ph=" " />
<marker date="1576152130735" expanded="false" signature="5009:5015" ph=" " />
<marker date="1576152130735" expanded="false" signature="5015:5021" ph=" " />
<marker date="1576152130735" expanded="false" signature="5049:5075" ph="..." />
<marker date="1576152130735" expanded="false" signature="5161:5179" ph="..." />
<marker date="1576152130735" expanded="true" signature="5180:5778" ph="..." />
<marker date="1576152130735" expanded="false" signature="5208:5274" ph="..." />
<marker date="1576152130735" expanded="false" signature="5313:5360" ph="..." />
<marker date="1576152130735" expanded="false" signature="5362:5368" ph=" " />
<marker date="1576152130735" expanded="false" signature="5368:5374" ph=" " />
<marker date="1576152130735" expanded="false" signature="5374:5380" ph=" " />
<marker date="1576152130735" expanded="false" signature="5380:5386" ph=" " />
<marker date="1576152130735" expanded="false" signature="5471:5518" ph="..." />
<marker date="1576152130735" expanded="false" signature="5520:5526" ph=" " />
<marker date="1576152130735" expanded="false" signature="5526:5532" ph=" " />
<marker date="1576152130735" expanded="false" signature="5532:5538" ph=" " />
<marker date="1576152130735" expanded="false" signature="5538:5544" ph=" " />
<marker date="1576152130735" expanded="false" signature="5645:5692" ph="..." />
<marker date="1576152130735" expanded="false" signature="5694:5700" ph=" " />
<marker date="1576152130735" expanded="false" signature="5700:5706" ph=" " />
<marker date="1576152130735" expanded="false" signature="5706:5712" ph=" " />
<marker date="1576152130735" expanded="false" signature="5712:5718" ph=" " />
<marker date="1576152130735" expanded="false" signature="5802:5820" ph="..." />
<marker date="1576152130735" expanded="true" signature="5821:7504" ph="..." />
<marker date="1576152130735" expanded="false" signature="5849:5915" ph="..." />
<marker date="1576152130735" expanded="true" signature="5954:6001" ph="..." />
<marker date="1576152130735" expanded="false" signature="6003:6009" ph=" " />
<marker date="1576152130735" expanded="false" signature="6009:6015" ph=" " />
<marker date="1576152130735" expanded="false" signature="6015:6021" ph=" " />
<marker date="1576152130735" expanded="false" signature="6021:6027" ph=" " />
<marker date="1576152130735" expanded="false" signature="6053:6069" ph="..." />
<marker date="1576152130735" expanded="true" signature="6189:6236" ph="..." />
<marker date="1576152130735" expanded="false" signature="6238:6244" ph=" " />
<marker date="1576152130735" expanded="false" signature="6244:6250" ph=" " />
<marker date="1576152130735" expanded="false" signature="6250:6256" ph=" " />
<marker date="1576152130735" expanded="false" signature="6256:6262" ph=" " />
<marker date="1576152130735" expanded="true" signature="6414:6461" ph="..." />
<marker date="1576152130735" expanded="false" signature="6463:6469" ph=" " />
<marker date="1576152130735" expanded="false" signature="6469:6475" ph=" " />
<marker date="1576152130735" expanded="false" signature="6475:6481" ph=" " />
<marker date="1576152130735" expanded="false" signature="6481:6487" ph=" " />
<marker date="1576152130735" expanded="false" signature="6606:6653" ph="..." />
<marker date="1576152130735" expanded="false" signature="6655:6661" ph=" " />
<marker date="1576152130735" expanded="false" signature="6661:6667" ph=" " />
<marker date="1576152130735" expanded="false" signature="6667:6673" ph=" " />
<marker date="1576152130735" expanded="false" signature="6673:6679" ph=" " />
<marker date="1576152130735" expanded="false" signature="6763:6810" ph="..." />
<marker date="1576152130735" expanded="false" signature="6812:6818" ph=" " />
<marker date="1576152130735" expanded="false" signature="6818:6824" ph=" " />
<marker date="1576152130735" expanded="false" signature="6824:6830" ph=" " />
<marker date="1576152130735" expanded="false" signature="6830:6836" ph=" " />
<marker date="1576152130735" expanded="false" signature="6896:6943" ph="..." />
<marker date="1576152130735" expanded="false" signature="6945:6951" ph=" " />
<marker date="1576152130735" expanded="false" signature="6951:6957" ph=" " />
<marker date="1576152130735" expanded="false" signature="6957:6963" ph=" " />
<marker date="1576152130735" expanded="false" signature="6963:6969" ph=" " />
<marker date="1576152130735" expanded="false" signature="7153:7200" ph="..." />
<marker date="1576152130735" expanded="false" signature="7202:7208" ph=" " />
<marker date="1576152130735" expanded="false" signature="7208:7214" ph=" " />
<marker date="1576152130735" expanded="false" signature="7214:7220" ph=" " />
<marker date="1576152130735" expanded="false" signature="7220:7226" ph=" " />
<marker date="1576152130735" expanded="false" signature="7354:7401" ph="..." />
<marker date="1576152130735" expanded="false" signature="7403:7409" ph=" " />
<marker date="1576152130735" expanded="false" signature="7409:7415" ph=" " />
<marker date="1576152130735" expanded="false" signature="7415:7421" ph=" " />
<marker date="1576152130735" expanded="false" signature="7421:7427" ph=" " />
<marker date="1576152130735" expanded="false" signature="7528:7546" ph="..." />
<marker date="1576152130735" expanded="true" signature="7547:8047" ph="..." />
<marker date="1576152130735" expanded="false" signature="7575:7641" ph="..." />
<marker date="1576152130735" expanded="false" signature="7682:7729" ph="..." />
<marker date="1576152130735" expanded="false" signature="7731:7737" ph=" " />
<marker date="1576152130735" expanded="false" signature="7737:7743" ph=" " />
<marker date="1576152130735" expanded="false" signature="7743:7749" ph=" " />
<marker date="1576152130735" expanded="false" signature="7749:7755" ph=" " />
<marker date="1576152130735" expanded="false" signature="7867:7914" ph="..." />
<marker date="1576152130735" expanded="false" signature="7916:7922" ph=" " />
<marker date="1576152130735" expanded="false" signature="7922:7928" ph=" " />
<marker date="1576152130735" expanded="false" signature="7928:7934" ph=" " />
<marker date="1576152130735" expanded="false" signature="7934:7940" ph=" " />
<marker date="1576152130735" expanded="false" signature="8071:8089" ph="..." />
<marker date="1576152130735" expanded="true" signature="8090:9090" ph="..." />
<marker date="1576152130735" expanded="false" signature="8118:8184" ph="..." />
<marker date="1576152130735" expanded="false" signature="8223:8270" ph="..." />
<marker date="1576152130735" expanded="false" signature="8272:8278" ph=" " />
<marker date="1576152130735" expanded="false" signature="8278:8284" ph=" " />
<marker date="1576152130735" expanded="false" signature="8284:8290" ph=" " />
<marker date="1576152130735" expanded="false" signature="8290:8296" ph=" " />
<marker date="1576152130735" expanded="false" signature="8362:8409" ph="..." />
<marker date="1576152130735" expanded="false" signature="8411:8417" ph=" " />
<marker date="1576152130735" expanded="false" signature="8417:8423" ph=" " />
<marker date="1576152130735" expanded="false" signature="8423:8429" ph=" " />
<marker date="1576152130735" expanded="false" signature="8429:8435" ph=" " />
<marker date="1576152130735" expanded="false" signature="8492:8539" ph="..." />
<marker date="1576152130735" expanded="false" signature="8541:8547" ph=" " />
<marker date="1576152130735" expanded="false" signature="8547:8553" ph=" " />
<marker date="1576152130735" expanded="false" signature="8553:8559" ph=" " />
<marker date="1576152130735" expanded="false" signature="8559:8565" ph=" " />
<marker date="1576152130735" expanded="false" signature="8643:8690" ph="..." />
<marker date="1576152130735" expanded="false" signature="8692:8698" ph=" " />
<marker date="1576152130735" expanded="false" signature="8698:8704" ph=" " />
<marker date="1576152130735" expanded="false" signature="8704:8710" ph=" " />
<marker date="1576152130735" expanded="false" signature="8710:8716" ph=" " />
<marker date="1576152130735" expanded="false" signature="8809:8856" ph="..." />
<marker date="1576152130735" expanded="false" signature="8858:8864" ph=" " />
<marker date="1576152130735" expanded="false" signature="8864:8870" ph=" " />
<marker date="1576152130735" expanded="false" signature="8870:8876" ph=" " />
<marker date="1576152130735" expanded="false" signature="8876:8882" ph=" " />
<marker date="1576152130735" expanded="false" signature="8956:9003" ph="..." />
<marker date="1576152130735" expanded="false" signature="9005:9011" ph=" " />
<marker date="1576152130735" expanded="false" signature="9011:9017" ph=" " />
<marker date="1576152130735" expanded="false" signature="9017:9023" ph=" " />
<marker date="1576152130735" expanded="false" signature="9023:9029" ph=" " />
<marker date="1576152130735" expanded="false" signature="9114:9194" ph="..." />
<marker date="1576152130735" expanded="false" signature="9255:9335" ph="..." />
</folding>
</state>
</provider>
... ...
... ... @@ -65,33 +65,36 @@ class Common extends Api
<div style="font-size: 16px;color: #333;margin-bottom: 20px">
亲爱的用户，您好
</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">
<div style="font-size: 16px;color: #333">
非常感谢您使用仁甲看见SHOP的相关素材,
本小程序内销售的素材均为仁甲看见拍摄的正版优质作品，为方便您能正当合法的使用本素材，避免日后因版权纠纷引起的不必要麻烦，请务必填写本授权书；我们会为您自动生成一个pdf文件发送给您；
</div>
<div style="margin-bottom: 30px">
<div class="font-size: 16px;color: #333;">
使用方为<span style="color:orange">【'.$name.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
使用用途为<span style="color:orange">【'.$use.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
联系方式<span style="color:orange">【'.$tel.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
素材编号为<span style="color:orange">【'.$number.'】</span>，订单编号为<span style="color:dodgerblue">【'.$order_num.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
素材购买时间为【<span style="color:orange">'.$time.'</span>】
</div>
<div class="font-size: 16px;color: #333;">
本小程序所有的图片及视频素材拥有者为山东仁甲看见影像服务有限公司
</div>
<div style="line-height: 0.5">
<div style="font-size: 18px;color: #333;font-weight:bold">
使用方<span style="color:orange">【'.$name.'】</span>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 18px;color: #333;font-weight:bold">
使用用途<span style="color:orange">【'.$use.'】</span>
</div>
<div style="font-size: 18px;color: #333;font-weight:bold">
联系方式<span style="color:orange">【'.$tel.'】</span>
</div>
<div style="font-size: 18px;color: #333;font-weight:bold">
素材编号为<span style="color:orange">【'.$number.'】</span>
</div>
<div style="font-size: 18px;color: #333;font-weight:bold">
订单编号为<span style="color:orange">【'.$order_num.'】</span>
</div>
<div style="font-size: 18px;color: #333;font-weight:bold">
素材购买时间为<span style="color:orange">【'.$time.'】</span>
</div>
<div style="font-size: 18px;color: #333;font-weight:bold">
本小程序所有的图片及视频素材拥有者为山东仁甲看见影像服务有限公司
</div>
</div>
<div style="">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于版权和使用权</div>
<div style="font-size: 16px;color: #333;font-weight: bold">&nbsp;&nbsp;&nbsp;&nbsp;您购买的素材<span style="color:red">仅限贵单位使用于本协议中的指定用途</span>，仅拥有<span style="color:red">使用权</span>，不包含<span style="color:red">版权及著作权等</span>；如若在其他项目中继续使用，须联系客服更新授权书（无限次免费），以避免日后出现的侵权事件造成的不必要麻烦。</div>
<div style="font-size: 16px;color: #333;font-weight: bold"><span>您购买的素材</span><span style="color:red">仅限贵单位使用于本协议中的指定用途</span>，仅拥有<span style="color:red">使用权</span>，不包含<span style="color:red">版权及著作权等</span>；如若在其他项目中继续使用，须联系客服更新授权书（无限次免费），以避免日后出现的侵权事件造成的不必要麻烦。</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于物权</div>
... ...
... ... @@ -1916,49 +1916,66 @@ class User extends Api
->where('id',$data)
->find();
$list['order_id'] = explode(',',$list['order_id']);
//下方改变状态用到
$gai_order['order_id'] = $list['order_id'];
//拼接订单号
$order_num = Db::name('order')->whereIn('id',$list['order_id'])->field('num,createtime')->select();
$num = implode(',',array_column($order_num,'num'));
//拼接素材购买时间
$time = [];
foreach ($order_num as $v_time){
$create_time = date('Y-m-d H:i:s',$v_time['createtime']);
array_push($time,$create_time);
}
$time = implode(',',$time);
//查询出所有的素材编号
foreach ($list['order_id'] as &$v){
//查询出订单表中的图片以及视频ID
$v = Db::name('order')
->field('pic_id,video_id')
->where('id',$v)
->find();
//图片ID不为空的情况
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
$pic_number = Db::name('pic')
->whereIn('id',$v['pic_id'])
$pic_id = explode(',',$v['pic_id']);
$v['pic_num'] = Db::name('pic')
->whereIn('id',$pic_id)
->column('number');
array_push($v['num'],$pic_number);
}else{
$v['pic_num'] = [];
}
//视频ID不为空的情况
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
$video_number = Db::name('video')
->whereIn('id',$v['video_id'])
$video_id = unserialize($v['video_id']);
$v_id = array_column($video_id,'id');
$v['video_num'] = Db::name('video')
->whereIn('id',$v_id)
->column('number');
array_push($v['num'],$video_number);
}else{
$v['video_num'] = [];
}
}
print_r($list['order_id']);die;
$time = date('Y-m-d H:i:s',$list['createtime']);
Db::name('order')
->whereIn('id',$list['order_id'])
->update(['shou_status'=>1]);
$order = Db::name('order')->where('id',$list['order_id'])->find();
if(!empty($res['pic_id'])){
$pic = Db::name('pic')
->where('id',$res['pic_id'])
->field('number')
->find();
$common = new Common();
$common->test_pdf($res['name'],$res['use'],$res['tel'],$pic['number'],$order['num'],$time);
//拼接所有素材的唯一编号
$str = '';
foreach($list['order_id'] as $l_value){
$pic_str = implode(',',$l_value['pic_num']);
$video_str = implode(',',$l_value['video_num']);
if(!empty($pic_str)){
$str .= $pic_str.',';
}
if(!empty($video_str)){
$str .= $video_str.',';
}
}
if(!empty($res['video_id'])){
$video = Db::name('video')
->where('id',$res['video_id'])
->field('number')
->find();
$common = new Common();
$common->test_pdf($param['name'],$param['use'],$param['tel'],$video['number'],$order['num'],$time);
//修改订单表中的授权书状态为已下载
foreach ($gai_order['order_id'] as $v_o){
Db::name('order')
->where('id',$v_o)
->update(['shou_status'=>1]);
}
$common = new Common();
$common->test_pdf($res['name'],$res['use'],$res['tel'],$str,$num,$time);
}else{
$this->error('加入授权书表失败');
}
... ...