外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 858a59ac95ac9ff7a2467f824fa5d691c9fd3afa 1 个父辈 f9d59638

我的订单详情标题

内嵌 并排对比
正在显示 1 个修改的文件 包含 57 行增加 和 49 行删除
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/app/admin/controller/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/BookingController.php" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/app/portal/controller/IndexController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/IndexController.php" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
8 </list> 7 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -18,20 +17,6 @@ @@ -18,20 +17,6 @@
18 </component> 17 </component>
19 <component name="FileEditorManager"> 18 <component name="FileEditorManager">
20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
21 - <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">  
22 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">  
23 - <provider selected="true" editor-type-id="text-editor">  
24 - <state relative-caret-position="1092">  
25 - <caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />  
26 - <folding>  
27 - <element signature="e#636#668#0#PHP" expanded="true" />  
28 - <element signature="e#17688#17731#0#PHP" />  
29 - <element signature="e#17688#17779#0#PHP" />  
30 - </folding>  
31 - </state>  
32 - </provider>  
33 - </entry>  
34 - </file>  
35 <file leaf-file-name="hezuo_huigu.htm" pinned="false" current-in-tab="false"> 20 <file leaf-file-name="hezuo_huigu.htm" pinned="false" current-in-tab="false">
36 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm"> 21 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
37 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
@@ -103,11 +88,11 @@ @@ -103,11 +88,11 @@
103 </provider> 88 </provider>
104 </entry> 89 </entry>
105 </file> 90 </file>
106 - <file leaf-file-name="listing.html" pinned="false" current-in-tab="true"> 91 + <file leaf-file-name="listing.html" pinned="false" current-in-tab="false">
107 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html"> 92 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
108 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="504">  
110 - <caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" /> 94 + <state relative-caret-position="420">
  95 + <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
111 </state> 96 </state>
112 </provider> 97 </provider>
113 </entry> 98 </entry>
@@ -121,11 +106,20 @@ @@ -121,11 +106,20 @@
121 </provider> 106 </provider>
122 </entry> 107 </entry>
123 </file> 108 </file>
124 - <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">  
125 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php"> 109 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  110 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
126 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
127 - <state relative-caret-position="630">  
128 - <caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" /> 112 + <state relative-caret-position="321">
  113 + <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
  119 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state relative-caret-position="189">
  122 + <caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
129 </state> 123 </state>
130 </provider> 124 </provider>
131 </entry> 125 </entry>
@@ -172,7 +166,6 @@ @@ -172,7 +166,6 @@
172 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" /> 166 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
173 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" /> 167 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
174 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" /> 168 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
175 - <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />  
176 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" /> 169 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
177 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" /> 170 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
178 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" /> 171 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
@@ -186,6 +179,8 @@ @@ -186,6 +179,8 @@
186 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" /> 179 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
187 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" /> 180 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
188 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" /> 181 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
  182 + <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
  183 + <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
189 </list> 184 </list>
190 </option> 185 </option>
191 </component> 186 </component>
@@ -244,32 +239,38 @@ @@ -244,32 +239,38 @@
244 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 239 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
245 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 240 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
246 <item name="app" type="462c0819:PsiDirectoryNode" /> 241 <item name="app" type="462c0819:PsiDirectoryNode" />
247 - <item name="admin" type="462c0819:PsiDirectoryNode" /> 242 + <item name="portal" type="462c0819:PsiDirectoryNode" />
248 </path> 243 </path>
249 <path> 244 <path>
250 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 245 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
251 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 246 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
252 <item name="app" type="462c0819:PsiDirectoryNode" /> 247 <item name="app" type="462c0819:PsiDirectoryNode" />
253 - <item name="admin" type="462c0819:PsiDirectoryNode" /> 248 + <item name="portal" type="462c0819:PsiDirectoryNode" />
254 <item name="controller" type="462c0819:PsiDirectoryNode" /> 249 <item name="controller" type="462c0819:PsiDirectoryNode" />
255 </path> 250 </path>
256 <path> 251 <path>
257 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 252 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
258 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 253 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
259 - <item name="public" type="462c0819:PsiDirectoryNode" /> 254 + <item name="app" type="462c0819:PsiDirectoryNode" />
  255 + <item name="user" type="462c0819:PsiDirectoryNode" />
  256 + </path>
  257 + <path>
  258 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  259 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  260 + <item name="app" type="462c0819:PsiDirectoryNode" />
  261 + <item name="user" type="462c0819:PsiDirectoryNode" />
  262 + <item name="controller" type="462c0819:PsiDirectoryNode" />
