正在显示
2 个修改的文件
包含
38 行增加
和
28 行删除
@@ -2,7 +2,8 @@ | @@ -2,7 +2,8 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> | 4 | <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> |
5 | - <change afterPath="$PROJECT_DIR$/application/home/view/member/index.html" afterDir="false" /> | 5 | + <change beforePath="$PROJECT_DIR$/application/home/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/index.html" afterDir="false" /> |
6 | + <change beforePath="$PROJECT_DIR$/application/home/view/public/nav.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/public/nav.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" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -30,6 +31,15 @@ | @@ -30,6 +31,15 @@ | ||
30 | </component> | 31 | </component> |
31 | <component name="FileEditorManager"> | 32 | <component name="FileEditorManager"> |
32 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 33 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
34 | + <file leaf-file-name="nav.html" pinned="false" current-in-tab="true"> | ||
35 | + <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> | ||
36 | + <provider selected="true" editor-type-id="text-editor"> | ||
37 | + <state relative-caret-position="34"> | ||
38 | + <caret line="2" column="93" selection-start-line="2" selection-start-column="93" selection-end-line="2" selection-end-column="93" /> | ||
39 | + </state> | ||
40 | + </provider> | ||
41 | + </entry> | ||
42 | + </file> | ||
33 | <file leaf-file-name="Member.php" pinned="false" current-in-tab="false"> | 43 | <file leaf-file-name="Member.php" pinned="false" current-in-tab="false"> |
34 | <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> | 44 | <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> |
35 | <provider selected="true" editor-type-id="text-editor"> | 45 | <provider selected="true" editor-type-id="text-editor"> |
@@ -39,11 +49,11 @@ | @@ -39,11 +49,11 @@ | ||
39 | </provider> | 49 | </provider> |
40 | </entry> | 50 | </entry> |
41 | </file> | 51 | </file> |
42 | - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> | 52 | + <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> |
43 | <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html"> | 53 | <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html"> |
44 | <provider selected="true" editor-type-id="text-editor"> | 54 | <provider selected="true" editor-type-id="text-editor"> |
45 | - <state relative-caret-position="691"> | ||
46 | - <caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" /> | 55 | + <state relative-caret-position="674"> |
56 | + <caret line="122" selection-start-line="122" selection-end-line="122" /> | ||
47 | </state> | 57 | </state> |
48 | </provider> | 58 | </provider> |
49 | </entry> | 59 | </entry> |
@@ -51,7 +61,7 @@ | @@ -51,7 +61,7 @@ | ||
51 | <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> | 61 | <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> |
52 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 62 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
53 | <provider selected="true" editor-type-id="text-editor"> | 63 | <provider selected="true" editor-type-id="text-editor"> |
54 | - <state relative-caret-position="374"> | 64 | + <state relative-caret-position="266"> |
55 | <caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" /> | 65 | <caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" /> |
56 | </state> | 66 | </state> |
57 | </provider> | 67 | </provider> |
@@ -87,7 +97,7 @@ | @@ -87,7 +97,7 @@ | ||
87 | <find>btn_more</find> | 97 | <find>btn_more</find> |
88 | <find>detail_qust</find> | 98 | <find>detail_qust</find> |
89 | <find>detail_top</find> | 99 | <find>detail_top</find> |
90 | - <find /> | 100 | + <find>{if condition='$data.is_correct eq 0 && $data.is_answer eq 1'}</find> |
91 | <find>targetSdkVersion</find> | 101 | <find>targetSdkVersion</find> |
92 | <find>showErr</find> | 102 | <find>showErr</find> |
93 | <find>checkMore</find> | 103 | <find>checkMore</find> |
@@ -146,7 +156,6 @@ | @@ -146,7 +156,6 @@ | ||
146 | <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" /> | 156 | <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" /> |
147 | <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> | 157 | <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> |
148 | <option value="$PROJECT_DIR$/application/home/controller/User.php" /> | 158 | <option value="$PROJECT_DIR$/application/home/controller/User.php" /> |
149 | - <option value="$PROJECT_DIR$/application/home/view/public/nav.html" /> | ||
150 | <option value="$PROJECT_DIR$/application/home/controller/Question.php" /> | 159 | <option value="$PROJECT_DIR$/application/home/controller/Question.php" /> |
151 | <option value="$PROJECT_DIR$/application/home/controller/Index.php" /> | 160 | <option value="$PROJECT_DIR$/application/home/controller/Index.php" /> |
152 | <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> | 161 | <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> |
@@ -160,6 +169,7 @@ | @@ -160,6 +169,7 @@ | ||
160 | <option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" /> | 169 | <option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" /> |
161 | <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" /> | 170 | <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" /> |
162 | <option value="$PROJECT_DIR$/application/home/view/member/index.html" /> | 171 | <option value="$PROJECT_DIR$/application/home/view/member/index.html" /> |
172 | + <option value="$PROJECT_DIR$/application/home/view/public/nav.html" /> | ||
163 | </list> | 173 | </list> |
164 | </option> | 174 | </option> |
165 | </component> | 175 | </component> |
@@ -397,14 +407,7 @@ | @@ -397,14 +407,7 @@ | ||
397 | <workItem from="1572568391799" duration="24440000" /> | 407 | <workItem from="1572568391799" duration="24440000" /> |
398 | <workItem from="1572668245063" duration="699000" /> | 408 | <workItem from="1572668245063" duration="699000" /> |
399 | <workItem from="1572827640492" duration="25475000" /> | 409 | <workItem from="1572827640492" duration="25475000" /> |
400 | - <workItem from="1572914713443" duration="18519000" /> | ||
401 | - </task> | ||
402 | - <task id="LOCAL-00146" summary="视频详情"> | ||
403 | - <created>1572922529468</created> | ||
404 | - <option name="number" value="00146" /> | ||
405 | - <option name="presentableId" value="LOCAL-00146" /> | ||
406 | - <option name="project" value="LOCAL" /> | ||
407 | - <updated>1572922529468</updated> | 410 | + <workItem from="1572914713443" duration="18772000" /> |
408 | </task> | 411 | </task> |
409 | <task id="LOCAL-00147" summary="视频详情"> | 412 | <task id="LOCAL-00147" summary="视频详情"> |
410 | <created>1572923422425</created> | 413 | <created>1572923422425</created> |
@@ -742,11 +745,18 @@ | @@ -742,11 +745,18 @@ | ||
742 | <option name="project" value="LOCAL" /> | 745 | <option name="project" value="LOCAL" /> |
743 | <updated>1572938246566</updated> | 746 | <updated>1572938246566</updated> |
744 | </task> | 747 | </task> |
745 | - <option name="localTasksCounter" value="195" /> | 748 | + <task id="LOCAL-00195" summary="音频"> |
749 | + <created>1572938779320</created> | ||
750 | + <option name="number" value="00195" /> | ||
751 | + <option name="presentableId" value="LOCAL-00195" /> | ||
752 | + <option name="project" value="LOCAL" /> | ||
753 | + <updated>1572938779320</updated> | ||
754 | + </task> | ||
755 | + <option name="localTasksCounter" value="196" /> | ||
746 | <servers /> | 756 | <servers /> |
747 | </component> | 757 | </component> |
748 | <component name="TimeTrackingManager"> | 758 | <component name="TimeTrackingManager"> |
749 | - <option name="totallyTimeSpent" value="318097000" /> | 759 | + <option name="totallyTimeSpent" value="318350000" /> |
750 | </component> | 760 | </component> |
751 | <component name="ToolWindowManager"> | 761 | <component name="ToolWindowManager"> |
752 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 762 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
@@ -1070,13 +1080,6 @@ | @@ -1070,13 +1080,6 @@ | ||
1070 | </state> | 1080 | </state> |
1071 | </provider> | 1081 | </provider> |
1072 | </entry> | 1082 | </entry> |
1073 | - <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> | ||
1074 | - <provider selected="true" editor-type-id="text-editor"> | ||
1075 | - <state relative-caret-position="85"> | ||
1076 | - <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" /> | ||
1077 | - </state> | ||
1078 | - </provider> | ||
1079 | - </entry> | ||
1080 | <entry file="file://$PROJECT_DIR$/public/assets/libs/less/dist/less.js"> | 1083 | <entry file="file://$PROJECT_DIR$/public/assets/libs/less/dist/less.js"> |
1081 | <provider selected="true" editor-type-id="text-editor"> | 1084 | <provider selected="true" editor-type-id="text-editor"> |
1082 | <state relative-caret-position="289"> | 1085 | <state relative-caret-position="289"> |
@@ -1170,15 +1173,22 @@ | @@ -1170,15 +1173,22 @@ | ||
1170 | </entry> | 1173 | </entry> |
1171 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 1174 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
1172 | <provider selected="true" editor-type-id="text-editor"> | 1175 | <provider selected="true" editor-type-id="text-editor"> |
1173 | - <state relative-caret-position="374"> | 1176 | + <state relative-caret-position="266"> |
1174 | <caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" /> | 1177 | <caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" /> |
1175 | </state> | 1178 | </state> |
1176 | </provider> | 1179 | </provider> |
1177 | </entry> | 1180 | </entry> |
1178 | <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html"> | 1181 | <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html"> |
1179 | <provider selected="true" editor-type-id="text-editor"> | 1182 | <provider selected="true" editor-type-id="text-editor"> |
1180 | - <state relative-caret-position="691"> | ||
1181 | - <caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" /> | 1183 | + <state relative-caret-position="674"> |
1184 | + <caret line="122" selection-start-line="122" selection-end-line="122" /> | ||
1185 | + </state> | ||
1186 | + </provider> | ||
1187 | + </entry> | ||
1188 | + <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> | ||
1189 | + <provider selected="true" editor-type-id="text-editor"> | ||
1190 | + <state relative-caret-position="34"> | ||
1191 | + <caret line="2" column="93" selection-start-line="2" selection-start-column="93" selection-end-line="2" selection-end-column="93" /> | ||
1182 | </state> | 1192 | </state> |
1183 | </provider> | 1193 | </provider> |
1184 | </entry> | 1194 | </entry> |
1 | <div class="nav"> | 1 | <div class="nav"> |
2 | <div class="layout align_center justify_around"> | 2 | <div class="layout align_center justify_around"> |
3 | - <div class="layout align_center flex_diection" onclick="window.location.href='{:url('home/member/index')}"> | 3 | + <div class="layout align_center flex_diection" onclick="window.location.href='{:url('home/index/index')}"> |
4 | <div class="nav_img"> | 4 | <div class="nav_img"> |
5 | <img src="__CDN__/assets/advertising/img/sun_02@2x.png" alt=""> | 5 | <img src="__CDN__/assets/advertising/img/sun_02@2x.png" alt=""> |
6 | </div> | 6 | </div> |
-
请 注册 或 登录 后发表评论