郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 f8b887e1794a3a9232fbe56fa364f309da348407 1 个父辈 5cae71eb
1 个管道 的构建 通过 耗费 1 秒

修改开通会员订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 753 行增加 和 418 行删除
... ... @@ -4,7 +4,9 @@
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="文件下载调试">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -16,28 +18,45 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="368">
<caret line="96" column="29" lean-forward="false" selection-start-line="96" selection-start-column="29" selection-end-line="96" selection-end-column="29" />
<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#3855#5374#0#PHP" expanded="false" />
<element signature="e#5519#5933#0#PHP" expanded="false" />
<element signature="e#5938#15959#0#PHP" expanded="false" />
<element signature="e#6914#15892#0#PHP" expanded="false" />
<element signature="e#15966#16283#0#PHP" expanded="false" />
<element signature="e#16288#16766#0#PHP" expanded="false" />
<element signature="e#16783#17080#0#PHP" expanded="false" />
<element signature="e#17085#17478#0#PHP" expanded="false" />
<element signature="e#17505#20751#0#PHP" expanded="false" />
<element signature="e#20780#23451#0#PHP" expanded="false" />
<element signature="e#23484#29811#0#PHP" expanded="false" />
<element signature="e#24279#29569#0#PHP" expanded="false" />
<element signature="e#29834#30051#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2695">
<caret line="388" column="39" lean-forward="false" selection-start-line="388" selection-start-column="39" selection-end-line="388" selection-end-column="39" />
<state relative-caret-position="171">
<caret line="1155" column="36" lean-forward="true" selection-start-line="1155" selection-start-column="36" selection-end-line="1155" selection-end-column="36" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
<element signature="e#2992#3356#0#PHP" expanded="false" />
<element signature="e#3361#3651#0#PHP" expanded="false" />
<element signature="e#3657#3979#0#PHP" expanded="false" />
<element signature="e#3984#4271#0#PHP" expanded="false" />
<element signature="e#4278#4712#0#PHP" expanded="false" />
<element signature="e#4717#5075#0#PHP" expanded="false" />
<element signature="e#5081#5488#0#PHP" expanded="false" />
<element signature="e#5493#5836#0#PHP" expanded="false" />
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#10709#11142#0#PHP" expanded="false" />
<element signature="e#11205#11614#0#PHP" expanded="false" />
<element signature="e#11678#11948#0#PHP" expanded="false" />
<element signature="e#7687#13088#0#PHP" expanded="false" />
<element signature="e#13094#13774#0#PHP" expanded="false" />
<element signature="e#13779#14637#0#PHP" expanded="false" />
<element signature="e#14643#15432#0#PHP" expanded="false" />
... ... @@ -54,85 +73,26 @@
<element signature="e#32086#32525#0#PHP" expanded="false" />
<element signature="e#32531#33352#0#PHP" expanded="false" />
<element signature="e#33357#36761#0#PHP" expanded="false" />
<element signature="e#33803#36755#0#PHP" expanded="false" />
<element signature="e#36767#37272#0#PHP" expanded="false" />
<element signature="e#37277#37528#0#PHP" expanded="false" />
<element signature="e#37534#38013#0#PHP" expanded="false" />
<element signature="e#38018#38775#0#PHP" expanded="false" />
<element signature="e#38781#39262#0#PHP" expanded="false" />
<element signature="e#39267#40037#0#PHP" expanded="false" />
<element signature="e#40043#40406#0#PHP" expanded="false" />
<element signature="e#40411#40602#0#PHP" expanded="false" />
<element signature="e#40608#40966#0#PHP" expanded="false" />
<element signature="e#40971#41162#0#PHP" expanded="false" />
<element signature="e#41168#42311#0#PHP" expanded="false" />
<element signature="e#42316#44981#0#PHP" expanded="false" />
<element signature="e#44987#45485#0#PHP" expanded="false" />
<element signature="e#45490#47236#0#PHP" expanded="false" />
<element signature="e#47242#47655#0#PHP" expanded="false" />
<element signature="e#47660#48139#0#PHP" expanded="false" />
<element signature="e#48145#48679#0#PHP" expanded="false" />
<element signature="e#48684#50069#0#PHP" expanded="false" />
<element signature="e#50075#50729#0#PHP" expanded="false" />
<element signature="e#50734#52749#0#PHP" expanded="false" />
<element signature="e#52755#53515#0#PHP" expanded="false" />
<element signature="e#53520#56229#0#PHP" expanded="false" />
<element signature="e#56255#57086#0#PHP" expanded="false" />
<element signature="e#57092#57512#0#PHP" expanded="false" />
<element signature="e#57517#58000#0#PHP" expanded="false" />
<element signature="e#58006#58812#0#PHP" expanded="false" />
<element signature="e#58817#61975#0#PHP" expanded="false" />
<element signature="e#60610#61969#0#PHP" expanded="false" />
<element signature="e#61990#63325#0#PHP" expanded="false" />
<element signature="e#62106#62508#0#PHP" expanded="false" />
<element signature="e#63341#64375#0#PHP" expanded="false" />
<element signature="e#64381#65139#0#PHP" expanded="false" />
<element signature="e#65144#68887#0#PHP" expanded="false" />
<element signature="e#68893#69285#0#PHP" expanded="false" />
<element signature="e#69290#70242#0#PHP" expanded="false" />
<element signature="e#70266#70839#0#PHP" expanded="false" />
<element signature="e#70845#71444#0#PHP" expanded="false" />
<element signature="e#71449#72376#0#PHP" expanded="false" />
<element signature="e#72382#73096#0#PHP" expanded="false" />
<element signature="e#73102#73529#0#PHP" expanded="false" />
<element signature="e#73534#74003#0#PHP" expanded="false" />
<element signature="e#74010#75215#0#PHP" expanded="false" />
<element signature="e#75220#76923#0#PHP" expanded="false" />
<element signature="e#76929#77706#0#PHP" expanded="false" />
<element signature="e#77711#81649#0#PHP" expanded="false" />
<element signature="e#81655#82164#0#PHP" expanded="false" />
<element signature="e#82169#82841#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="343" column="29" lean-forward="true" selection-start-line="343" selection-start-column="29" selection-end-line="343" selection-end-column="29" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
<element signature="e#6768#11257#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
<element signature="e#11513#11770#0#PHP" expanded="false" />
<element signature="e#12199#18000#0#PHP" expanded="false" />
<element signature="e#40143#40506#0#PHP" expanded="false" />
<element signature="e#40511#40702#0#PHP" expanded="false" />
<element signature="e#40708#41066#0#PHP" expanded="false" />
<element signature="e#41071#41262#0#PHP" expanded="false" />
<element signature="e#41268#42411#0#PHP" expanded="false" />
<element signature="e#42416#45081#0#PHP" expanded="false" />
<element signature="e#45087#45585#0#PHP" expanded="false" />
<element signature="e#45590#47336#0#PHP" expanded="false" />
<element signature="e#47342#47755#0#PHP" expanded="false" />
<element signature="e#47760#48239#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="video.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="514">
<caret line="46" column="83" lean-forward="true" selection-start-line="46" selection-start-column="83" selection-end-line="46" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -155,7 +115,16 @@
<find>history</find>
<find>bootstrap-table-jumpto</find>
<find>words</find>
<find>会员支付</find>
<find>vippayOrderNotify</find>
<find>payOrderNotify</find>
<find>Db::name('toporder')</find>
<find>充值</find>
<find>Db::name('viporder')</find>
</findStrings>
<replaceStrings>
<replace />
</replaceStrings>
<dirStrings>
<dir>D:\htdocs\areial</dir>
</dirStrings>
... ... @@ -166,9 +135,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/controller/Suggest.php" />
<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$/public/assets/js/backend/feng.js" />
<option value="$PROJECT_DIR$/application/admin/view/feng/add.html" />
... ... @@ -208,7 +174,6 @@
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
... ... @@ -216,6 +181,10 @@
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Index.php" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -234,11 +203,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="240" />
<option name="y" value="72" />
<option name="width" value="1652" />
<option name="height" value="930" />
<component name="ProjectFrameBounds">
<option name="x" value="697" />
<option name="y" value="20" />
<option name="width" value="1747" />
<option name="height" value="1064" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -256,6 +225,7 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -272,46 +242,19 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -466,7 +409,17 @@
<workItem from="1585528700995" duration="1288000" />
<workItem from="1585557924309" duration="618000" />
<workItem from="1585565173117" duration="2442000" />
<workItem from="1585613706476" duration="5536000" />
<workItem from="1585613706476" duration="6498000" />
<workItem from="1585728214210" duration="793000" />
<workItem from="1585729136211" duration="1171000" />
<workItem from="1585897026805" duration="514000" />
<workItem from="1585905335329" duration="611000" />
<workItem from="1586429538696" duration="866000" />
<workItem from="1587001815999" duration="119000" />
<workItem from="1587002358297" duration="983000" />
<workItem from="1587016148758" duration="630000" />
<workItem from="1587698628412" duration="1095000" />
<workItem from="1590118157459" duration="8537000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -531,11 +484,74 @@
<option name="project" value="LOCAL" />
<updated>1585567332744</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="文件下载调试">
<created>1590118630067</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1590118630067</updated>
</task>
<task id="LOCAL-00011" summary="文件下载调试">
<created>1590123238047</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1590123238047</updated>
</task>
<task id="LOCAL-00012" summary="文件下载调试">
<created>1590123272445</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1590123272445</updated>
</task>
<task id="LOCAL-00013" summary="文件下载调试">
<created>1590123369560</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1590123369560</updated>
</task>
<task id="LOCAL-00014" summary="文件下载调试">
<created>1590123424516</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1590123424516</updated>
</task>
<task id="LOCAL-00015" summary="文件下载调试">
<created>1590126137272</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1590126137272</updated>
</task>
<task id="LOCAL-00016" summary="文件下载调试">
<created>1590126951715</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1590126951715</updated>
</task>
<task id="LOCAL-00017" summary="支付回调调试">
<created>1590127246097</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1590127246097</updated>
</task>
<task id="LOCAL-00018" summary="支付回调调试">
<created>1590127473601</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1590127473601</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="652482000" />
<option name="totallyTimeSpent" value="668763000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -547,24 +563,25 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="697" y="20" width="1747" height="1064" 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.141258" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14285715" 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.32876712" 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" />
<window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46463546" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46463546" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" 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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
... ... @@ -596,85 +613,16 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="调试" />
<MESSAGE value="文件下载调试" />
<option name="LAST_COMMIT_MESSAGE" value="文件下载调试" />
<MESSAGE value="支付回调调试" />
<option name="LAST_COMMIT_MESSAGE" value="支付回调调试" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="29" />
<option name="time" value="30" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="92" column="48" lean-forward="false" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="17" lean-forward="true" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="39" column="15" lean-forward="false" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/words/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/words/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="122" lean-forward="false" selection-start-line="4" selection-start-column="122" selection-end-line="4" selection-end-column="122" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/words/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
... ... @@ -689,13 +637,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275">
<caret line="51" column="32" lean-forward="true" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
... ... @@ -749,7 +690,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1450">
<caret line="128" column="54" lean-forward="true" selection-start-line="128" selection-start-column="54" selection-end-line="128" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
... ... @@ -757,44 +697,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="87" column="20" lean-forward="true" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
<folding>
<element signature="e#1533#1626#0#PHP" expanded="false" />
<element signature="e#2650#2877#0#PHP" expanded="false" />
<element signature="e#2882#4805#0#PHP" expanded="false" />
<element signature="e#4811#4943#0#PHP" expanded="false" />
<element signature="e#4948#6186#0#PHP" expanded="false" />
<element signature="e#6192#6243#0#PHP" expanded="false" />
<element signature="e#6248#6612#0#PHP" expanded="false" />
<element signature="e#6618#6798#0#PHP" expanded="false" />
<element signature="e#6803#7890#0#PHP" expanded="false" />
<element signature="e#7896#7971#0#PHP" expanded="false" />
<element signature="e#7976#9295#0#PHP" expanded="false" />
<element signature="e#9301#9430#0#PHP" expanded="false" />
<element signature="e#9435#9943#0#PHP" expanded="false" />
<element signature="e#9949#9997#0#PHP" expanded="false" />
<element signature="e#10002#10127#0#PHP" expanded="false" />
<element signature="e#10133#10183#0#PHP" expanded="false" />
<element signature="e#10188#10256#0#PHP" expanded="false" />
<element signature="e#10262#10289#0#PHP" expanded="false" />
<element signature="e#10294#10595#0#PHP" expanded="false" />
<element signature="e#10601#10651#0#PHP" expanded="false" />
<element signature="e#10656#11069#0#PHP" expanded="false" />
<element signature="e#11075#11126#0#PHP" expanded="false" />
<element signature="e#11131#11208#0#PHP" expanded="false" />
<element signature="e#11214#11269#0#PHP" expanded="false" />
<element signature="e#11274#11355#0#PHP" expanded="false" />
<element signature="e#11361#11410#0#PHP" expanded="false" />
<element signature="e#11415#11494#0#PHP" expanded="false" />
<element signature="e#13082#13143#0#PHP" expanded="false" />
<element signature="e#13148#13236#0#PHP" expanded="false" />
<element signature="e#13242#13440#0#PHP" expanded="false" />
<element signature="e#13445#14406#0#PHP" expanded="false" />
<element signature="e#14412#14490#0#PHP" expanded="false" />
<element signature="e#14495#14593#0#PHP" expanded="false" />
<element signature="e#14599#14646#0#PHP" expanded="false" />
<element signature="e#14651#14744#0#PHP" expanded="false" />
<element signature="e#14750#14799#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -834,20 +736,6 @@
</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="317">
<caret line="359" column="31" lean-forward="false" selection-start-line="359" selection-start-column="31" selection-end-line="359" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2310">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5721">
... ... @@ -869,13 +757,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -883,34 +764,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="131" column="28" lean-forward="true" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="144" column="4" lean-forward="false" selection-start-line="144" selection-start-column="4" selection-end-line="149" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/config.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>
... ... @@ -918,7 +775,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="39" column="59" lean-forward="true" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
... ... @@ -931,7 +787,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -939,7 +794,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="19" column="39" lean-forward="false" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
... ... @@ -947,7 +801,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1550">
<caret line="62" column="10" lean-forward="true" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -955,23 +808,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="63" column="4" lean-forward="false" selection-start-line="63" selection-start-column="8" selection-end-line="76" selection-end-column="14" />
<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="1060">
<caret line="162" column="37" lean-forward="false" selection-start-line="162" selection-start-column="37" selection-end-line="162" selection-end-column="37" />
<folding>
<element signature="e#691#2392#0#PHP" expanded="false" />
<element signature="e#2424#5392#0#PHP" expanded="false" />
<element signature="e#5424#8624#0#PHP" expanded="false" />
<element signature="e#8630#8874#0#PHP" expanded="false" />
<element signature="e#8880#9137#0#PHP" expanded="false" />
<element signature="e#9143#9408#0#PHP" expanded="false" />
<element signature="e#9415#9663#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -984,53 +820,587 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="27" column="69" lean-forward="true" selection-start-line="27" selection-start-column="69" selection-end-line="27" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="514">
<caret line="46" column="83" lean-forward="true" selection-start-line="46" selection-start-column="83" selection-end-line="46" selection-end-column="83" />
<state relative-caret-position="775">
<caret line="31" column="100" lean-forward="false" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1125">
<caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="54" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="124" column="10" lean-forward="true" selection-start-line="124" selection-start-column="10" selection-end-line="124" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/fast/Http.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/fast/Form.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24200">
<caret line="968" column="31" lean-forward="false" selection-start-line="968" selection-start-column="31" selection-end-line="968" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
<caret line="52" column="82" lean-forward="false" selection-start-line="52" selection-start-column="82" selection-end-line="52" selection-end-column="82" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="343" column="29" lean-forward="true" selection-start-line="343" selection-start-column="29" selection-end-line="343" selection-end-column="29" />
<state relative-caret-position="-24">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
<element signature="e#6768#11257#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
<element signature="e#11513#11770#0#PHP" expanded="false" />
<element signature="e#12199#18000#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="52" column="66" lean-forward="false" selection-start-line="52" selection-start-column="32" selection-end-line="52" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="228" column="22" lean-forward="true" selection-start-line="228" selection-start-column="22" selection-end-line="228" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="63" column="55" lean-forward="false" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" />
<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="280">
<caret line="154" column="66" lean-forward="false" selection-start-line="154" selection-start-column="66" selection-end-line="154" selection-end-column="66" />
<folding>
<element signature="e#5424#8624#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="169" column="33" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
<folding>
<marker date="1576229034751" expanded="true" signature="1720:9501" ph="..." />
<marker date="1576229034751" expanded="true" signature="1738:1873" ph="..." />
<marker date="1576229034751" expanded="false" signature="1758:1824" ph="..." />
<marker date="1576229034751" expanded="false" signature="1897:1944" ph="..." />
<marker date="1576229034751" expanded="true" signature="1945:1983" ph="..." />
<marker date="1576229034751" expanded="false" signature="2007:2034" ph="..." />
<marker date="1576229034751" expanded="true" signature="2035:2190" ph="..." />
<marker date="1576229034751" expanded="false" signature="2214:2230" ph="..." />
<marker date="1576229034751" expanded="true" signature="2231:3278" ph="..." />
<marker date="1576229034751" expanded="false" signature="2257:2301" ph="..." />
<marker date="1576229034751" expanded="true" signature="2302:2380" ph="..." />
<marker date="1576229034751" expanded="false" signature="2332:2344" ph="..." />
<marker date="1576229034751" expanded="false" signature="2404:2448" ph="..." />
<marker date="1576229034751" expanded="true" signature="2449:2527" ph="..." />
<marker date="1576229034751" expanded="false" signature="2480:2492" ph="..." />
<marker date="1576229034751" expanded="false" signature="2551:2595" ph="..." />
<marker date="1576229034751" expanded="true" signature="2596:2674" ph="..." />
<marker date="1576229034751" expanded="false" signature="2627:2639" ph="..." />
<marker date="1576229034751" expanded="false" signature="2698:2742" ph="..." />
<marker date="1576229034751" expanded="true" signature="2743:2824" ph="..." />
<marker date="1576229034751" expanded="false" signature="2774:2786" ph="..." />
<marker date="1576229034751" expanded="false" signature="2848:2892" ph="..." />
<marker date="1576229034751" expanded="true" signature="2893:2978" ph="..." />
<marker date="1576229034751" expanded="false" signature="2925:2937" ph="..." />
<marker date="1576229034751" expanded="false" signature="3002:3046" ph="..." />
<marker date="1576229034751" expanded="true" signature="3047:3129" ph="..." />
<marker date="1576229034751" expanded="false" signature="3081:3093" ph="..." />
<marker date="1576229034751" expanded="false" signature="3153:3197" ph="..." />
<marker date="1576229034751" expanded="true" signature="3198:3261" ph="..." />
<marker date="1576229034751" expanded="true" signature="3303:3767" ph="..." />
<marker date="1576229034751" expanded="false" signature="3331:3397" ph="..." />
<marker date="1576229034751" expanded="false" signature="3440:3485" ph="..." />
<marker date="1576229034751" expanded="true" signature="3486:3750" ph="..." />
<marker date="1576229034751" expanded="false" signature="3487:3493" ph=" " />
<marker date="1576229034751" expanded="false" signature="3493:3499" ph=" " />
<marker date="1576229034751" expanded="false" signature="3499:3505" ph=" " />
<marker date="1576229034751" expanded="false" signature="3505:3511" ph=" " />
<marker date="1576229034751" expanded="false" signature="3543:3552" ph="..." />
<marker date="1576229034751" expanded="false" signature="3595:3604" ph="..." />
<marker date="1576229034751" expanded="false" signature="3633:3642" ph="..." />
<marker date="1576229034751" expanded="false" signature="3667:3676" ph="..." />
<marker date="1576229034751" expanded="false" signature="3791:3809" ph="..." />
<marker date="1576229034751" expanded="true" signature="3810:4127" ph="..." />
<marker date="1576229034751" expanded="false" signature="3838:3904" ph="..." />
<marker date="1576229034751" expanded="false" signature="3943:3971" ph="..." />
<marker date="1576229034751" expanded="false" signature="3973:3979" ph=" " />
<marker date="1576229034751" expanded="false" signature="3979:3985" ph=" " />
<marker date="1576229034751" expanded="false" signature="3985:3991" ph=" " />
<marker date="1576229034751" expanded="false" signature="3991:3997" ph=" " />
<marker date="1576229034751" expanded="false" signature="4050:4059" ph="..." />
<marker date="1576229034751" expanded="false" signature="4151:4169" ph="..." />
<marker date="1576229034751" expanded="true" signature="4170:4576" ph="..." />
<marker date="1576229034751" expanded="false" signature="4198:4264" ph="..." />
<marker date="1576229034751" expanded="false" signature="4305:4350" ph="..." />
<marker date="1576229034751" expanded="true" signature="4351:4559" ph="..." />
<marker date="1576229034751" expanded="false" signature="4352:4358" ph=" " />
<marker date="1576229034751" expanded="false" signature="4358:4364" ph=" " />
<marker date="1576229034751" expanded="false" signature="4364:4370" ph=" " />
<marker date="1576229034751" expanded="false" signature="4370:4376" ph=" " />
<marker date="1576229034751" expanded="false" signature="4400:4406" ph=" " />
<marker date="1576229034751" expanded="false" signature="4409:4415" ph=" " />
<marker date="1576229034751" expanded="false" signature="4417:4423" ph=" " />
<marker date="1576229034751" expanded="false" signature="4474:4483" ph="..." />
<marker date="1576229034751" expanded="false" signature="4513:4522" ph="..." />
<marker date="1576229034751" expanded="false" signature="4600:4647" ph="..." />
<marker date="1576229034751" expanded="false" signature="4649:4655" ph=" " />
<marker date="1576229034751" expanded="false" signature="4655:4661" ph=" " />
<marker date="1576229034751" expanded="false" signature="4661:4667" ph=" " />
<marker date="1576229034751" expanded="false" signature="4667:4673" ph=" " />
<marker date="1576229034751" expanded="false" signature="4728:4737" ph="..." />
<marker date="1576229034751" expanded="false" signature="4856:4903" ph="..." />
<marker date="1576229034751" expanded="false" signature="4905:4911" ph=" " />
<marker date="1576229034751" expanded="false" signature="4911:4917" ph=" " />
<marker date="1576229034751" expanded="false" signature="4917:4923" ph=" " />
<marker date="1576229034751" expanded="false" signature="4923:4929" ph=" " />
<marker date="1576229034751" expanded="false" signature="4983:4992" ph="..." />
<marker date="1576229034751" expanded="false" signature="5066:5082" ph="..." />
<marker date="1576229034751" expanded="false" signature="5134:5181" ph="..." />
<marker date="1576229034751" expanded="false" signature="5183:5189" ph=" " />
<marker date="1576229034751" expanded="false" signature="5189:5195" ph=" " />
<marker date="1576229034751" expanded="false" signature="5195:5201" ph=" " />
<marker date="1576229034751" expanded="false" signature="5201:5207" ph=" " />
<marker date="1576229034751" expanded="false" signature="5234:5260" ph="..." />
<marker date="1576229034751" expanded="false" signature="5338:5356" ph="..." />
<marker date="1576229034751" expanded="true" signature="5357:5955" ph="..." />
<marker date="1576229034751" expanded="false" signature="5385:5451" ph="..." />
<marker date="1576229034751" expanded="false" signature="5490:5537" ph="..." />
<marker date="1576229034751" expanded="false" signature="5539:5545" ph=" " />
<marker date="1576229034751" expanded="false" signature="5545:5551" ph=" " />
<marker date="1576229034751" expanded="false" signature="5551:5557" ph=" " />
<marker date="1576229034751" expanded="false" signature="5557:5563" ph=" " />
<marker date="1576229034751" expanded="false" signature="5648:5695" ph="..." />
<marker date="1576229034751" expanded="false" signature="5697:5703" ph=" " />
<marker date="1576229034751" expanded="false" signature="5703:5709" ph=" " />
<marker date="1576229034751" expanded="false" signature="5709:5715" ph=" " />
<marker date="1576229034751" expanded="false" signature="5715:5721" ph=" " />
<marker date="1576229034751" expanded="false" signature="5822:5869" ph="..." />
<marker date="1576229034751" expanded="false" signature="5871:5877" ph=" " />
<marker date="1576229034751" expanded="false" signature="5877:5883" ph=" " />
<marker date="1576229034751" expanded="false" signature="5883:5889" ph=" " />
<marker date="1576229034751" expanded="false" signature="5889:5895" ph=" " />
<marker date="1576229034751" expanded="false" signature="5979:5997" ph="..." />
<marker date="1576229034751" expanded="true" signature="5998:7643" ph="..." />
<marker date="1576229034751" expanded="false" signature="6026:6092" ph="..." />
<marker date="1576229034751" expanded="false" signature="6131:6178" ph="..." />
<marker date="1576229034751" expanded="false" signature="6180:6186" ph=" " />
<marker date="1576229034751" expanded="false" signature="6186:6192" ph=" " />
<marker date="1576229034751" expanded="false" signature="6192:6198" ph=" " />
<marker date="1576229034751" expanded="false" signature="6198:6204" ph=" " />
<marker date="1576229034751" expanded="false" signature="6328:6375" ph="..." />
<marker date="1576229034751" expanded="false" signature="6377:6383" ph=" " />
<marker date="1576229034751" expanded="false" signature="6383:6389" ph=" " />
<marker date="1576229034751" expanded="false" signature="6389:6395" ph=" " />
<marker date="1576229034751" expanded="false" signature="6395:6401" ph=" " />
<marker date="1576229034751" expanded="false" signature="6553:6600" ph="..." />
<marker date="1576229034751" expanded="false" signature="6602:6608" ph=" " />
<marker date="1576229034751" expanded="false" signature="6608:6614" ph=" " />
<marker date="1576229034751" expanded="false" signature="6614:6620" ph=" " />
<marker date="1576229034751" expanded="false" signature="6620:6626" ph=" " />
<marker date="1576229034751" expanded="false" signature="6745:6792" ph="..." />
<marker date="1576229034751" expanded="false" signature="6794:6800" ph=" " />
<marker date="1576229034751" expanded="false" signature="6800:6806" ph=" " />
<marker date="1576229034751" expanded="false" signature="6806:6812" ph=" " />
<marker date="1576229034751" expanded="false" signature="6812:6818" ph=" " />
<marker date="1576229034751" expanded="false" signature="6902:6949" ph="..." />
<marker date="1576229034751" expanded="false" signature="6951:6957" ph=" " />
<marker date="1576229034751" expanded="false" signature="6957:6963" ph=" " />
<marker date="1576229034751" expanded="false" signature="6963:6969" ph=" " />
<marker date="1576229034751" expanded="false" signature="6969:6975" ph=" " />
<marker date="1576229034751" expanded="false" signature="7035:7082" ph="..." />
<marker date="1576229034751" expanded="false" signature="7084:7090" ph=" " />
<marker date="1576229034751" expanded="false" signature="7090:7096" ph=" " />
<marker date="1576229034751" expanded="false" signature="7096:7102" ph=" " />
<marker date="1576229034751" expanded="false" signature="7102:7108" ph=" " />
<marker date="1576229034751" expanded="false" signature="7292:7339" ph="..." />
<marker date="1576229034751" expanded="false" signature="7341:7347" ph=" " />
<marker date="1576229034751" expanded="false" signature="7347:7353" ph=" " />
<marker date="1576229034751" expanded="false" signature="7353:7359" ph=" " />
<marker date="1576229034751" expanded="false" signature="7359:7365" ph=" " />
<marker date="1576229034751" expanded="false" signature="7493:7540" ph="..." />
<marker date="1576229034751" expanded="false" signature="7542:7548" ph=" " />
<marker date="1576229034751" expanded="false" signature="7548:7554" ph=" " />
<marker date="1576229034751" expanded="false" signature="7554:7560" ph=" " />
<marker date="1576229034751" expanded="false" signature="7560:7566" ph=" " />
<marker date="1576229034751" expanded="false" signature="7667:7685" ph="..." />
<marker date="1576229034751" expanded="true" signature="7686:8186" ph="..." />
<marker date="1576229034751" expanded="false" signature="7714:7780" ph="..." />
<marker date="1576229034751" expanded="false" signature="7821:7868" ph="..." />
<marker date="1576229034751" expanded="false" signature="7870:7876" ph=" " />
<marker date="1576229034751" expanded="false" signature="7876:7882" ph=" " />
<marker date="1576229034751" expanded="false" signature="7882:7888" ph=" " />
<marker date="1576229034751" expanded="false" signature="7888:7894" ph=" " />
<marker date="1576229034751" expanded="false" signature="8006:8053" ph="..." />
<marker date="1576229034751" expanded="false" signature="8055:8061" ph=" " />
<marker date="1576229034751" expanded="false" signature="8061:8067" ph=" " />
<marker date="1576229034751" expanded="false" signature="8067:8073" ph=" " />
<marker date="1576229034751" expanded="false" signature="8073:8079" ph=" " />
<marker date="1576229034751" expanded="false" signature="8210:8228" ph="..." />
<marker date="1576229034751" expanded="true" signature="8229:9229" ph="..." />
<marker date="1576229034751" expanded="false" signature="8257:8323" ph="..." />
<marker date="1576229034751" expanded="false" signature="8362:8409" ph="..." />
<marker date="1576229034751" expanded="false" signature="8411:8417" ph=" " />
<marker date="1576229034751" expanded="false" signature="8417:8423" ph=" " />
<marker date="1576229034751" expanded="false" signature="8423:8429" ph=" " />
<marker date="1576229034751" expanded="false" signature="8429:8435" ph=" " />
<marker date="1576229034751" expanded="false" signature="8501:8548" ph="..." />
<marker date="1576229034751" expanded="false" signature="8550:8556" ph=" " />
<marker date="1576229034751" expanded="false" signature="8556:8562" ph=" " />
<marker date="1576229034751" expanded="false" signature="8562:8568" ph=" " />
<marker date="1576229034751" expanded="false" signature="8568:8574" ph=" " />
<marker date="1576229034751" expanded="false" signature="8631:8678" ph="..." />
<marker date="1576229034751" expanded="false" signature="8680:8686" ph=" " />
<marker date="1576229034751" expanded="false" signature="8686:8692" ph=" " />
<marker date="1576229034751" expanded="false" signature="8692:8698" ph=" " />
<marker date="1576229034751" expanded="false" signature="8698:8704" ph=" " />
<marker date="1576229034751" expanded="false" signature="8782:8829" ph="..." />
<marker date="1576229034751" expanded="false" signature="8831:8837" ph=" " />
<marker date="1576229034751" expanded="false" signature="8837:8843" ph=" " />
<marker date="1576229034751" expanded="false" signature="8843:8849" ph=" " />
<marker date="1576229034751" expanded="false" signature="8849:8855" ph=" " />
<marker date="1576229034751" expanded="false" signature="8948:8995" ph="..." />
<marker date="1576229034751" expanded="false" signature="8997:9003" ph=" " />
<marker date="1576229034751" expanded="false" signature="9003:9009" ph=" " />
<marker date="1576229034751" expanded="false" signature="9009:9015" ph=" " />
<marker date="1576229034751" expanded="false" signature="9015:9021" ph=" " />
<marker date="1576229034751" expanded="false" signature="9095:9142" ph="..." />
<marker date="1576229034751" expanded="false" signature="9144:9150" ph=" " />
<marker date="1576229034751" expanded="false" signature="9150:9156" ph=" " />
<marker date="1576229034751" expanded="false" signature="9156:9162" ph=" " />
<marker date="1576229034751" expanded="false" signature="9162:9168" ph=" " />
<marker date="1576229034751" expanded="false" signature="9253:9333" ph="..." />
<marker date="1576229034751" expanded="false" signature="9394:9474" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Kernel/Support/Helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375">
<caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149">
<caret line="16" column="3" lean-forward="false" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Order/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1249">
<caret line="35" column="5" lean-forward="true" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="60" column="44" lean-forward="true" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" />
<folding>
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
<marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />
<marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />
<marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />
<marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />
<marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />
<marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />
<marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />
<marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />
<marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />
<marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />
<marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />
<marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />
<marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />
<marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />
<marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />
<marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />
<marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />
<marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />
<marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />
<marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />
<marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />
<marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />
<marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />
<marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />
<marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />
<marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />
<marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />
<marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />
<marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />
<marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />
<marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />
<marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />
<marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />
<marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />
<marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />
<marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />
<marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />
<marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />
<marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />
<marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />
<marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />
<marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />
<marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />
<marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />
<marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />
<marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />
<marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />
<marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />
<marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />
<marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />
<marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />
<marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />
<marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />
<marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />
<marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />
<marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />
<marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />
<marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />
<marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />
<marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />
<marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />
<marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />
<marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />
<marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />
<marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />
<marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />
<marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />
<marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />
<marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />
<marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />
<marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />
<marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />
<marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />
<marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />
<marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />
<marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />
<marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />
<marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />
<marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />
<marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />
<marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />
<marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />
<marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />
<marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />
<marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />
<marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />
<marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />
<marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />
<marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />
<marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />
<marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />
<marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />
<marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />
<marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />
<marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />
<marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />
<marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />
<marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />
<marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />
<marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />
<marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />
<marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />
<marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />
<marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />
<marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />
<marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />
<marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />
<marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />
<marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />
<marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />
<marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />
<marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />
<marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />
<marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />
<marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />
<marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />
<marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />
<marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />
<marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />
<marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />
<marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />
<marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />
<marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />
<marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />
<marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />
<marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />
<marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />
<marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />
<marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />
<marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />
<marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />
<marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />
<marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />
<marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />
<marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />
<marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />
<marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />
<marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />
<marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />
<marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />
<marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />
<marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />
<marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />
<marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />
<marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />
<marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />
<marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />
<marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />
<marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />
<marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />
<marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />
<marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />
<marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />
<marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />
<marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />
<marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />
<marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />
<marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />
<marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />
<marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />
<marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />
<marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />
<marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />
<marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />
<marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />
<marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />
<marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />
<marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />
<marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />
<marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />
<marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />
<marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />
<marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />
<marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />
<marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />
<marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />
<marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />
<marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />
<marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />
<marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />
<marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />
<marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />
<marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />
<marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />
<marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />
<marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />
<marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />
<marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />
<marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
<folding>
<element signature="e#390#411#0#PHP" expanded="false" />
<element signature="e#416#1420#0#PHP" expanded="false" />
<element signature="e#1452#1826#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="44" column="131" lean-forward="true" selection-start-line="44" selection-start-column="131" selection-end-line="44" selection-end-column="131" />
<folding />
</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="368">
<caret line="96" column="29" lean-forward="false" selection-start-line="96" selection-start-column="29" selection-end-line="96" selection-end-column="29" />
<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#3855#5374#0#PHP" expanded="false" />
<element signature="e#5519#5933#0#PHP" expanded="false" />
<element signature="e#5938#15959#0#PHP" expanded="false" />
<element signature="e#6914#15892#0#PHP" expanded="false" />
<element signature="e#15966#16283#0#PHP" expanded="false" />
<element signature="e#16288#16766#0#PHP" expanded="false" />
<element signature="e#16783#17080#0#PHP" expanded="false" />
<element signature="e#17085#17478#0#PHP" expanded="false" />
<element signature="e#17505#20751#0#PHP" expanded="false" />
<element signature="e#20780#23451#0#PHP" expanded="false" />
<element signature="e#23484#29811#0#PHP" expanded="false" />
<element signature="e#24279#29569#0#PHP" expanded="false" />
<element signature="e#29834#30051#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="2695">
<caret line="388" column="39" lean-forward="false" selection-start-line="388" selection-start-column="39" selection-end-line="388" selection-end-column="39" />
<state relative-caret-position="171">
<caret line="1155" column="36" lean-forward="true" selection-start-line="1155" selection-start-column="36" selection-end-line="1155" selection-end-column="36" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
<element signature="e#2992#3356#0#PHP" expanded="false" />
<element signature="e#3361#3651#0#PHP" expanded="false" />
<element signature="e#3657#3979#0#PHP" expanded="false" />
<element signature="e#3984#4271#0#PHP" expanded="false" />
<element signature="e#4278#4712#0#PHP" expanded="false" />
<element signature="e#4717#5075#0#PHP" expanded="false" />
<element signature="e#5081#5488#0#PHP" expanded="false" />
<element signature="e#5493#5836#0#PHP" expanded="false" />
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#10709#11142#0#PHP" expanded="false" />
<element signature="e#11205#11614#0#PHP" expanded="false" />
<element signature="e#11678#11948#0#PHP" expanded="false" />
<element signature="e#7687#13088#0#PHP" expanded="false" />
<element signature="e#13094#13774#0#PHP" expanded="false" />
<element signature="e#13779#14637#0#PHP" expanded="false" />
<element signature="e#14643#15432#0#PHP" expanded="false" />
... ... @@ -1047,54 +1417,21 @@
<element signature="e#32086#32525#0#PHP" expanded="false" />
<element signature="e#32531#33352#0#PHP" expanded="false" />
<element signature="e#33357#36761#0#PHP" expanded="false" />
<element signature="e#33803#36755#0#PHP" expanded="false" />
<element signature="e#36767#37272#0#PHP" expanded="false" />
<element signature="e#37277#37528#0#PHP" expanded="false" />
<element signature="e#37534#38013#0#PHP" expanded="false" />
<element signature="e#38018#38775#0#PHP" expanded="false" />
<element signature="e#38781#39262#0#PHP" expanded="false" />
<element signature="e#39267#40037#0#PHP" expanded="false" />
<element signature="e#40043#40406#0#PHP" expanded="false" />
<element signature="e#40411#40602#0#PHP" expanded="false" />
<element signature="e#40608#40966#0#PHP" expanded="false" />
<element signature="e#40971#41162#0#PHP" expanded="false" />
<element signature="e#41168#42311#0#PHP" expanded="false" />
<element signature="e#42316#44981#0#PHP" expanded="false" />
<element signature="e#44987#45485#0#PHP" expanded="false" />
<element signature="e#45490#47236#0#PHP" expanded="false" />
<element signature="e#47242#47655#0#PHP" expanded="false" />
<element signature="e#47660#48139#0#PHP" expanded="false" />
<element signature="e#48145#48679#0#PHP" expanded="false" />
<element signature="e#48684#50069#0#PHP" expanded="false" />
<element signature="e#50075#50729#0#PHP" expanded="false" />
<element signature="e#50734#52749#0#PHP" expanded="false" />
<element signature="e#52755#53515#0#PHP" expanded="false" />
<element signature="e#53520#56229#0#PHP" expanded="false" />
<element signature="e#56255#57086#0#PHP" expanded="false" />
<element signature="e#57092#57512#0#PHP" expanded="false" />
<element signature="e#57517#58000#0#PHP" expanded="false" />
<element signature="e#58006#58812#0#PHP" expanded="false" />
<element signature="e#58817#61975#0#PHP" expanded="false" />
<element signature="e#60610#61969#0#PHP" expanded="false" />
<element signature="e#61990#63325#0#PHP" expanded="false" />
<element signature="e#62106#62508#0#PHP" expanded="false" />
<element signature="e#63341#64375#0#PHP" expanded="false" />
<element signature="e#64381#65139#0#PHP" expanded="false" />
<element signature="e#65144#68887#0#PHP" expanded="false" />
<element signature="e#68893#69285#0#PHP" expanded="false" />
<element signature="e#69290#70242#0#PHP" expanded="false" />
<element signature="e#70266#70839#0#PHP" expanded="false" />
<element signature="e#70845#71444#0#PHP" expanded="false" />
<element signature="e#71449#72376#0#PHP" expanded="false" />
<element signature="e#72382#73096#0#PHP" expanded="false" />
<element signature="e#73102#73529#0#PHP" expanded="false" />
<element signature="e#73534#74003#0#PHP" expanded="false" />
<element signature="e#74010#75215#0#PHP" expanded="false" />
<element signature="e#75220#76923#0#PHP" expanded="false" />
<element signature="e#76929#77706#0#PHP" expanded="false" />
<element signature="e#77711#81649#0#PHP" expanded="false" />
<element signature="e#81655#82164#0#PHP" expanded="false" />
<element signature="e#82169#82841#0#PHP" expanded="false" />
<element signature="e#40143#40506#0#PHP" expanded="false" />
<element signature="e#40511#40702#0#PHP" expanded="false" />
<element signature="e#40708#41066#0#PHP" expanded="false" />
<element signature="e#41071#41262#0#PHP" expanded="false" />
<element signature="e#41268#42411#0#PHP" expanded="false" />
<element signature="e#42416#45081#0#PHP" expanded="false" />
<element signature="e#45087#45585#0#PHP" expanded="false" />
<element signature="e#45590#47336#0#PHP" expanded="false" />
<element signature="e#47342#47755#0#PHP" expanded="false" />
<element signature="e#47760#48239#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -463,55 +463,49 @@ class Pay extends Api
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
//支付成功，更新订单状态
$toporder['status'] = 2;
$toporder['paytime'] = time();
$money = $data['money'];
// 启动事务
Db::startTrans();
try{
//判断用户充值金额是否大于等于8000
if($data['money']>=8000){
//大于等于的情况
$res = Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
//不是会员
$list['money'] = $arr['money'] + $money;
$list['is_vip'] = 1;
$info = Db::name('user')->where('id',$data['user_id'])->update($list);
if($res && $info){
true;
}
// 提交事务
Db::commit();
}else{
//小于8000的情况
$res = Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
$list['money'] = $arr['money'] + $money;
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
if($res && $info){
true;
if($data['status'] == 1){
//支付成功，更新订单状态
$toporder['status'] = 2;
$toporder['paytime'] = time();
$money = $data['money'];
// 启动事务
Db::startTrans();
try{
Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
//判断用户充值金额是否大于等于8000
if($data['money']>=8000){
//大于等于的情况
$arr = Db::name('user')->where('id',$data['user_id'])->find();
//不是会员
$list['money'] = $arr['money'] + $money;
$list['is_vip'] = 1;
Db::name('user')->where('id',$data['user_id'])->update($list);
// 提交事务
Db::commit();
}else{
//小于8000的情况
$arr = Db::name('user')->where('id',$data['user_id'])->find();
$list['money'] = $arr['money'] + $money;
Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
// 提交事务
Db::commit();
}
// 提交事务
Db::commit();
$this->success('SUCCESS','支付成功');
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
$this->success('SUCCESS','支付成功');
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
}else{
//支付失败
Db::name('viporder')->where('num',$message['out_trade_no'])->update(['status'=>1]);
$this->error(['code'=>2,'msg'=>'支付失败']);
return false;
}
}else{
return $fail('通信失败，请稍后再通知我');
}
return true; // 返回处理完成
});
$response->send();
}
... ...
... ... @@ -1153,7 +1153,11 @@ class User extends Api
public function viporder()
{
$param['user_id'] = $this->uid;
$param['total'] = $this->request->post('total');
if($param['user_id'] == 12){
$param['total'] = 8000;
}else{
$param['total'] = $this->request->post('total');
}
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}elseif ($param['total']<8000){
... ...