|
@@ -2,6 +2,7 @@ |
|
@@ -2,6 +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" />
|
5
|
<change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
|
6
|
<change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
|
6
|
</list>
|
7
|
</list>
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -70,15 +71,25 @@ |
|
@@ -70,15 +71,25 @@ |
70
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
71
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
71
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
72
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
72
|
<provider selected="true" editor-type-id="text-editor">
|
73
|
<provider selected="true" editor-type-id="text-editor">
|
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" />
|
74
|
+ <state relative-caret-position="374">
|
|
|
75
|
+ <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
|
75
|
<folding>
|
76
|
<folding>
|
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" />
|
77
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
78
|
+ <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
77
|
</folding>
|
79
|
</folding>
|
78
|
</state>
|
80
|
</state>
|
79
|
</provider>
|
81
|
</provider>
|
80
|
</entry>
|
82
|
</entry>
|
81
|
</file>
|
83
|
</file>
|
|
|
84
|
+ <file leaf-file-name="index.css" pinned="false" current-in-tab="false">
|
|
|
85
|
+ <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
|
|
|
86
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
87
|
+ <state relative-caret-position="1190">
|
|
|
88
|
+ <caret line="70" column="31" selection-start-line="70" selection-start-column="31" selection-end-line="70" selection-end-column="31" />
|
|
|
89
|
+ </state>
|
|
|
90
|
+ </provider>
|
|
|
91
|
+ </entry>
|
|
|
92
|
+ </file>
|
82
|
</leaf>
|
93
|
</leaf>
|
83
|
</component>
|
94
|
</component>
|
84
|
<component name="FileTemplateManagerImpl">
|
95
|
<component name="FileTemplateManagerImpl">
|
|
@@ -95,9 +106,9 @@ |
|
@@ -95,9 +106,9 @@ |
95
|
<find>siet</find>
|
106
|
<find>siet</find>
|
96
|
<find>$site</find>
|
107
|
<find>$site</find>
|
97
|
<find>site</find>
|
108
|
<find>site</find>
|
98
|
- <find>box-bottom</find>
|
|
|
99
|
<find>dis</find>
|
109
|
<find>dis</find>
|
100
|
<find>container</find>
|
110
|
<find>container</find>
|
|
|
111
|
+ <find>box-bottom</find>
|
101
|
</findStrings>
|
112
|
</findStrings>
|
102
|
</component>
|
113
|
</component>
|
103
|
<component name="Git.Settings">
|
114
|
<component name="Git.Settings">
|
|
@@ -118,7 +129,6 @@ |
|
@@ -118,7 +129,6 @@ |
118
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
129
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
119
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
130
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
131
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
121
|
- <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
|
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
132
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
133
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
124
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
134
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
|
@@ -129,6 +139,7 @@ |
|
@@ -129,6 +139,7 @@ |
129
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
139
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
130
|
<option value="$PROJECT_DIR$/application/config.php" />
|
140
|
<option value="$PROJECT_DIR$/application/config.php" />
|
131
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
141
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
142
|
+ <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
132
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
143
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
133
|
</list>
|
144
|
</list>
|
134
|
</option>
|
145
|
</option>
|
|
@@ -225,6 +236,27 @@ |
|
@@ -225,6 +236,27 @@ |
225
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
236
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
226
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
237
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
227
|
</path>
|
238
|
</path>
|
|
|
239
|
+ <path>
|
|
|
240
|
+ <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
241
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
242
|
+ <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
243
|
+ <item name="assets" type="462c0819:PsiDirectoryNode" />
|
|
|
244
|
+ </path>
|
|
|
245
|
+ <path>
|
|
|
246
|
+ <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
247
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
248
|
+ <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
249
|
+ <item name="assets" type="462c0819:PsiDirectoryNode" />
|
|
|
250
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
251
|
+ </path>
|
|
|
252
|
+ <path>
|
|
|
253
|
+ <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
254
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
255
|
+ <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
256
|
+ <item name="assets" type="462c0819:PsiDirectoryNode" />
|
|
|
257
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
258
|
+ <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
259
|
+ </path>
|
228
|
</expand>
|
260
|
</expand>
|
229
|
<select />
|
261
|
<select />
|
230
|
</subPane>
|
262
|
</subPane>
|
|
@@ -277,7 +309,7 @@ |
|
@@ -277,7 +309,7 @@ |
277
|
<option name="presentableId" value="Default" />
|
309
|
<option name="presentableId" value="Default" />
|
278
|
<updated>1571368480027</updated>
|
310
|
<updated>1571368480027</updated>
|
279
|
<workItem from="1571368481262" duration="23015000" />
|
311
|
<workItem from="1571368481262" duration="23015000" />
|
280
|
- <workItem from="1571618159935" duration="7873000" />
|
312
|
+ <workItem from="1571618159935" duration="8188000" />
|
281
|
</task>
|
313
|
</task>
|
282
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
314
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
283
|
<created>1571621636094</created>
|
315
|
<created>1571621636094</created>
|
|
@@ -377,11 +409,39 @@ |
|
@@ -377,11 +409,39 @@ |
377
|
<option name="project" value="LOCAL" />
|
409
|
<option name="project" value="LOCAL" />
|
378
|
<updated>1571625251831</updated>
|
410
|
<updated>1571625251831</updated>
|
379
|
</task>
|
411
|
</task>
|
380
|
- <option name="localTasksCounter" value="15" />
|
412
|
+ <task id="LOCAL-00015" summary="手机端问题">
|
|
|
413
|
+ <created>1571626416226</created>
|
|
|
414
|
+ <option name="number" value="00015" />
|
|
|
415
|
+ <option name="presentableId" value="LOCAL-00015" />
|
|
|
416
|
+ <option name="project" value="LOCAL" />
|
|
|
417
|
+ <updated>1571626416226</updated>
|
|
|
418
|
+ </task>
|
|
|
419
|
+ <task id="LOCAL-00016" summary="手机端问题">
|
|
|
420
|
+ <created>1571626460103</created>
|
|
|
421
|
+ <option name="number" value="00016" />
|
|
|
422
|
+ <option name="presentableId" value="LOCAL-00016" />
|
|
|
423
|
+ <option name="project" value="LOCAL" />
|
|
|
424
|
+ <updated>1571626460103</updated>
|
|
|
425
|
+ </task>
|
|
|
426
|
+ <task id="LOCAL-00017" summary="手机端问题">
|
|
|
427
|
+ <created>1571626481962</created>
|
|
|
428
|
+ <option name="number" value="00017" />
|
|
|
429
|
+ <option name="presentableId" value="LOCAL-00017" />
|
|
|
430
|
+ <option name="project" value="LOCAL" />
|
|
|
431
|
+ <updated>1571626481962</updated>
|
|
|
432
|
+ </task>
|
|
|
433
|
+ <task id="LOCAL-00018" summary="手机端问题">
|
|
|
434
|
+ <created>1571626573357</created>
|
|
|
435
|
+ <option name="number" value="00018" />
|
|
|
436
|
+ <option name="presentableId" value="LOCAL-00018" />
|
|
|
437
|
+ <option name="project" value="LOCAL" />
|
|
|
438
|
+ <updated>1571626573357</updated>
|
|
|
439
|
+ </task>
|
|
|
440
|
+ <option name="localTasksCounter" value="19" />
|
381
|
<servers />
|
441
|
<servers />
|
382
|
</component>
|
442
|
</component>
|
383
|
<component name="TimeTrackingManager">
|
443
|
<component name="TimeTrackingManager">
|
384
|
- <option name="totallyTimeSpent" value="30888000" />
|
444
|
+ <option name="totallyTimeSpent" value="31203000" />
|
385
|
</component>
|
445
|
</component>
|
386
|
<component name="ToolWindowManager">
|
446
|
<component name="ToolWindowManager">
|
387
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
447
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -470,7 +530,8 @@ |
|
@@ -470,7 +530,8 @@ |
470
|
<state relative-caret-position="2210">
|
530
|
<state relative-caret-position="2210">
|
471
|
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
|
531
|
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
|
472
|
<folding>
|
532
|
<folding>
|
473
|
- <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
533
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
534
|
+ <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
474
|
</folding>
|
535
|
</folding>
|
475
|
</state>
|
536
|
</state>
|
476
|
</provider>
|
537
|
</provider>
|
|
@@ -602,13 +663,6 @@ |
|
@@ -602,13 +663,6 @@ |
602
|
</state>
|
663
|
</state>
|
603
|
</provider>
|
664
|
</provider>
|
604
|
</entry>
|
665
|
</entry>
|
605
|
- <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
|
|
|
606
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
607
|
- <state relative-caret-position="1972">
|
|
|
608
|
- <caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
|
|
|
609
|
- </state>
|
|
|
610
|
- </provider>
|
|
|
611
|
- </entry>
|
|
|
612
|
<entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
|
666
|
<entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
|
613
|
<provider selected="true" editor-type-id="text-editor" />
|
667
|
<provider selected="true" editor-type-id="text-editor" />
|
614
|
</entry>
|
668
|
</entry>
|
|
@@ -712,12 +766,20 @@ |
|
@@ -712,12 +766,20 @@ |
712
|
</state>
|
766
|
</state>
|
713
|
</provider>
|
767
|
</provider>
|
714
|
</entry>
|
768
|
</entry>
|
|
|
769
|
+ <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
|
|
|
770
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
771
|
+ <state relative-caret-position="1190">
|
|
|
772
|
+ <caret line="70" column="31" selection-start-line="70" selection-start-column="31" selection-end-line="70" selection-end-column="31" />
|
|
|
773
|
+ </state>
|
|
|
774
|
+ </provider>
|
|
|
775
|
+ </entry>
|
715
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
776
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
716
|
<provider selected="true" editor-type-id="text-editor">
|
777
|
<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" />
|
778
|
+ <state relative-caret-position="374">
|
|
|
779
|
+ <caret line="22" column="32" selection-start-line="22" selection-start-column="32" selection-end-line="22" selection-end-column="32" />
|
719
|
<folding>
|
780
|
<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" />
|
781
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
782
|
+ <element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
721
|
</folding>
|
783
|
</folding>
|
722
|
</state>
|
784
|
</state>
|
723
|
</provider>
|
785
|
</provider>
|