...
|
...
|
@@ -2,7 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change afterPath="$PROJECT_DIR$/application/home/view/member/index.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/index.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" />
|
...
|
...
|
@@ -30,6 +31,15 @@ |
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<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="34">
|
|
|
<caret line="2" column="93" selection-start-line="2" selection-start-column="93" selection-end-line="2" selection-end-column="93" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
...
|
...
|
@@ -39,11 +49,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="691">
|
|
|
<caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" />
|
|
|
<state relative-caret-position="674">
|
|
|
<caret line="122" selection-start-line="122" selection-end-line="122" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -51,7 +61,7 @@ |
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="374">
|
|
|
<state relative-caret-position="266">
|
|
|
<caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -87,7 +97,7 @@ |
|
|
<find>btn_more</find>
|
|
|
<find>detail_qust</find>
|
|
|
<find>detail_top</find>
|
|
|
<find />
|
|
|
<find>{if condition='$data.is_correct eq 0 && $data.is_answer eq 1'}</find>
|
|
|
<find>targetSdkVersion</find>
|
|
|
<find>showErr</find>
|
|
|
<find>checkMore</find>
|
...
|
...
|
@@ -146,7 +156,6 @@ |
|
|
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Question.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
...
|
...
|
@@ -160,6 +169,7 @@ |
|
|
<option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/member/index.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -397,14 +407,7 @@ |
|
|
<workItem from="1572568391799" duration="24440000" />
|
|
|
<workItem from="1572668245063" duration="699000" />
|
|
|
<workItem from="1572827640492" duration="25475000" />
|
|
|
<workItem from="1572914713443" duration="18519000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00146" summary="视频详情">
|
|
|
<created>1572922529468</created>
|
|
|
<option name="number" value="00146" />
|
|
|
<option name="presentableId" value="LOCAL-00146" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572922529468</updated>
|
|
|
<workItem from="1572914713443" duration="18772000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00147" summary="视频详情">
|
|
|
<created>1572923422425</created>
|
...
|
...
|
@@ -742,11 +745,18 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572938246566</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="195" />
|
|
|
<task id="LOCAL-00195" summary="音频">
|
|
|
<created>1572938779320</created>
|
|
|
<option name="number" value="00195" />
|
|
|
<option name="presentableId" value="LOCAL-00195" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572938779320</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="196" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="318097000" />
|
|
|
<option name="totallyTimeSpent" value="318350000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1070,13 +1080,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="85">
|
|
|
<caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/libs/less/dist/less.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="289">
|
...
|
...
|
@@ -1170,15 +1173,22 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="374">
|
|
|
<state relative-caret-position="266">
|
|
|
<caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="691">
|
|
|
<caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" />
|
|
|
<state relative-caret-position="674">
|
|
|
<caret line="122" selection-start-line="122" selection-end-line="122" />
|
|
|
</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="34">
|
|
|
<caret line="2" column="93" selection-start-line="2" selection-start-column="93" selection-end-line="2" selection-end-column="93" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|