王晓刚 / advertising · 提交

转到一个项目

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

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 64 行删除
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" /> 9 + <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" />
10 </list> 10 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -43,11 +43,23 @@ @@ -43,11 +43,23 @@
43 </provider> 43 </provider>
44 </entry> 44 </entry>
45 </file> 45 </file>
46 - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> 46 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> 47 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
48 <provider selected="true" editor-type-id="text-editor"> 48 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="407">  
50 - <caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" /> 49 + <state relative-caret-position="373">
  50 + <caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
  51 + </state>
  52 + </provider>
  53 + </entry>
  54 + </file>
  55 + <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
  56 + <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
  57 + <provider selected="true" editor-type-id="text-editor">
  58 + <state relative-caret-position="213">
  59 + <caret line="178" column="29" lean-forward="true" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
  60 + <folding>
  61 + <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
  62 + </folding>
51 </state> 63 </state>
52 </provider> 64 </provider>
53 </entry> 65 </entry>
@@ -141,7 +153,6 @@ @@ -141,7 +153,6 @@
141 <option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" /> 153 <option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
142 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" /> 154 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
143 <option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" /> 155 <option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
144 - <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />  
145 <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" /> 156 <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
146 <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" /> 157 <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
147 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" /> 158 <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
@@ -169,6 +180,7 @@ @@ -169,6 +180,7 @@
169 <option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" /> 180 <option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
170 <option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" /> 181 <option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
171 <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> 182 <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
  183 + <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
172 </list> 184 </list>
173 </option> 185 </option>
174 </component> 186 </component>
@@ -281,22 +293,6 @@ @@ -281,22 +293,6 @@
281 <item name="application" type="462c0819:PsiDirectoryNode" /> 293 <item name="application" type="462c0819:PsiDirectoryNode" />
282 <item name="admin" type="462c0819:PsiDirectoryNode" /> 294 <item name="admin" type="462c0819:PsiDirectoryNode" />
283 <item name="view" type="462c0819:PsiDirectoryNode" /> 295 <item name="view" type="462c0819:PsiDirectoryNode" />
284 - <item name="common" type="462c0819:PsiDirectoryNode" />  
285 - </path>  
286 - <path>  
287 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
288 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
289 - <item name="application" type="462c0819:PsiDirectoryNode" />  
290 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
291 - <item name="view" type="462c0819:PsiDirectoryNode" />  
292 - <item name="dashboard" type="462c0819:PsiDirectoryNode" />  
293 - </path>  
294 - <path>  
295 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
296 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
297 - <item name="application" type="462c0819:PsiDirectoryNode" />  
298 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
299 - <item name="view" type="462c0819:PsiDirectoryNode" />  
300 <item name="merchant_audit" type="462c0819:PsiDirectoryNode" /> 296 <item name="merchant_audit" type="462c0819:PsiDirectoryNode" />
301 </path> 297 </path>
302 <path> 298 <path>
@@ -325,15 +321,7 @@ @@ -325,15 +321,7 @@
325 <item name="application" type="462c0819:PsiDirectoryNode" /> 321 <item name="application" type="462c0819:PsiDirectoryNode" />
326 <item name="home" type="462c0819:PsiDirectoryNode" /> 322 <item name="home" type="462c0819:PsiDirectoryNode" />
327 <item name="view" type="462c0819:PsiDirectoryNode" /> 323 <item name="view" type="462c0819:PsiDirectoryNode" />
328 - <item name="index" type="462c0819:PsiDirectoryNode" />  
329 - </path>  
330 - <path>  
331 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
332 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
333 - <item name="application" type="462c0819:PsiDirectoryNode" />  
334 - <item name="home" type="462c0819:PsiDirectoryNode" />  
335 - <item name="view" type="462c0819:PsiDirectoryNode" />  
336 - <item name="member" type="462c0819:PsiDirectoryNode" /> 324 + <item name="goods" type="462c0819:PsiDirectoryNode" />
337 </path> 325 </path>
338 <path> 326 <path>
339 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 327 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
@@ -441,28 +429,7 @@ @@ -441,28 +429,7 @@
441 <workItem from="1573259331081" duration="30435000" /> 429 <workItem from="1573259331081" duration="30435000" />
442 <workItem from="1573432217070" duration="2199000" /> 430 <workItem from="1573432217070" duration="2199000" />
443 <workItem from="1573519427130" duration="17475000" /> 431 <workItem from="1573519427130" duration="17475000" />
444 - <workItem from="1573605070739" duration="16177000" />  
445 - </task>  
446 - <task id="LOCAL-00591" summary=" 商户申请">  
447 - <created>1573544613067</created>  
448 - <option name="number" value="00591" />  
449 - <option name="presentableId" value="LOCAL-00591" />  
450 - <option name="project" value="LOCAL" />  
451 - <updated>1573544613067</updated>  
452 - </task>  
453 - <task id="LOCAL-00592" summary=" 商户申请">  
454 - <created>1573544641437</created>  
455 - <option name="number" value="00592" />  
456 - <option name="presentableId" value="LOCAL-00592" />  
457 - <option name="project" value="LOCAL" />  
458 - <updated>1573544641437</updated>  
459 - </task>  
460 - <task id="LOCAL-00593" summary=" 商户申请">  
461 - <created>1573545137272</created>  
462 - <option name="number" value="00593" />  
463 - <option name="presentableId" value="LOCAL-00593" />  
464 - <option name="project" value="LOCAL" />  
465 - <updated>1573545137272</updated> 432 + <workItem from="1573605070739" duration="17552000" />
466 </task> 433 </task>
467 <task id="LOCAL-00594" summary=" 商户申请"> 434 <task id="LOCAL-00594" summary=" 商户申请">
468 <created>1573561922444</created> 435 <created>1573561922444</created>
@@ -786,11 +753,32 @@ @@ -786,11 +753,32 @@
786 <option name="project" value="LOCAL" /> 753 <option name="project" value="LOCAL" />
787 <updated>1573631154536</updated> 754 <updated>1573631154536</updated>
788 </task> 755 </task>
789 - <option name="localTasksCounter" value="640" /> 756 + <task id="LOCAL-00640" summary="后台bug">
  757 + <created>1573631347948</created>
  758 + <option name="number" value="00640" />
  759 + <option name="presentableId" value="LOCAL-00640" />
  760 + <option name="project" value="LOCAL" />
  761 + <updated>1573631347948</updated>
  762 + </task>
  763 + <task id="LOCAL-00641" summary="后台bug">
  764 + <created>1573631366700</created>
  765 + <option name="number" value="00641" />
  766 + <option name="presentableId" value="LOCAL-00641" />
  767 + <option name="project" value="LOCAL" />
  768 + <updated>1573631366700</updated>
  769 + </task>
  770 + <task id="LOCAL-00642" summary="后台bug">
  771 + <created>1573633534049</created>
  772 + <option name="number" value="00642" />
  773 + <option name="presentableId" value="LOCAL-00642" />
  774 + <option name="project" value="LOCAL" />
  775 + <updated>1573633534049</updated>
  776 + </task>
  777 + <option name="localTasksCounter" value="643" />
