...
|
...
|
@@ -50,8 +50,8 @@ |
|
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="402">
|
|
|
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
|
|
<state relative-caret-position="317">
|
|
|
<caret line="19" column="87" selection-start-line="19" selection-start-column="87" selection-end-line="19" selection-end-column="87" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -59,8 +59,8 @@ |
|
|
<file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="289">
|
|
|
<caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
|
|
|
<state relative-caret-position="85">
|
|
|
<caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -95,6 +95,7 @@ |
|
|
<find>site</find>
|
|
|
<find>box-bottom</find>
|
|
|
<find>dis</find>
|
|
|
<find>container</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
...
|
...
|
@@ -115,7 +116,6 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
|
|
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
...
|
...
|
@@ -126,6 +126,7 @@ |
|
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
|
|
<option value="$PROJECT_DIR$/application/database.php" />
|
|
|
<option value="$PROJECT_DIR$/application/config.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
|
|
</list>
|
|
|
</option>
|
...
|
...
|
@@ -268,7 +269,7 @@ |
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1571368480027</updated>
|
|
|
<workItem from="1571368481262" duration="23015000" />
|
|
|
<workItem from="1571618159935" duration="4441000" />
|
|
|
<workItem from="1571618159935" duration="5404000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
|
|
<created>1571621636094</created>
|
...
|
...
|
@@ -291,11 +292,39 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622157692</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="4" />
|
|
|
<task id="LOCAL-00004" summary="手机端问题">
|
|
|
<created>1571622622008</created>
|
|
|
<option name="number" value="00004" />
|
|
|
<option name="presentableId" value="LOCAL-00004" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622622008</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00005" summary="手机端问题">
|
|
|
<created>1571622697106</created>
|
|
|
<option name="number" value="00005" />
|
|
|
<option name="presentableId" value="LOCAL-00005" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622697106</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00006" summary="手机端问题">
|
|
|
<created>1571622766188</created>
|
|
|
<option name="number" value="00006" />
|
|
|
<option name="presentableId" value="LOCAL-00006" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622766189</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00007" summary="手机端问题">
|
|
|
<created>1571622830204</created>
|
|
|
<option name="number" value="00007" />
|
|
|
<option name="presentableId" value="LOCAL-00007" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622830204</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="8" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="27456000" />
|
|
|
<option name="totallyTimeSpent" value="28419000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -334,7 +363,8 @@ |
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="自动部署与数据可配置" />
|
|
|
<MESSAGE value="修改后台登录地址" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="修改后台登录地址" />
|
|
|
<MESSAGE value="手机端问题" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="手机端问题" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
...
|
...
|
@@ -522,13 +552,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="289">
|
|
|
<caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="810">
|
...
|
...
|
@@ -622,10 +645,17 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="85">
|
|
|
<caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="402">
|
|
|
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
|
|
<state relative-caret-position="317">
|
|
|
<caret line="19" column="87" selection-start-line="19" selection-start-column="87" selection-end-line="19" selection-end-column="87" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|