王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 22aa83ddb4f7d9bb719f25eb2eaf929b3710be1e 1 个父辈 51c67219
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 64 行删除
... ... @@ -6,7 +6,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/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" 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" />
... ... @@ -43,11 +43,23 @@
</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/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" />
<state relative-caret-position="373">
<caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<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="213">
<caret line="178" column="29" lean-forward="true" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<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" />
</folding>
</state>
</provider>
</entry>
... ... @@ -141,7 +153,6 @@
<option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
... ... @@ -169,6 +180,7 @@
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
</list>
</option>
</component>
... ... @@ -281,22 +293,6 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="dashboard" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant_audit" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -325,15 +321,7 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="member" type="462c0819:PsiDirectoryNode" />
<item name="goods" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -441,28 +429,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="16177000" />
</task>
<task id="LOCAL-00591" summary=" 商户申请">
<created>1573544613067</created>
<option name="number" value="00591" />
<option name="presentableId" value="LOCAL-00591" />
<option name="project" value="LOCAL" />
<updated>1573544613067</updated>
</task>
<task id="LOCAL-00592" summary=" 商户申请">
<created>1573544641437</created>
<option name="number" value="00592" />
<option name="presentableId" value="LOCAL-00592" />
<option name="project" value="LOCAL" />
<updated>1573544641437</updated>
</task>
<task id="LOCAL-00593" summary=" 商户申请">
<created>1573545137272</created>
<option name="number" value="00593" />
<option name="presentableId" value="LOCAL-00593" />
<option name="project" value="LOCAL" />
<updated>1573545137272</updated>
<workItem from="1573605070739" duration="17552000" />
</task>
<task id="LOCAL-00594" summary=" 商户申请">
<created>1573561922444</created>
... ... @@ -786,11 +753,32 @@
<option name="project" value="LOCAL" />
<updated>1573631154536</updated>
</task>
<option name="localTasksCounter" value="640" />
<task id="LOCAL-00640" summary="后台bug">
<created>1573631347948</created>
<option name="number" value="00640" />
<option name="presentableId" value="LOCAL-00640" />
<option name="project" value="LOCAL" />
<updated>1573631347948</updated>
</task>
<task id="LOCAL-00641" summary="后台bug">
<created>1573631366700</created>
<option name="number" value="00641" />
<option name="presentableId" value="LOCAL-00641" />
<option name="project" value="LOCAL" />
<updated>1573631366700</updated>
</task>
<task id="LOCAL-00642" summary="后台bug">
<created>1573633534049</created>
<option name="number" value="00642" />
<option name="presentableId" value="LOCAL-00642" />
<option name="project" value="LOCAL" />
<updated>1573633534049</updated>
</task>
<option name="localTasksCounter" value="643" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="439959000" />
<option name="totallyTimeSpent" value="441334000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -902,13 +890,6 @@
</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="288">
<caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
... ... @@ -1197,8 +1178,18 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" />
<state relative-caret-position="373">
<caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
</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="213">
<caret line="178" column="29" lean-forward="true" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<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" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -176,6 +176,7 @@
var duration = vo.duration;
alert(duration);
if(isNaN(duration)){
audio.load();
getDuration(audio,vo);
}else{
audio.parents('.detail_audio_wrap').find('.audio_time').text(changeTime(duration));
... ... @@ -200,7 +201,7 @@
// 音频时长
var begin = [];
$(audio).each(function (key, vo) {
getDuration(audio.eq(key),vo)
getDuration(audio.eq(key),vo);
begin.push(key);
});
var over = [];
... ...