|
@@ -50,8 +50,8 @@ |
|
@@ -50,8 +50,8 @@ |
50
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
50
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
- <state relative-caret-position="402">
|
|
|
54
|
- <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
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" />
|
55
|
</state>
|
55
|
</state>
|
56
|
</provider>
|
56
|
</provider>
|
57
|
</entry>
|
57
|
</entry>
|
|
@@ -59,8 +59,8 @@ |
|
@@ -59,8 +59,8 @@ |
59
|
<file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
59
|
<file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
60
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
60
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
61
|
<provider selected="true" editor-type-id="text-editor">
|
61
|
<provider selected="true" editor-type-id="text-editor">
|
62
|
- <state relative-caret-position="289">
|
|
|
63
|
- <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
|
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" />
|
64
|
</state>
|
64
|
</state>
|
65
|
</provider>
|
65
|
</provider>
|
66
|
</entry>
|
66
|
</entry>
|
|
@@ -95,6 +95,7 @@ |
|
@@ -95,6 +95,7 @@ |
95
|
<find>site</find>
|
95
|
<find>site</find>
|
96
|
<find>box-bottom</find>
|
96
|
<find>box-bottom</find>
|
97
|
<find>dis</find>
|
97
|
<find>dis</find>
|
|
|
98
|
+ <find>container</find>
|
98
|
</findStrings>
|
99
|
</findStrings>
|
99
|
</component>
|
100
|
</component>
|
100
|
<component name="Git.Settings">
|
101
|
<component name="Git.Settings">
|
|
@@ -115,7 +116,6 @@ |
|
@@ -115,7 +116,6 @@ |
115
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
116
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
116
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
117
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
117
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
118
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
118
|
- <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
|
|
119
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
119
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
121
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
121
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
|
@@ -126,6 +126,7 @@ |
|
@@ -126,6 +126,7 @@ |
126
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
126
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
127
|
<option value="$PROJECT_DIR$/application/database.php" />
|
127
|
<option value="$PROJECT_DIR$/application/database.php" />
|
128
|
<option value="$PROJECT_DIR$/application/config.php" />
|
128
|
<option value="$PROJECT_DIR$/application/config.php" />
|
|
|
129
|
+ <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
129
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
130
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
130
|
</list>
|
131
|
</list>
|
131
|
</option>
|
132
|
</option>
|
|
@@ -268,7 +269,7 @@ |
|
@@ -268,7 +269,7 @@ |
268
|
<option name="presentableId" value="Default" />
|
269
|
<option name="presentableId" value="Default" />
|
269
|
<updated>1571368480027</updated>
|
270
|
<updated>1571368480027</updated>
|
270
|
<workItem from="1571368481262" duration="23015000" />
|
271
|
<workItem from="1571368481262" duration="23015000" />
|
271
|
- <workItem from="1571618159935" duration="4441000" />
|
272
|
+ <workItem from="1571618159935" duration="5404000" />
|
272
|
</task>
|
273
|
</task>
|
273
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
274
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
274
|
<created>1571621636094</created>
|
275
|
<created>1571621636094</created>
|
|
@@ -291,11 +292,39 @@ |
|
@@ -291,11 +292,39 @@ |
291
|
<option name="project" value="LOCAL" />
|
292
|
<option name="project" value="LOCAL" />
|
292
|
<updated>1571622157692</updated>
|
293
|
<updated>1571622157692</updated>
|
293
|
</task>
|
294
|
</task>
|
294
|
- <option name="localTasksCounter" value="4" />
|
295
|
+ <task id="LOCAL-00004" summary="手机端问题">
|
|
|
296
|
+ <created>1571622622008</created>
|
|
|
297
|
+ <option name="number" value="00004" />
|
|
|
298
|
+ <option name="presentableId" value="LOCAL-00004" />
|
|
|
299
|
+ <option name="project" value="LOCAL" />
|
|
|
300
|
+ <updated>1571622622008</updated>
|
|
|
301
|
+ </task>
|
|
|
302
|
+ <task id="LOCAL-00005" summary="手机端问题">
|
|
|
303
|
+ <created>1571622697106</created>
|
|
|
304
|
+ <option name="number" value="00005" />
|
|
|
305
|
+ <option name="presentableId" value="LOCAL-00005" />
|
|
|
306
|
+ <option name="project" value="LOCAL" />
|
|
|
307
|
+ <updated>1571622697106</updated>
|
|
|
308
|
+ </task>
|
|
|
309
|
+ <task id="LOCAL-00006" summary="手机端问题">
|
|
|
310
|
+ <created>1571622766188</created>
|
|
|
311
|
+ <option name="number" value="00006" />
|
|
|
312
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
313
|
+ <option name="project" value="LOCAL" />
|
|
|
314
|
+ <updated>1571622766189</updated>
|
|
|
315
|
+ </task>
|
|
|
316
|
+ <task id="LOCAL-00007" summary="手机端问题">
|
|
|
317
|
+ <created>1571622830204</created>
|
|
|
318
|
+ <option name="number" value="00007" />
|
|
|
319
|
+ <option name="presentableId" value="LOCAL-00007" />
|
|
|
320
|
+ <option name="project" value="LOCAL" />
|
|
|
321
|
+ <updated>1571622830204</updated>
|
|
|
322
|
+ </task>
|
|
|
323
|
+ <option name="localTasksCounter" value="8" />
|
295
|
<servers />
|
324
|
<servers />
|
296
|
</component>
|
325
|
</component>
|
297
|
<component name="TimeTrackingManager">
|
326
|
<component name="TimeTrackingManager">
|
298
|
- <option name="totallyTimeSpent" value="27456000" />
|
327
|
+ <option name="totallyTimeSpent" value="28419000" />
|
299
|
</component>
|
328
|
</component>
|
300
|
<component name="ToolWindowManager">
|
329
|
<component name="ToolWindowManager">
|
301
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
330
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -334,7 +363,8 @@ |
|
@@ -334,7 +363,8 @@ |
334
|
<component name="VcsManagerConfiguration">
|
363
|
<component name="VcsManagerConfiguration">
|
335
|
<MESSAGE value="自动部署与数据可配置" />
|
364
|
<MESSAGE value="自动部署与数据可配置" />
|
336
|
<MESSAGE value="修改后台登录地址" />
|
365
|
<MESSAGE value="修改后台登录地址" />
|
337
|
- <option name="LAST_COMMIT_MESSAGE" value="修改后台登录地址" />
|
366
|
+ <MESSAGE value="手机端问题" />
|
|
|
367
|
+ <option name="LAST_COMMIT_MESSAGE" value="手机端问题" />
|
338
|
</component>
|
368
|
</component>
|
339
|
<component name="editorHistoryManager">
|
369
|
<component name="editorHistoryManager">
|
340
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
370
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
@@ -522,13 +552,6 @@ |
|
@@ -522,13 +552,6 @@ |
522
|
</state>
|
552
|
</state>
|
523
|
</provider>
|
553
|
</provider>
|
524
|
</entry>
|
554
|
</entry>
|
525
|
- <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
|
|
526
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
527
|
- <state relative-caret-position="289">
|
|
|
528
|
- <caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
|
|
|
529
|
- </state>
|
|
|
530
|
- </provider>
|
|
|
531
|
- </entry>
|
|
|
532
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
555
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
533
|
<provider selected="true" editor-type-id="text-editor">
|
556
|
<provider selected="true" editor-type-id="text-editor">
|
534
|
<state relative-caret-position="810">
|
557
|
<state relative-caret-position="810">
|
|
@@ -622,10 +645,17 @@ |
|
@@ -622,10 +645,17 @@ |
622
|
</state>
|
645
|
</state>
|
623
|
</provider>
|
646
|
</provider>
|
624
|
</entry>
|
647
|
</entry>
|
|
|
648
|
+ <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
|
|
649
|
+ <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" />
|
|
|
652
|
+ </state>
|
|
|
653
|
+ </provider>
|
|
|
654
|
+ </entry>
|
625
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
655
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
626
|
<provider selected="true" editor-type-id="text-editor">
|
656
|
<provider selected="true" editor-type-id="text-editor">
|
627
|
- <state relative-caret-position="402">
|
|
|
628
|
- <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
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" />
|
629
|
</state>
|
659
|
</state>
|
630
|
</provider>
|
660
|
</provider>
|
631
|
</entry>
|
661
|
</entry>
|