|
@@ -2,8 +2,7 @@ |
|
@@ -2,8 +2,7 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
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" />
|
|
|
6
|
- <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
|
5
|
+ <change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
|
7
|
</list>
|
6
|
</list>
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
8
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -17,11 +16,11 @@ |
|
@@ -17,11 +16,11 @@ |
17
|
</component>
|
16
|
</component>
|
18
|
<component name="FileEditorManager">
|
17
|
<component name="FileEditorManager">
|
19
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
18
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
20
|
- <file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
|
19
|
+ <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
|
21
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
20
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
21
|
<provider selected="true" editor-type-id="text-editor">
|
23
|
- <state relative-caret-position="578">
|
|
|
24
|
- <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
|
22
|
+ <state relative-caret-position="493">
|
|
|
23
|
+ <caret line="34" column="42" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" />
|
25
|
<folding>
|
24
|
<folding>
|
26
|
<element signature="e#128#163#0#PHP" expanded="true" />
|
25
|
<element signature="e#128#163#0#PHP" expanded="true" />
|
27
|
</folding>
|
26
|
</folding>
|
|
@@ -68,11 +67,11 @@ |
|
@@ -68,11 +67,11 @@ |
68
|
</provider>
|
67
|
</provider>
|
69
|
</entry>
|
68
|
</entry>
|
70
|
</file>
|
69
|
</file>
|
71
|
- <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
70
|
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
72
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
71
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
73
|
<provider selected="true" editor-type-id="text-editor">
|
72
|
<provider selected="true" editor-type-id="text-editor">
|
74
|
- <state relative-caret-position="810">
|
|
|
75
|
- <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
|
73
|
+ <state relative-caret-position="289">
|
|
|
74
|
+ <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
76
|
<folding>
|
75
|
<folding>
|
77
|
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
76
|
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
78
|
</folding>
|
77
|
</folding>
|
|
@@ -119,7 +118,6 @@ |
|
@@ -119,7 +118,6 @@ |
119
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
118
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
120
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
119
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
121
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
122
|
- <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
123
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
121
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
124
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
125
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
|
@@ -131,6 +129,7 @@ |
|
@@ -131,6 +129,7 @@ |
131
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
129
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
132
|
<option value="$PROJECT_DIR$/application/config.php" />
|
130
|
<option value="$PROJECT_DIR$/application/config.php" />
|
133
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
131
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
132
|
+ <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
134
|
</list>
|
133
|
</list>
|
135
|
</option>
|
134
|
</option>
|
136
|
</component>
|
135
|
</component>
|
|
@@ -278,7 +277,7 @@ |
|
@@ -278,7 +277,7 @@ |
278
|
<option name="presentableId" value="Default" />
|
277
|
<option name="presentableId" value="Default" />
|
279
|
<updated>1571368480027</updated>
|
278
|
<updated>1571368480027</updated>
|
280
|
<workItem from="1571368481262" duration="23015000" />
|
279
|
<workItem from="1571368481262" duration="23015000" />
|
281
|
- <workItem from="1571618159935" duration="7077000" />
|
280
|
+ <workItem from="1571618159935" duration="7873000" />
|
282
|
</task>
|
281
|
</task>
|
283
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
282
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
284
|
<created>1571621636094</created>
|
283
|
<created>1571621636094</created>
|
|
@@ -371,11 +370,18 @@ |
|
@@ -371,11 +370,18 @@ |
371
|
<option name="project" value="LOCAL" />
|
370
|
<option name="project" value="LOCAL" />
|
372
|
<updated>1571624982618</updated>
|
371
|
<updated>1571624982618</updated>
|
373
|
</task>
|
372
|
</task>
|
374
|
- <option name="localTasksCounter" value="14" />
|
373
|
+ <task id="LOCAL-00014" summary="手机端问题">
|
|
|
374
|
+ <created>1571625251831</created>
|
|
|
375
|
+ <option name="number" value="00014" />
|
|
|
376
|
+ <option name="presentableId" value="LOCAL-00014" />
|
|
|
377
|
+ <option name="project" value="LOCAL" />
|
|
|
378
|
+ <updated>1571625251831</updated>
|
|
|
379
|
+ </task>
|
|
|
380
|
+ <option name="localTasksCounter" value="15" />
|
375
|
<servers />
|
381
|
<servers />
|
376
|
</component>
|
382
|
</component>
|
377
|
<component name="TimeTrackingManager">
|
383
|
<component name="TimeTrackingManager">
|
378
|
- <option name="totallyTimeSpent" value="30092000" />
|
384
|
+ <option name="totallyTimeSpent" value="30888000" />
|
379
|
</component>
|
385
|
</component>
|
380
|
<component name="ToolWindowManager">
|
386
|
<component name="ToolWindowManager">
|
381
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
387
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -603,16 +609,6 @@ |
|
@@ -603,16 +609,6 @@ |
603
|
</state>
|
609
|
</state>
|
604
|
</provider>
|
610
|
</provider>
|
605
|
</entry>
|
611
|
</entry>
|
606
|
- <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
607
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
608
|
- <state relative-caret-position="810">
|
|
|
609
|
- <caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
|
|
|
610
|
- <folding>
|
|
|
611
|
- <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
612
|
- </folding>
|
|
|
613
|
- </state>
|
|
|
614
|
- </provider>
|
|
|
615
|
- </entry>
|
|
|
616
|
<entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
|
612
|
<entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
|
617
|
<provider selected="true" editor-type-id="text-editor" />
|
613
|
<provider selected="true" editor-type-id="text-editor" />
|
618
|
</entry>
|
614
|
</entry>
|
|
@@ -708,14 +704,24 @@ |
|
@@ -708,14 +704,24 @@ |
708
|
</entry>
|
704
|
</entry>
|
709
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
705
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
710
|
<provider selected="true" editor-type-id="text-editor">
|
706
|
<provider selected="true" editor-type-id="text-editor">
|
711
|
- <state relative-caret-position="578">
|
|
|
712
|
- <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
|
707
|
+ <state relative-caret-position="493">
|
|
|
708
|
+ <caret line="34" column="42" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" />
|
713
|
<folding>
|
709
|
<folding>
|
714
|
<element signature="e#128#163#0#PHP" expanded="true" />
|
710
|
<element signature="e#128#163#0#PHP" expanded="true" />
|
715
|
</folding>
|
711
|
</folding>
|
716
|
</state>
|
712
|
</state>
|
717
|
</provider>
|
713
|
</provider>
|
718
|
</entry>
|
714
|
</entry>
|
|
|
715
|
+ <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
716
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
717
|
+ <state relative-caret-position="289">
|
|
|
718
|
+ <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
|
|
719
|
+ <folding>
|
|
|
720
|
+ <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
721
|
+ </folding>
|
|
|
722
|
+ </state>
|
|
|
723
|
+ </provider>
|
|
|
724
|
+ </entry>
|
719
|
</component>
|
725
|
</component>
|
720
|
<component name="masterDetails">
|
726
|
<component name="masterDetails">
|
721
|
<states>
|
727
|
<states>
|