王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 74b9056bd7c3ba85cb81dfd12fcd46fa78ce99b3 1 个父辈 b938e2d2
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 47 行增加 和 73 行删除
... ... @@ -4,10 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
</component>
<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>
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -38,7 +35,7 @@
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="178" column="27" selection-start-line="178" selection-start-column="27" selection-end-line="178" selection-end-column="27" />
<caret line="190" column="32" selection-start-line="190" selection-start-column="32" selection-end-line="190" selection-end-column="32" />
<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>
... ... @@ -46,11 +43,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<file leaf-file-name="users.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="439">
<caret line="46" column="17" lean-forward="true" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
<state relative-caret-position="561">
<caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
</state>
</provider>
</entry>
... ... @@ -269,7 +266,7 @@
<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" />
<item name="users" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -280,28 +277,6 @@
<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="controller" 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" />
</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="goods" 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>
... ... @@ -315,15 +290,15 @@
<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="js" 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" />
<item name="js" type="462c0819:PsiDirectoryNode" />
<item name="backend" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
... ... @@ -405,28 +380,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="19424000" />
</task>
<task id="LOCAL-00606" summary=" 商户申请">
<created>1573563361334</created>
<option name="number" value="00606" />
<option name="presentableId" value="LOCAL-00606" />
<option name="project" value="LOCAL" />
<updated>1573563361334</updated>
</task>
<task id="LOCAL-00607" summary=" 商户申请">
<created>1573563547057</created>
<option name="number" value="00607" />
<option name="presentableId" value="LOCAL-00607" />
<option name="project" value="LOCAL" />
<updated>1573563547057</updated>
</task>
<task id="LOCAL-00608" summary=" 商户申请">
<created>1573563645186</created>
<option name="number" value="00608" />
<option name="presentableId" value="LOCAL-00608" />
<option name="project" value="LOCAL" />
<updated>1573563645186</updated>
<workItem from="1573605070739" duration="20253000" />
</task>
<task id="LOCAL-00609" summary=" 商户申请">
<created>1573563687766</created>
... ... @@ -750,11 +704,32 @@
<option name="project" value="LOCAL" />
<updated>1573635277592</updated>
</task>
<option name="localTasksCounter" value="655" />
<task id="LOCAL-00655" summary=" 后台bug">
<created>1573635661667</created>
<option name="number" value="00655" />
<option name="presentableId" value="LOCAL-00655" />
<option name="project" value="LOCAL" />
<updated>1573635661667</updated>
</task>
<task id="LOCAL-00656" summary="后台bug">
<created>1573636383511</created>
<option name="number" value="00656" />
<option name="presentableId" value="LOCAL-00656" />
<option name="project" value="LOCAL" />
<updated>1573636383511</updated>
</task>
<task id="LOCAL-00657" summary="后台bug">
<created>1573636454240</created>
<option name="number" value="00657" />
<option name="presentableId" value="LOCAL-00657" />
<option name="project" value="LOCAL" />
<updated>1573636454241</updated>
</task>
<option name="localTasksCounter" value="658" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="443206000" />
<option name="totallyTimeSpent" value="444035000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -843,16 +818,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [3].php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -1154,15 +1119,25 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="439">
<caret line="46" column="17" lean-forward="true" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
<state relative-caret-position="541">
<caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
</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="305">
<caret line="178" column="27" selection-start-line="178" selection-start-column="27" selection-end-line="178" selection-end-column="27" />
<caret line="190" column="32" selection-start-line="190" selection-start-column="32" selection-end-line="190" selection-end-column="32" />
<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>
... ...
... ... @@ -185,7 +185,6 @@
function getDuration(audio,vo) {
setTimeout(function () {
var duration = parseInt(vo.duration);
}
if(isNaN(duration)){
... ...