|
@@ -66,12 +66,26 @@ |
|
@@ -66,12 +66,26 @@ |
66
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
66
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
67
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
67
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
68
|
<provider selected="true" editor-type-id="text-editor">
|
68
|
<provider selected="true" editor-type-id="text-editor">
|
69
|
- <state relative-caret-position="357">
|
|
|
70
|
- <caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
69
|
+ <state relative-caret-position="315">
|
|
|
70
|
+ <caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
|
71
|
</state>
|
71
|
</state>
|
72
|
</provider>
|
72
|
</provider>
|
73
|
</entry>
|
73
|
</entry>
|
74
|
</file>
|
74
|
</file>
|
|
|
75
|
+ <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
|
|
|
76
|
+ <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
|
|
77
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
78
|
+ <state relative-caret-position="549">
|
|
|
79
|
+ <caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
|
|
|
80
|
+ </state>
|
|
|
81
|
+ </provider>
|
|
|
82
|
+ </entry>
|
|
|
83
|
+ </file>
|
|
|
84
|
+ <file leaf-file-name="BaseController.php" pinned="false" current-in-tab="false">
|
|
|
85
|
+ <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
|
|
|
86
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
87
|
+ </entry>
|
|
|
88
|
+ </file>
|
75
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
|
89
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
|
76
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
90
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
77
|
<provider selected="true" editor-type-id="text-editor">
|
91
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -83,14 +97,9 @@ |
|
@@ -83,14 +97,9 @@ |
83
|
</file>
|
97
|
</file>
|
84
|
<file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
|
98
|
<file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
|
85
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
99
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
86
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
87
|
- </entry>
|
|
|
88
|
- </file>
|
|
|
89
|
- <file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false">
|
|
|
90
|
- <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
|
|
|
91
|
<provider selected="true" editor-type-id="text-editor">
|
100
|
<provider selected="true" editor-type-id="text-editor">
|
92
|
<state relative-caret-position="420">
|
101
|
<state relative-caret-position="420">
|
93
|
- <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
|
102
|
+ <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
|
94
|
</state>
|
103
|
</state>
|
95
|
</provider>
|
104
|
</provider>
|
96
|
</entry>
|
105
|
</entry>
|
|
@@ -208,6 +217,24 @@ |
|
@@ -208,6 +217,24 @@ |
208
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
217
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
209
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
218
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
210
|
</path>
|
219
|
</path>
|
|
|
220
|
+ <path>
|
|
|
221
|
+ <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
222
|
+ <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
223
|
+ <item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
224
|
+ </path>
|
|
|
225
|
+ <path>
|
|
|
226
|
+ <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
227
|
+ <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
228
|
+ <item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
229
|
+ <item name="cmf" type="462c0819:PsiDirectoryNode" />
|
|
|
230
|
+ </path>
|
|
|
231
|
+ <path>
|
|
|
232
|
+ <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
233
|
+ <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
234
|
+ <item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
235
|
+ <item name="cmf" type="462c0819:PsiDirectoryNode" />
|
|
|
236
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
237
|
+ </path>
|
211
|
</expand>
|
238
|
</expand>
|
212
|
<select />
|
239
|
<select />
|
213
|
</subPane>
|
240
|
</subPane>
|
|
@@ -261,7 +288,7 @@ |
|
@@ -261,7 +288,7 @@ |
261
|
<workItem from="1535514127808" duration="727000" />
|
288
|
<workItem from="1535514127808" duration="727000" />
|
262
|
<workItem from="1535532970259" duration="2527000" />
|
289
|
<workItem from="1535532970259" duration="2527000" />
|
263
|
<workItem from="1535546044129" duration="20814000" />
|
290
|
<workItem from="1535546044129" duration="20814000" />
|
264
|
- <workItem from="1535633001243" duration="5034000" />
|
291
|
+ <workItem from="1535633001243" duration="5571000" />
|
265
|
</task>
|
292
|
</task>
|
266
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
293
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
267
|
<created>1535458170068</created>
|
294
|
<created>1535458170068</created>
|
|
@@ -571,11 +598,25 @@ |
|
@@ -571,11 +598,25 @@ |
571
|
<option name="project" value="LOCAL" />
|
598
|
<option name="project" value="LOCAL" />
|
572
|
<updated>1535638014265</updated>
|
599
|
<updated>1535638014265</updated>
|
573
|
</task>
|
600
|
</task>
|
574
|
- <option name="localTasksCounter" value="45" />
|
601
|
+ <task id="LOCAL-00045" summary="登录处理">
|
|
|
602
|
+ <created>1535638593262</created>
|
|
|
603
|
+ <option name="number" value="00045" />
|
|
|
604
|
+ <option name="presentableId" value="LOCAL-00045" />
|
|
|
605
|
+ <option name="project" value="LOCAL" />
|
|
|
606
|
+ <updated>1535638593262</updated>
|
|
|
607
|
+ </task>
|
|
|
608
|
+ <task id="LOCAL-00046" summary="登录处理">
|
|
|
609
|
+ <created>1535638797137</created>
|
|
|
610
|
+ <option name="number" value="00046" />
|
|
|
611
|
+ <option name="presentableId" value="LOCAL-00046" />
|
|
|
612
|
+ <option name="project" value="LOCAL" />
|
|
|
613
|
+ <updated>1535638797137</updated>
|
|
|
614
|
+ </task>
|
|
|
615
|
+ <option name="localTasksCounter" value="47" />
|
575
|
<servers />
|
616
|
<servers />
|
576
|
</component>
|
617
|
</component>
|
577
|
<component name="TimeTrackingManager">
|
618
|
<component name="TimeTrackingManager">
|
578
|
- <option name="totallyTimeSpent" value="59486000" />
|
619
|
+ <option name="totallyTimeSpent" value="60023000" />
|
579
|
</component>
|
620
|
</component>
|
580
|
<component name="ToolWindowManager">
|
621
|
<component name="ToolWindowManager">
|
581
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
622
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -622,9 +663,6 @@ |
|
@@ -622,9 +663,6 @@ |
622
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
663
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
623
|
</component>
|
664
|
</component>
|
624
|
<component name="editorHistoryManager">
|
665
|
<component name="editorHistoryManager">
|
625
|
- <entry file="file://$PROJECT_DIR$/api/command.php">
|
|
|
626
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
627
|
- </entry>
|
|
|
628
|
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
|
666
|
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
|
629
|
<provider selected="true" editor-type-id="text-editor">
|
667
|
<provider selected="true" editor-type-id="text-editor">
|
630
|
<state relative-caret-position="228">
|
668
|
<state relative-caret-position="228">
|
|
@@ -869,9 +907,6 @@ |
|
@@ -869,9 +907,6 @@ |
869
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
907
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
870
|
<provider selected="true" editor-type-id="text-editor" />
|
908
|
<provider selected="true" editor-type-id="text-editor" />
|
871
|
</entry>
|
909
|
</entry>
|
872
|
- <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
873
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
874
|
- </entry>
|
|
|
875
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
910
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
876
|
<provider selected="true" editor-type-id="text-editor">
|
911
|
<provider selected="true" editor-type-id="text-editor">
|
877
|
<state relative-caret-position="660">
|
912
|
<state relative-caret-position="660">
|
|
@@ -898,6 +933,13 @@ |
|
@@ -898,6 +933,13 @@ |
898
|
</state>
|
933
|
</state>
|
899
|
</provider>
|
934
|
</provider>
|
900
|
</entry>
|
935
|
</entry>
|
|
|
936
|
+ <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
937
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
938
|
+ <state relative-caret-position="420">
|
|
|
939
|
+ <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
|
|
|
940
|
+ </state>
|
|
|
941
|
+ </provider>
|
|
|
942
|
+ </entry>
|
901
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
943
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
902
|
<provider selected="true" editor-type-id="text-editor">
|
944
|
<provider selected="true" editor-type-id="text-editor">
|
903
|
<state relative-caret-position="468">
|
945
|
<state relative-caret-position="468">
|
|
@@ -905,17 +947,20 @@ |
|
@@ -905,17 +947,20 @@ |
905
|
</state>
|
947
|
</state>
|
906
|
</provider>
|
948
|
</provider>
|
907
|
</entry>
|
949
|
</entry>
|
|
|
950
|
+ <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
|
|
|
951
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
952
|
+ </entry>
|
908
|
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
953
|
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
909
|
<provider selected="true" editor-type-id="text-editor">
|
954
|
<provider selected="true" editor-type-id="text-editor">
|
910
|
- <state relative-caret-position="297">
|
|
|
911
|
- <caret line="503" column="13" selection-start-line="503" selection-start-column="13" selection-end-line="503" selection-end-column="13" />
|
955
|
+ <state relative-caret-position="549">
|
|
|
956
|
+ <caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
|
912
|
</state>
|
957
|
</state>
|
913
|
</provider>
|
958
|
</provider>
|
914
|
</entry>
|
959
|
</entry>
|
915
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
960
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
916
|
<provider selected="true" editor-type-id="text-editor">
|
961
|
<provider selected="true" editor-type-id="text-editor">
|
917
|
- <state relative-caret-position="357">
|
|
|
918
|
- <caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
962
|
+ <state relative-caret-position="315">
|
|
|
963
|
+ <caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
|
919
|
</state>
|
964
|
</state>
|
920
|
</provider>
|
965
|
</provider>
|
921
|
</entry>
|
966
|
</entry>
|