|
@@ -4,6 +4,7 @@ |
|
@@ -4,6 +4,7 @@ |
4
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
4
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
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/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
|
6
|
<change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
|
|
|
7
|
+ <change beforePath="$PROJECT_DIR$/public/assets/adverh5/css/login.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/adverh5/css/login.css" afterDir="false" />
|
7
|
</list>
|
8
|
</list>
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
10
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -50,8 +51,12 @@ |
|
@@ -50,8 +51,12 @@ |
50
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
51
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
52
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
- <state relative-caret-position="317">
|
|
|
54
|
- <caret line="19" column="87" selection-start-line="19" selection-start-column="87" selection-end-line="19" selection-end-column="87" />
|
54
|
+ <state relative-caret-position="204">
|
|
|
55
|
+ <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
|
|
|
56
|
+ <folding>
|
|
|
57
|
+ <element signature="n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
58
|
+ <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
59
|
+ </folding>
|
55
|
</state>
|
60
|
</state>
|
56
|
</provider>
|
61
|
</provider>
|
57
|
</entry>
|
62
|
</entry>
|
|
@@ -59,8 +64,8 @@ |
|
@@ -59,8 +64,8 @@ |
59
|
<file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
64
|
<file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
60
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
65
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
61
|
<provider selected="true" editor-type-id="text-editor">
|
66
|
<provider selected="true" editor-type-id="text-editor">
|
62
|
- <state relative-caret-position="85">
|
|
|
63
|
- <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
|
67
|
+ <state relative-caret-position="102">
|
|
|
68
|
+ <caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
|
64
|
</state>
|
69
|
</state>
|
65
|
</provider>
|
70
|
</provider>
|
66
|
</entry>
|
71
|
</entry>
|
|
@@ -269,7 +274,7 @@ |
|
@@ -269,7 +274,7 @@ |
269
|
<option name="presentableId" value="Default" />
|
274
|
<option name="presentableId" value="Default" />
|
270
|
<updated>1571368480027</updated>
|
275
|
<updated>1571368480027</updated>
|
271
|
<workItem from="1571368481262" duration="23015000" />
|
276
|
<workItem from="1571368481262" duration="23015000" />
|
272
|
- <workItem from="1571618159935" duration="5404000" />
|
277
|
+ <workItem from="1571618159935" duration="5878000" />
|
273
|
</task>
|
278
|
</task>
|
274
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
279
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
275
|
<created>1571621636094</created>
|
280
|
<created>1571621636094</created>
|
|
@@ -320,11 +325,25 @@ |
|
@@ -320,11 +325,25 @@ |
320
|
<option name="project" value="LOCAL" />
|
325
|
<option name="project" value="LOCAL" />
|
321
|
<updated>1571622830204</updated>
|
326
|
<updated>1571622830204</updated>
|
322
|
</task>
|
327
|
</task>
|
323
|
- <option name="localTasksCounter" value="8" />
|
328
|
+ <task id="LOCAL-00008" summary="手机端问题">
|
|
|
329
|
+ <created>1571623580479</created>
|
|
|
330
|
+ <option name="number" value="00008" />
|
|
|
331
|
+ <option name="presentableId" value="LOCAL-00008" />
|
|
|
332
|
+ <option name="project" value="LOCAL" />
|
|
|
333
|
+ <updated>1571623580479</updated>
|
|
|
334
|
+ </task>
|
|
|
335
|
+ <task id="LOCAL-00009" summary="手机端问题">
|
|
|
336
|
+ <created>1571623650936</created>
|
|
|
337
|
+ <option name="number" value="00009" />
|
|
|
338
|
+ <option name="presentableId" value="LOCAL-00009" />
|
|
|
339
|
+ <option name="project" value="LOCAL" />
|
|
|
340
|
+ <updated>1571623650936</updated>
|
|
|
341
|
+ </task>
|
|
|
342
|
+ <option name="localTasksCounter" value="10" />
|
324
|
<servers />
|
343
|
<servers />
|
325
|
</component>
|
344
|
</component>
|
326
|
<component name="TimeTrackingManager">
|
345
|
<component name="TimeTrackingManager">
|
327
|
- <option name="totallyTimeSpent" value="28419000" />
|
346
|
+ <option name="totallyTimeSpent" value="28893000" />
|
328
|
</component>
|
347
|
</component>
|
329
|
<component name="ToolWindowManager">
|
348
|
<component name="ToolWindowManager">
|
330
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
349
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -388,6 +407,10 @@ |
|
@@ -388,6 +407,10 @@ |
388
|
<provider selected="true" editor-type-id="text-editor">
|
407
|
<provider selected="true" editor-type-id="text-editor">
|
389
|
<state relative-caret-position="1275">
|
408
|
<state relative-caret-position="1275">
|
390
|
<caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
|
409
|
<caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
|
|
|
410
|
+ <folding>
|
|
|
411
|
+ <element signature="n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
412
|
+ <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
413
|
+ </folding>
|
391
|
</state>
|
414
|
</state>
|
392
|
</provider>
|
415
|
</provider>
|
393
|
</entry>
|
416
|
</entry>
|
|
@@ -647,15 +670,19 @@ |
|
@@ -647,15 +670,19 @@ |
647
|
</entry>
|
670
|
</entry>
|
648
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
671
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
649
|
<provider selected="true" editor-type-id="text-editor">
|
672
|
<provider selected="true" editor-type-id="text-editor">
|
650
|
- <state relative-caret-position="85">
|
|
|
651
|
- <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
|
673
|
+ <state relative-caret-position="102">
|
|
|
674
|
+ <caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
|
652
|
</state>
|
675
|
</state>
|
653
|
</provider>
|
676
|
</provider>
|
654
|
</entry>
|
677
|
</entry>
|
655
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
678
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
656
|
<provider selected="true" editor-type-id="text-editor">
|
679
|
<provider selected="true" editor-type-id="text-editor">
|
657
|
- <state relative-caret-position="317">
|
|
|
658
|
- <caret line="19" column="87" selection-start-line="19" selection-start-column="87" selection-end-line="19" selection-end-column="87" />
|
680
|
+ <state relative-caret-position="204">
|
|
|
681
|
+ <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
|
|
|
682
|
+ <folding>
|
|
|
683
|
+ <element signature="n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
684
|
+ <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
|
|
|
685
|
+ </folding>
|
659
|
</state>
|
686
|
</state>
|
660
|
</provider>
|
687
|
</provider>
|
661
|
</entry>
|
688
|
</entry>
|