790 <servers /> 778 <servers />
791 </component> 779 </component>
792 <component name="TimeTrackingManager"> 780 <component name="TimeTrackingManager">
793 - <option name="totallyTimeSpent" value="439959000" /> 781 + <option name="totallyTimeSpent" value="441334000" />
794 </component> 782 </component>
795 <component name="ToolWindowManager"> 783 <component name="ToolWindowManager">
796 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 784 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -902,13 +890,6 @@ @@ -902,13 +890,6 @@
902 </state> 890 </state>
903 </provider> 891 </provider>
904 </entry> 892 </entry>
905 - <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">  
906 - <provider selected="true" editor-type-id="text-editor">  
907 - <state relative-caret-position="288">  
908 - <caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />  
909 - </state>  
910 - </provider>  
911 - </entry>  
912 <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php"> 893 <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
913 <provider selected="true" editor-type-id="text-editor"> 894 <provider selected="true" editor-type-id="text-editor">
914 <state relative-caret-position="538"> 895 <state relative-caret-position="538">
@@ -1197,8 +1178,18 @@ @@ -1197,8 +1178,18 @@
1197 </entry> 1178 </entry>
1198 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> 1179 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
1199 <provider selected="true" editor-type-id="text-editor"> 1180 <provider selected="true" editor-type-id="text-editor">
1200 - <state relative-caret-position="407">  
1201 - <caret line="106" column="18" selection-start-line="106" selection-start-column="18" selection-end-line="106" selection-end-column="18" /> 1181 + <state relative-caret-position="373">
  1182 + <caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
  1183 + </state>
  1184 + </provider>
  1185 + </entry>
  1186 + <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
  1187 + <provider selected="true" editor-type-id="text-editor">
  1188 + <state relative-caret-position="213">
  1189 + <caret line="178" column="29" lean-forward="true" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
  1190 + <folding>
  1191 + <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
  1192 + </folding>
1202 </state> 1193 </state>
1203 </provider> 1194 </provider>
1204 </entry> 1195 </entry>
@@ -176,6 +176,7 @@ @@ -176,6 +176,7 @@
176 var duration = vo.duration; 176 var duration = vo.duration;
177 alert(duration); 177 alert(duration);
178 if(isNaN(duration)){ 178 if(isNaN(duration)){
  179 + audio.load();
179 getDuration(audio,vo); 180 getDuration(audio,vo);
180 }else{ 181 }else{
181 audio.parents('.detail_audio_wrap').find('.audio_time').text(changeTime(duration)); 182 audio.parents('.detail_audio_wrap').find('.audio_time').text(changeTime(duration));
@@ -200,7 +201,7 @@ @@ -200,7 +201,7 @@
200 // 音频时长 201 // 音频时长
201 var begin = []; 202 var begin = [];
202 $(audio).each(function (key, vo) { 203 $(audio).each(function (key, vo) {
203 - getDuration(audio.eq(key),vo) 204 + getDuration(audio.eq(key),vo);
204 begin.push(key); 205 begin.push(key);
205 }); 206 });
206 var over = []; 207 var over = [];