...
|
...
|
@@ -3,7 +3,7 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -17,11 +17,11 @@ |
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="130">
|
|
|
<caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
|
|
|
<state relative-caret-position="810">
|
|
|
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
|
|
|
<folding>
|
|
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
@@ -32,8 +32,8 @@ |
|
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="459">
|
|
|
<caret line="72" column="29" selection-start-line="72" selection-start-column="19" selection-end-line="72" selection-end-column="29" />
|
|
|
<state relative-caret-position="765">
|
|
|
<caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
|
|
|
<folding>
|
|
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
@@ -69,11 +69,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="187">
|
|
|
<caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
|
|
|
<state relative-caret-position="527">
|
|
|
<caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -162,9 +162,9 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -369,7 +369,7 @@ |
|
|
<workItem from="1572050747518" duration="29776000" />
|
|
|
<workItem from="1572087949120" duration="1641000" />
|
|
|
<workItem from="1572223206994" duration="28857000" />
|
|
|
<workItem from="1572309778506" duration="18550000" />
|
|
|
<workItem from="1572309778506" duration="22840000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="数据库配置">
|
|
|
<created>1571972429395</created>
|
...
|
...
|
@@ -497,11 +497,32 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572332735985</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="19" />
|
|
|
<task id="LOCAL-00019" summary="证书">
|
|
|
<created>1572333088901</created>
|
|
|
<option name="number" value="00019" />
|
|
|
<option name="presentableId" value="LOCAL-00019" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572333088901</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00020" summary="证书">
|
|
|
<created>1572333312716</created>
|
|
|
<option name="number" value="00020" />
|
|
|
<option name="presentableId" value="LOCAL-00020" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572333312716</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00021" summary="支付">
|
|
|
<created>1572337801981</created>
|
|
|
<option name="number" value="00021" />
|
|
|
<option name="presentableId" value="LOCAL-00021" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572337801981</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="22" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="177658000" />
|
|
|
<option name="totallyTimeSpent" value="181948000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -565,16 +586,10 @@ |
|
|
<MESSAGE value="微信公众平台配置" />
|
|
|
<MESSAGE value="调试授权" />
|
|
|
<MESSAGE value="证书" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="证书" />
|
|
|
<MESSAGE value="支付" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="支付" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="391">
|
|
|
<caret line="23" column="77" selection-start-line="23" selection-start-column="77" selection-end-line="23" selection-end-column="77" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/addons.js">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
...
|
...
|
@@ -875,13 +890,6 @@ |
|
|
<entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="187">
|
|
|
<caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="759">
|
...
|
...
|
@@ -901,24 +909,38 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="459">
|
|
|
<caret line="72" column="29" selection-start-line="72" selection-start-column="19" selection-end-line="72" selection-end-column="29" />
|
|
|
<state relative-caret-position="765">
|
|
|
<caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
|
|
|
<folding>
|
|
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/fast.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="562">
|
|
|
<caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="130">
|
|
|
<caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
|
|
|
<state relative-caret-position="810">
|
|
|
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
|
|
|
<folding>
|
|
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="527">
|
|
|
<caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|
...
|
...
|
|