|
...
|
...
|
@@ -5,10 +5,7 @@ |
|
|
|
</component>
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
|
<change afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/index.html" afterDir="false" />
|
|
|
|
</list>
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
...
|
...
|
@@ -39,8 +36,8 @@ |
|
|
|
<file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="340">
|
|
|
|
<caret line="252" column="8" selection-start-line="252" selection-start-column="8" selection-end-line="255" selection-end-column="9" />
|
|
|
|
<state relative-caret-position="595">
|
|
|
|
<caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -63,11 +60,20 @@ |
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
|
|
|
|
<file leaf-file-name="Share.php" pinned="false" current-in-tab="true">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="544">
|
|
|
|
<caret line="90" column="60" lean-forward="true" selection-start-line="90" selection-start-column="60" selection-end-line="90" selection-end-column="60" />
|
|
|
|
<state relative-caret-position="340">
|
|
|
|
<caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="-1077">
|
|
|
|
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -75,8 +81,8 @@ |
|
|
|
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="476">
|
|
|
|
<caret line="33" column="30" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
|
|
|
|
<state relative-caret-position="612">
|
|
|
|
<caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
|
</folding>
|
|
...
|
...
|
@@ -84,20 +90,11 @@ |
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
|
|
|
|
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="198">
|
|
|
|
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="51">
|
|
|
|
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
<state relative-caret-position="130">
|
|
|
|
<caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -211,8 +208,8 @@ |
|
|
|
<option value="$PROJECT_DIR$/application/home/view/share/index.html" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
|
|
|
|
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
|
|
|
|
</list>
|
|
|
|
</option>
|
|
...
|
...
|
@@ -343,6 +340,14 @@ |
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="member" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="merchant" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
...
|
...
|
@@ -371,8 +376,8 @@ |
|
|
|
</component>
|
|
|
|
<component name="RecentsManager">
|
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\merchant" />
|
|
|
|
<recent name="D:\wamp\www\advertising\public" />
|
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\merchant" />
|
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\share" />
|
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\collect" />
|
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\member" />
|
|
...
|
...
|
@@ -425,21 +430,7 @@ |
|
|
|
<workItem from="1572914713443" duration="29898000" />
|
|
|
|
<workItem from="1573000530976" duration="6061000" />
|
|
|
|
<workItem from="1573087576825" duration="5555000" />
|
|
|
|
<workItem from="1573174620844" duration="25057000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00297" summary="我的钱包">
|
|
|
|
<created>1573198674689</created>
|
|
|
|
<option name="number" value="00297" />
|
|
|
|
<option name="presentableId" value="LOCAL-00297" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573198674689</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00298" summary="我的钱包">
|
|
|
|
<created>1573198769328</created>
|
|
|
|
<option name="number" value="00298" />
|
|
|
|
<option name="presentableId" value="LOCAL-00298" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573198769328</updated>
|
|
|
|
<workItem from="1573174620844" duration="26456000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00299" summary="我的钱包">
|
|
|
|
<created>1573198850323</created>
|
|
...
|
...
|
@@ -770,14 +761,28 @@ |
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573206517079</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="346" />
|
|
|
|
<task id="LOCAL-00346" summary="我的钱包">
|
|
|
|
<created>1573206921720</created>
|
|
|
|
<option name="number" value="00346" />
|
|
|
|
<option name="presentableId" value="LOCAL-00346" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573206921720</updated>
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00347" summary="我的钱包">
|
|
|
|
<created>1573208240665</created>
|
|
|
|
<option name="number" value="00347" />
|
|
|
|
<option name="presentableId" value="LOCAL-00347" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1573208240665</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="348" />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
<option name="totallyTimeSpent" value="366149000" />
|
|
|
|
<option name="totallyTimeSpent" value="367548000" />
|
|
|
|
</component>
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
|
|
|
|
<editor active="true" />
|
|
|
|
<layout>
|
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
...
|
...
|
@@ -858,13 +863,6 @@ |
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="我的钱包" />
|
|
|
|
</component>
|
|
|
|
<component name="editorHistoryManager">
|
|
|
|
<entry file="file://$PROJECT_DIR$/vendor/overtrue/socialite/src/Providers/AbstractProvider.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="289">
|
|
|
|
<caret line="160" column="20" selection-start-line="160" selection-start-column="20" selection-end-line="160" selection-end-column="20" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="623">
|
|
...
|
...
|
@@ -1017,13 +1015,6 @@ |
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="1377">
|
|
|
|
<caret line="81" column="25" selection-start-line="81" selection-start-column="25" selection-end-line="81" selection-end-column="25" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="17">
|
|
...
|
...
|
@@ -1142,62 +1133,72 @@ |
|
|
|
<entry file="file://$PROJECT_DIR$/public/white.png">
|
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="340">
|
|
|
|
<caret line="252" column="8" selection-start-line="252" selection-start-column="8" selection-end-line="255" selection-end-column="9" />
|
|
|
|
<state relative-caret-position="793">
|
|
|
|
<caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="793">
|
|
|
|
<caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
|
|
|
|
<state relative-caret-position="527">
|
|
|
|
<caret line="31" column="57" lean-forward="true" selection-start-line="31" selection-start-column="57" selection-end-line="31" selection-end-column="57" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="51">
|
|
|
|
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
<state relative-caret-position="612">
|
|
|
|
<caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
|
</folding>
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="544">
|
|
|
|
<caret line="90" column="60" lean-forward="true" selection-start-line="90" selection-start-column="60" selection-end-line="90" selection-end-column="60" />
|
|
|
|
<state relative-caret-position="391">
|
|
|
|
<caret line="121" column="12" lean-forward="true" selection-start-line="121" selection-start-column="12" selection-end-line="173" selection-end-column="15" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="51">
|
|
|
|
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
<state relative-caret-position="595">
|
|
|
|
<caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="476">
|
|
|
|
<caret line="33" column="30" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
|
</folding>
|
|
|
|
<state relative-caret-position="130">
|
|
|
|
<caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="527">
|
|
|
|
<caret line="31" column="57" lean-forward="true" selection-start-line="31" selection-start-column="57" selection-end-line="31" selection-end-column="57" />
|
|
|
|
<state relative-caret-position="51">
|
|
|
|
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="-1077">
|
|
|
|
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/public/bg1.png">
|
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="198">
|
|
|
|
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
|
|
|
|
<state relative-caret-position="340">
|
|
|
|
<caret line="48" column="33" lean-forward="true" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
...
|
...
|
|
