王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 9b14df7e68b58421fdc80f994477f162ec6ced36 1 个父辈 94976c26
1 个管道 的构建 通过 耗费 2 秒

视频详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 116 行增加 和 82 行删除
... ... @@ -3,7 +3,6 @@
<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/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -40,6 +39,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="advDetail.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<caret line="431" column="21" selection-start-line="431" selection-start-column="13" selection-end-line="431" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<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">
... ... @@ -80,8 +88,8 @@
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="696">
<caret line="234" column="63" selection-start-line="234" selection-start-column="63" selection-end-line="234" selection-end-column="63" />
<state relative-caret-position="492">
<caret line="225" column="52" selection-start-line="225" selection-start-column="42" selection-end-line="225" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -126,11 +134,6 @@
</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" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -142,7 +145,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>collect_img</find>
<find>bottom_collect</find>
<find>btn_all</find>
<find>btn_msg</find>
... ... @@ -170,8 +172,9 @@
<find>end_day</find>
<find>audio_time</find>
<find>audio_style</find>
<find>quest_box</find>
<find>submit</find>
<find>quest_box</find>
<find>b_active</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -364,6 +367,32 @@
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -437,21 +466,7 @@
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="25475000" />
<workItem from="1572914713443" duration="11546000" />
</task>
<task id="LOCAL-00114" summary="视频详情">
<created>1572918553832</created>
<option name="number" value="00114" />
<option name="presentableId" value="LOCAL-00114" />
<option name="project" value="LOCAL" />
<updated>1572918553832</updated>
</task>
<task id="LOCAL-00115" summary="视频详情">
<created>1572918595501</created>
<option name="number" value="00115" />
<option name="presentableId" value="LOCAL-00115" />
<option name="project" value="LOCAL" />
<updated>1572918595501</updated>
<workItem from="1572914713443" duration="12151000" />
</task>
<task id="LOCAL-00116" summary="视频详情">
<created>1572918695404</created>
... ... @@ -782,11 +797,25 @@
<option name="project" value="LOCAL" />
<updated>1572931076863</updated>
</task>
<option name="localTasksCounter" value="163" />
<task id="LOCAL-00163" summary="视频详情">
<created>1572931224815</created>
<option name="number" value="00163" />
<option name="presentableId" value="LOCAL-00163" />
<option name="project" value="LOCAL" />
<updated>1572931224815</updated>
</task>
<task id="LOCAL-00164" summary="视频详情">
<created>1572931548215</created>
<option name="number" value="00164" />
<option name="presentableId" value="LOCAL-00164" />
<option name="project" value="LOCAL" />
<updated>1572931548215</updated>
</task>
<option name="localTasksCounter" value="165" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="311124000" />
<option name="totallyTimeSpent" value="311729000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1116,13 +1145,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="39" column="1" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3179">
... ... @@ -1161,18 +1183,6 @@
</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="17">
<caret line="18" selection-start-line="18" selection-end-line="55" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
... ... @@ -1187,13 +1197,6 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="191" column="21" selection-start-line="191" selection-start-column="12" selection-end-line="191" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="410">
... ... @@ -1206,10 +1209,36 @@
</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="17">
<caret line="18" selection-start-line="18" selection-end-line="55" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<caret line="431" column="21" selection-start-line="431" selection-start-column="13" selection-end-line="431" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="191" column="21" selection-start-line="191" selection-start-column="12" selection-end-line="191" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="696">
<caret line="234" column="63" selection-start-line="234" selection-start-column="63" selection-end-line="234" selection-end-column="63" />
<state relative-caret-position="492">
<caret line="225" column="52" selection-start-line="225" selection-start-column="42" selection-end-line="225" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
... ...
... ... @@ -197,35 +197,40 @@
var index = $('.audio_style').index(this);
$(audio).each(function (key, vo) {
if(key == index){
vo.play();
var audioTime = parseInt(vo.duration);
var audioTimer = setInterval(function() {
audioTime--;
if (audioTime % 2 == 0) {
audio.eq(key).parents('.detail_audio_wrap').find(".b3").siblings().removeClass("b_active")
} else {
audio.eq(key).parents('.detail_audio_wrap').find(".b1").addClass("b_active");
audio.eq(key).parents('.detail_audio_wrap').find(".b5").addClass("b_active");
}
if (audioTime <= 0) {
console.log(over.indexOf(key));
if(over.indexOf(key)){
over.push(key)
if(vo.currentTime == 0){
vo.play();
var audioTime = parseInt(vo.duration);
var audioTimer = setInterval(function() {
audioTime--;
if (audioTime % 2 == 0) {
audio.eq(key).parents('.detail_audio_wrap').find(".b3").siblings().removeClass("b_active")
} else {
audio.eq(key).parents('.detail_audio_wrap').find(".b1").addClass("b_active");
audio.eq(key).parents('.detail_audio_wrap').find(".b5").addClass("b_active");
}
console.log(over.length);
console.log(begin.length);
if(over.length == begin.length){
$(".detail_qust").removeClass("quest_ans");
$(".quest_box").removeClass("quest_ans");
$(".quest_condition").hide();
// 重新答题
$(".error_btn").hide();
if (audioTime <= 0) {
console.log(over.indexOf(key));
if(over.indexOf(key)){
over.push(key)
}
console.log(over.length);
console.log(begin.length);
if(over.length == begin.length){
$(".detail_qust").removeClass("quest_ans");
$(".quest_box").removeClass("quest_ans");
$(".quest_condition").hide();
// 重新答题
$(".error_btn").hide();
}
audioTime = parseInt(vo.duration);
audio.eq(key).parents('.detail_audio_wrap').find(".b3").siblings().removeClass("b_active");
clearInterval(audioTimer)
}
audioTime = parseInt(vo.duration);
audio.eq(key).parents('.detail_audio_wrap').find(".b3").siblings().removeClass("b_active");
clearInterval(audioTimer)
}
}, 1000);
}, 1000);
}else{
vo.currentTime = 0;
vo.pause();
}
}else{
console.log(111);
vo.currentTime = 0;
... ...