...
|
...
|
@@ -3,10 +3,7 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Question.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Question.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/public/nav.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/public/nav.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -32,12 +29,21 @@ |
|
|
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1836">
|
|
|
<state relative-caret-position="1530">
|
|
|
<caret line="173" column="12" selection-start-line="173" selection-start-column="12" selection-end-line="173" selection-end-column="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="nav.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="238">
|
|
|
<caret line="14" column="10" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
...
|
...
|
@@ -65,11 +71,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="Question.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="Question.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="606">
|
|
|
<caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
|
|
|
<state relative-caret-position="725">
|
|
|
<caret line="134" column="13" lean-forward="true" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -133,7 +139,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLog.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
|
...
|
...
|
@@ -171,7 +176,6 @@ |
|
|
<option value="$PROJECT_DIR$/extend/fast/Auth.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/NAV.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
...
|
...
|
@@ -184,6 +188,8 @@ |
|
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Question.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -442,21 +448,7 @@ |
|
|
<workItem from="1572309778506" duration="26117000" />
|
|
|
<workItem from="1572395935540" duration="28313000" />
|
|
|
<workItem from="1572483209367" duration="35426000" />
|
|
|
<workItem from="1572568391799" duration="2840000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00013" summary="证书">
|
|
|
<created>1572331840264</created>
|
|
|
<option name="number" value="00013" />
|
|
|
<option name="presentableId" value="LOCAL-00013" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572331840264</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00014" summary="证书">
|
|
|
<created>1572332267490</created>
|
|
|
<option name="number" value="00014" />
|
|
|
<option name="presentableId" value="LOCAL-00014" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572332267490</updated>
|
|
|
<workItem from="1572568391799" duration="4346000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00015" summary="证书">
|
|
|
<created>1572332412366</created>
|
...
|
...
|
@@ -787,11 +779,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572519181391</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="62" />
|
|
|
<task id="LOCAL-00062" summary="广告详情">
|
|
|
<created>1572572088614</created>
|
|
|
<option name="number" value="00062" />
|
|
|
<option name="presentableId" value="LOCAL-00062" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572572088615</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00063" summary="广告详情">
|
|
|
<created>1572572157056</created>
|
|
|
<option name="number" value="00063" />
|
|
|
<option name="presentableId" value="LOCAL-00063" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572572157056</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="64" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="251804000" />
|
|
|
<option name="totallyTimeSpent" value="253310000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -865,13 +871,6 @@ |
|
|
<option name="LAST_COMMIT_MESSAGE" value="广告详情" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/exp_ratio.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="408">
|
|
|
<caret line="24" column="35" selection-start-line="24" selection-start-column="35" selection-end-line="24" selection-end-column="35" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="555">
|
...
|
...
|
@@ -1083,13 +1082,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="51">
|
|
|
<caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="49" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_2.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="204">
|
...
|
...
|
@@ -1196,17 +1188,31 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="504">
|
|
|
<caret line="183" column="14" lean-forward="true" selection-start-line="183" selection-start-column="14" selection-end-line="183" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="725">
|
|
|
<caret line="134" column="13" lean-forward="true" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1836">
|
|
|
<state relative-caret-position="1530">
|
|
|
<caret line="173" column="12" selection-start-line="173" selection-start-column="12" selection-end-line="173" selection-end-column="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="606">
|
|
|
<caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
|
|
|
<state relative-caret-position="238">
|
|
|
<caret line="14" column="10" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|