1
|
<?xml version="1.0" encoding="UTF-8"?>
|
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
- <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" />
|
4
|
+ <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
5
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
|
|
7
|
+ </list>
|
5
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
6
|
<option name="TRACKING_ENABLED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
7
|
<option name="SHOW_DIALOG" value="false" />
|
10
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -14,11 +17,11 @@ |
|
@@ -14,11 +17,11 @@ |
14
|
</component>
|
17
|
</component>
|
15
|
<component name="FileEditorManager">
|
18
|
<component name="FileEditorManager">
|
16
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
19
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
17
|
- <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
20
|
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
18
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
21
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
19
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
20
|
<state relative-caret-position="357">
|
23
|
<state relative-caret-position="357">
|
21
|
- <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
|
24
|
+ <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
|
22
|
</state>
|
25
|
</state>
|
23
|
</provider>
|
26
|
</provider>
|
24
|
</entry>
|
27
|
</entry>
|
|
@@ -47,17 +50,17 @@ |
|
@@ -47,17 +50,17 @@ |
47
|
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
|
50
|
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
|
48
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
49
|
<provider selected="true" editor-type-id="text-editor">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
50
|
- <state relative-caret-position="742">
|
53
|
+ <state relative-caret-position="334">
|
51
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
54
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
52
|
</state>
|
55
|
</state>
|
53
|
</provider>
|
56
|
</provider>
|
54
|
</entry>
|
57
|
</entry>
|
55
|
</file>
|
58
|
</file>
|
56
|
- <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
|
59
|
+ <file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
57
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
60
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
58
|
<provider selected="true" editor-type-id="text-editor">
|
61
|
<provider selected="true" editor-type-id="text-editor">
|
59
|
- <state>
|
|
|
60
|
- <caret selection-end-line="1" />
|
62
|
+ <state relative-caret-position="289">
|
|
|
63
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
61
|
</state>
|
64
|
</state>
|
62
|
</provider>
|
65
|
</provider>
|
63
|
</entry>
|
66
|
</entry>
|
|
@@ -115,7 +118,6 @@ |
|
@@ -115,7 +118,6 @@ |
115
|
<component name="IdeDocumentHistory">
|
118
|
<component name="IdeDocumentHistory">
|
116
|
<option name="CHANGED_PATHS">
|
119
|
<option name="CHANGED_PATHS">
|
117
|
<list>
|
120
|
<list>
|
118
|
- <option value="$PROJECT_DIR$/application/home/controller/Question.php" />
|
|
|
119
|
<option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
|
121
|
<option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
|
120
|
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
121
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
123
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
|
@@ -166,6 +168,7 @@ |
|
@@ -166,6 +168,7 @@ |
166
|
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
168
|
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
167
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
169
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
168
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
170
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
171
|
+ <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
169
|
</list>
|
172
|
</list>
|
170
|
</option>
|
173
|
</option>
|
171
|
</component>
|
174
|
</component>
|
|
@@ -428,7 +431,7 @@ |
|
@@ -428,7 +431,7 @@ |
428
|
<workItem from="1572223206994" duration="28857000" />
|
431
|
<workItem from="1572223206994" duration="28857000" />
|
429
|
<workItem from="1572309778506" duration="26117000" />
|
432
|
<workItem from="1572309778506" duration="26117000" />
|
430
|
<workItem from="1572395935540" duration="28313000" />
|
433
|
<workItem from="1572395935540" duration="28313000" />
|
431
|
- <workItem from="1572483209367" duration="10866000" />
|
434
|
+ <workItem from="1572483209367" duration="11705000" />
|
432
|
</task>
|
435
|
</task>
|
433
|
<task id="LOCAL-00001" summary="数据库配置">
|
436
|
<task id="LOCAL-00001" summary="数据库配置">
|
434
|
<created>1571972429395</created>
|
437
|
<created>1571972429395</created>
|
|
@@ -731,17 +734,24 @@ |
|
@@ -731,17 +734,24 @@ |
731
|
<option name="project" value="LOCAL" />
|
734
|
<option name="project" value="LOCAL" />
|
732
|
<updated>1572501549206</updated>
|
735
|
<updated>1572501549206</updated>
|
733
|
</task>
|
736
|
</task>
|
734
|
- <option name="localTasksCounter" value="44" />
|
737
|
+ <task id="LOCAL-00044" summary="调试授权登录">
|
|
|
738
|
+ <created>1572502485108</created>
|
|
|
739
|
+ <option name="number" value="00044" />
|
|
|
740
|
+ <option name="presentableId" value="LOCAL-00044" />
|
|
|
741
|
+ <option name="project" value="LOCAL" />
|
|
|
742
|
+ <updated>1572502485108</updated>
|
|
|
743
|
+ </task>
|
|
|
744
|
+ <option name="localTasksCounter" value="45" />
|
735
|
<servers />
|
745
|
<servers />
|
736
|
</component>
|
746
|
</component>
|
737
|
<component name="TimeTrackingManager">
|
747
|
<component name="TimeTrackingManager">
|
738
|
- <option name="totallyTimeSpent" value="224404000" />
|
748
|
+ <option name="totallyTimeSpent" value="225243000" />
|
739
|
</component>
|
749
|
</component>
|
740
|
<component name="ToolWindowManager">
|
750
|
<component name="ToolWindowManager">
|
741
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
751
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
742
|
<editor active="true" />
|
752
|
<editor active="true" />
|
743
|
<layout>
|
753
|
<layout>
|
744
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" />
|
754
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" />
|
745
|
<window_info anchor="bottom" id="TODO" order="6" />
|
755
|
<window_info anchor="bottom" id="TODO" order="6" />
|
746
|
<window_info anchor="bottom" id="调试" order="7" />
|
756
|
<window_info anchor="bottom" id="调试" order="7" />
|
747
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
757
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
@@ -1110,13 +1120,6 @@ |
|
@@ -1110,13 +1120,6 @@ |
1110
|
</state>
|
1120
|
</state>
|
1111
|
</provider>
|
1121
|
</provider>
|
1112
|
</entry>
|
1122
|
</entry>
|
1113
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
1114
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1115
|
- <state relative-caret-position="742">
|
|
|
1116
|
- <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
1117
|
- </state>
|
|
|
1118
|
- </provider>
|
|
|
1119
|
- </entry>
|
|
|
1120
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
1123
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
1121
|
<provider selected="true" editor-type-id="text-editor">
|
1124
|
<provider selected="true" editor-type-id="text-editor">
|
1122
|
<state relative-caret-position="283">
|
1125
|
<state relative-caret-position="283">
|
|
@@ -1124,16 +1127,6 @@ |
|
@@ -1124,16 +1127,6 @@ |
1124
|
</state>
|
1127
|
</state>
|
1125
|
</provider>
|
1128
|
</provider>
|
1126
|
</entry>
|
1129
|
</entry>
|
1127
|
- <entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
|
|
1128
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1129
|
- <state relative-caret-position="374">
|
|
|
1130
|
- <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
|
|
|
1131
|
- <folding>
|
|
|
1132
|
- <element signature="n#style#0;n#html#0;n#!!top" />
|
|
|
1133
|
- </folding>
|
|
|
1134
|
- </state>
|
|
|
1135
|
- </provider>
|
|
|
1136
|
- </entry>
|
|
|
1137
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
|
1130
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
|
1138
|
<provider selected="true" editor-type-id="text-editor">
|
1131
|
<provider selected="true" editor-type-id="text-editor">
|
1139
|
<state relative-caret-position="85">
|
1132
|
<state relative-caret-position="85">
|
|
@@ -1162,17 +1155,34 @@ |
|
@@ -1162,17 +1155,34 @@ |
1162
|
</state>
|
1155
|
</state>
|
1163
|
</provider>
|
1156
|
</provider>
|
1164
|
</entry>
|
1157
|
</entry>
|
1165
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
1158
|
+ <entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
1166
|
<provider selected="true" editor-type-id="text-editor">
|
1159
|
<provider selected="true" editor-type-id="text-editor">
|
1167
|
- <state>
|
|
|
1168
|
- <caret selection-end-line="1" />
|
1160
|
+ <state relative-caret-position="374">
|
|
|
1161
|
+ <caret line="67" column="65" selection-start-line="67" selection-start-column="65" selection-end-line="67" selection-end-column="65" />
|
|
|
1162
|
+ <folding>
|
|
|
1163
|
+ <element signature="n#style#0;n#html#0;n#!!top" />
|
|
|
1164
|
+ </folding>
|
1169
|
</state>
|
1165
|
</state>
|
1170
|
</provider>
|
1166
|
</provider>
|
1171
|
</entry>
|
1167
|
</entry>
|
1172
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
1168
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
1173
|
<provider selected="true" editor-type-id="text-editor">
|
1169
|
<provider selected="true" editor-type-id="text-editor">
|
1174
|
<state relative-caret-position="357">
|
1170
|
<state relative-caret-position="357">
|
1175
|
- <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
|
1171
|
+ <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
|
|
|
1172
|
+ </state>
|
|
|
1173
|
+ </provider>
|
|
|
1174
|
+ </entry>
|
|
|
1175
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
1176
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1177
|
+ <state relative-caret-position="334">
|
|
|
1178
|
+ <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
1179
|
+ </state>
|
|
|
1180
|
+ </provider>
|
|
|
1181
|
+ </entry>
|
|
|
1182
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
1183
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1184
|
+ <state relative-caret-position="289">
|
|
|
1185
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
1176
|
</state>
|
1186
|
</state>
|
1177
|
</provider>
|
1187
|
</provider>
|
1178
|
</entry>
|
1188
|
</entry>
|