王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 23734e74fd8833253171e817738d7da2533f0ca8 1 个父辈 c220189a
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 68 行增加 和 55 行删除
... ... @@ -5,7 +5,7 @@
</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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -51,7 +51,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="true">
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
... ... @@ -60,6 +60,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="MerchantGoods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="298" column="31" selection-start-line="298" selection-start-column="31" selection-end-line="298" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -81,11 +90,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<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="17">
<caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<state relative-caret-position="475">
<caret line="307" column="36" selection-start-line="307" selection-start-column="36" selection-end-line="307" selection-end-column="36" />
<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>
... ... @@ -112,15 +121,6 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -173,7 +173,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/common/controller/Backend.php" />
<option value="$PROJECT_DIR$/extend/fast/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/home/view/public/NAV.html" />
... ... @@ -217,13 +216,14 @@
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<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/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
</list>
</option>
</component>
... ... @@ -314,6 +314,19 @@
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" 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="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" />
</path>
<path>
... ... @@ -483,21 +496,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="3109000" />
</task>
<task id="LOCAL-00499" summary="商户申请">
<created>1573283388103</created>
<option name="number" value="00499" />
<option name="presentableId" value="LOCAL-00499" />
<option name="project" value="LOCAL" />
<updated>1573283388103</updated>
</task>
<task id="LOCAL-00500" summary="商户申请">
<created>1573283462761</created>
<option name="number" value="00500" />
<option name="presentableId" value="LOCAL-00500" />
<option name="project" value="LOCAL" />
<updated>1573283462761</updated>
<workItem from="1573519427130" duration="4060000" />
</task>
<task id="LOCAL-00501" summary="商户申请">
<created>1573283491110</created>
... ... @@ -828,11 +827,25 @@
<option name="project" value="LOCAL" />
<updated>1573522719090</updated>
</task>
<option name="localTasksCounter" value="548" />
<task id="LOCAL-00548" summary=" 商户申请">
<created>1573523542474</created>
<option name="number" value="00548" />
<option name="presentableId" value="LOCAL-00548" />
<option name="project" value="LOCAL" />
<updated>1573523542474</updated>
</task>
<task id="LOCAL-00549" summary=" 商户申请">
<created>1573523611578</created>
<option name="number" value="00549" />
<option name="presentableId" value="LOCAL-00549" />
<option name="project" value="LOCAL" />
<updated>1573523611578</updated>
</task>
<option name="localTasksCounter" value="550" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="409416000" />
<option name="totallyTimeSpent" value="410367000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -919,13 +932,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_wallet.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/white.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -1175,16 +1181,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="17">
<caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<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>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1932">
... ... @@ -1223,6 +1219,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="298" column="31" selection-start-line="298" selection-start-column="31" selection-end-line="298" selection-end-column="31" />
</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="475">
<caret line="307" column="36" selection-start-line="307" selection-start-column="36" selection-end-line="307" selection-end-column="36" />
<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>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -322,11 +322,11 @@
$(".quest_condition").show();
}
}else{
toast('与服务器断开连接')
toast('与服务器断开连接2')
}
},
error:function(){
toast('与服务器断开连接');
toast('与服务器断开连接3');
}
});
}
... ... @@ -499,7 +499,7 @@
}
},
error:function(){
toast('与服务器断开连接');
toast('与服务器断开连接4');
}
});
}
... ... @@ -556,11 +556,11 @@
$(".bottom_collect").css("color", "#BDC4CE");
}
}else{
toast('与服务器断开连接');
toast('与服务器断开连接5');
}
},
error:function(res){
toast('与服务器断开连接');
toast('与服务器断开连接6');
}
});
});
... ...