260 </path> 263 </path>
261 <path> 264 <path>
262 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 265 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
263 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 266 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
264 <item name="public" type="462c0819:PsiDirectoryNode" /> 267 <item name="public" type="462c0819:PsiDirectoryNode" />
265 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
266 </path> 268 </path>
267 <path> 269 <path>
268 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 270 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
269 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 271 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
270 <item name="public" type="462c0819:PsiDirectoryNode" /> 272 <item name="public" type="462c0819:PsiDirectoryNode" />
271 <item name="themes" type="462c0819:PsiDirectoryNode" /> 273 <item name="themes" type="462c0819:PsiDirectoryNode" />
272 - <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />  
273 </path> 274 </path>
274 <path> 275 <path>
275 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 276 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
@@ -277,7 +278,6 @@ @@ -277,7 +278,6 @@
277 <item name="public" type="462c0819:PsiDirectoryNode" /> 278 <item name="public" type="462c0819:PsiDirectoryNode" />
278 <item name="themes" type="462c0819:PsiDirectoryNode" /> 279 <item name="themes" type="462c0819:PsiDirectoryNode" />
279 <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" /> 280 <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
280 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
281 </path> 281 </path>
282 <path> 282 <path>
283 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 283 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
@@ -286,7 +286,6 @@ @@ -286,7 +286,6 @@
286 <item name="themes" type="462c0819:PsiDirectoryNode" /> 286 <item name="themes" type="462c0819:PsiDirectoryNode" />
287 <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" /> 287 <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
288 <item name="admin" type="462c0819:PsiDirectoryNode" /> 288 <item name="admin" type="462c0819:PsiDirectoryNode" />
289 - <item name="booking" type="462c0819:PsiDirectoryNode" />  
290 </path> 289 </path>
291 <path> 290 <path>
292 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 291 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
@@ -345,7 +344,7 @@ @@ -345,7 +344,7 @@
345 <workItem from="1535514127808" duration="727000" /> 344 <workItem from="1535514127808" duration="727000" />
346 <workItem from="1535532970259" duration="2527000" /> 345 <workItem from="1535532970259" duration="2527000" />
347 <workItem from="1535546044129" duration="20814000" /> 346 <workItem from="1535546044129" duration="20814000" />
348 - <workItem from="1535633001243" duration="190000" /> 347 + <workItem from="1535633001243" duration="972000" />
349 </task> 348 </task>
350 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 349 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
351 <created>1535458170068</created> 350 <created>1535458170068</created>
@@ -536,11 +535,18 @@ @@ -536,11 +535,18 @@
536 <option name="project" value="LOCAL" /> 535 <option name="project" value="LOCAL" />
537 <updated>1535600080734</updated> 536 <updated>1535600080734</updated>
538 </task> 537 </task>
539 - <option name="localTasksCounter" value="28" /> 538 + <task id="LOCAL-00028" summary="我的订单详情标题">
  539 + <created>1535633219778</created>
  540 + <option name="number" value="00028" />
  541 + <option name="presentableId" value="LOCAL-00028" />
  542 + <option name="project" value="LOCAL" />
  543 + <updated>1535633219778</updated>
  544 + </task>
  545 + <option name="localTasksCounter" value="29" />
540 <servers /> 546 <servers />
541 </component> 547 </component>
542 <component name="TimeTrackingManager"> 548 <component name="TimeTrackingManager">
543 - <option name="totallyTimeSpent" value="54642000" /> 549 + <option name="totallyTimeSpent" value="55424000" />
544 </component> 550 </component>
545 <component name="ToolWindowManager"> 551 <component name="ToolWindowManager">
546 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 552 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -586,11 +592,6 @@ @@ -586,11 +592,6 @@
586 <option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" /> 592 <option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" />
587 </component> 593 </component>
588 <component name="editorHistoryManager"> 594 <component name="editorHistoryManager">
589 - <entry file="file://$PROJECT_DIR$/api/home/controller/RestController.php">  
590 - <provider selected="true" editor-type-id="text-editor">  
591 - <state relative-caret-position="-280" />  
592 - </provider>  
593 - </entry>  
594 <entry file="file://$PROJECT_DIR$/api/home/route.php"> 595 <entry file="file://$PROJECT_DIR$/api/home/route.php">
595 <provider selected="true" editor-type-id="text-editor"> 596 <provider selected="true" editor-type-id="text-editor">
596 <state relative-caret-position="76"> 597 <state relative-caret-position="76">
@@ -772,13 +773,6 @@ @@ -772,13 +773,6 @@
772 </state> 773 </state>
773 </provider> 774 </provider>
774 </entry> 775 </entry>
775 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">  
776 - <provider selected="true" editor-type-id="text-editor">  
777 - <state relative-caret-position="1134">  
778 - <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />  
779 - </state>  
780 - </provider>  
781 - </entry>  
782 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php"> 776 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
783 <provider selected="true" editor-type-id="text-editor"> 777 <provider selected="true" editor-type-id="text-editor">
784 <state relative-caret-position="630"> 778 <state relative-caret-position="630">
@@ -866,8 +860,22 @@ @@ -866,8 +860,22 @@
866 </entry> 860 </entry>
867 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html"> 861 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
868 <provider selected="true" editor-type-id="text-editor"> 862 <provider selected="true" editor-type-id="text-editor">
869 - <state relative-caret-position="504">  
870 - <caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" /> 863 + <state relative-caret-position="420">
  864 + <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
  865 + </state>
  866 + </provider>
  867 + </entry>
  868 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
  869 + <provider selected="true" editor-type-id="text-editor">
  870 + <state relative-caret-position="321">
  871 + <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
  872 + </state>
  873 + </provider>
  874 + </entry>
  875 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
  876 + <provider selected="true" editor-type-id="text-editor">
  877 + <state relative-caret-position="189">
  878 + <caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
871 </state> 879 </state>
872 </provider> 880 </provider>
873 </entry> 881 </entry>