王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 603811626783b3013e8184f75d5be7e6e06d9d85 1 个父辈 93e7d2bd
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 53 行增加 和 76 行删除
... ... @@ -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/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,29 +34,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="my_withdraw.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-221">
<caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<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="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">
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<state relative-caret-position="303">
<caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
<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>
... ... @@ -64,20 +46,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="record.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/record.css">
<file leaf-file-name="edit.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="116" column="16" selection-start-line="116" selection-start-column="16" selection-end-line="116" selection-end-column="16" />
<state relative-caret-position="528">
<caret line="51" column="52" selection-start-line="51" selection-start-column="52" selection-end-line="51" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="my_wallet.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_wallet.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -172,7 +149,6 @@
<option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/slide/add.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
<option value="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Dashboard.php" />
<option value="$PROJECT_DIR$/application/admin/view/common/header.html" />
<option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
... ... @@ -181,6 +157,7 @@
<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" />
<option value="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" />
</list>
</option>
</component>
... ... @@ -429,35 +406,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="17752000" />
</task>
<task id="LOCAL-00596" summary=" 商户申请">
<created>1573562145766</created>
<option name="number" value="00596" />
<option name="presentableId" value="LOCAL-00596" />
<option name="project" value="LOCAL" />
<updated>1573562145766</updated>
</task>
<task id="LOCAL-00597" summary=" 商户申请">
<created>1573562164520</created>
<option name="number" value="00597" />
<option name="presentableId" value="LOCAL-00597" />
<option name="project" value="LOCAL" />
<updated>1573562164520</updated>
</task>
<task id="LOCAL-00598" summary=" 商户申请">
<created>1573562241873</created>
<option name="number" value="00598" />
<option name="presentableId" value="LOCAL-00598" />
<option name="project" value="LOCAL" />
<updated>1573562241873</updated>
</task>
<task id="LOCAL-00599" summary=" 商户申请">
<created>1573562324144</created>
<option name="number" value="00599" />
<option name="presentableId" value="LOCAL-00599" />
<option name="project" value="LOCAL" />
<updated>1573562324144</updated>
<workItem from="1573605070739" duration="18476000" />
</task>
<task id="LOCAL-00600" summary=" 商户申请">
<created>1573562410823</created>
... ... @@ -774,11 +723,39 @@
<option name="project" value="LOCAL" />
<updated>1573633945901</updated>
</task>
<option name="localTasksCounter" value="645" />
<task id="LOCAL-00645" summary="后台bug">
<created>1573633977584</created>
<option name="number" value="00645" />
<option name="presentableId" value="LOCAL-00645" />
<option name="project" value="LOCAL" />
<updated>1573633977584</updated>
</task>
<task id="LOCAL-00646" summary="后台bug">
<created>1573634041029</created>
<option name="number" value="00646" />
<option name="presentableId" value="LOCAL-00646" />
<option name="project" value="LOCAL" />
<updated>1573634041029</updated>
</task>
<task id="LOCAL-00647" summary="后台bug">
<created>1573634111454</created>
<option name="number" value="00647" />
<option name="presentableId" value="LOCAL-00647" />
<option name="project" value="LOCAL" />
<updated>1573634111454</updated>
</task>
<task id="LOCAL-00648" summary="后台bug">
<created>1573634195472</created>
<option name="number" value="00648" />
<option name="presentableId" value="LOCAL-00648" />
<option name="project" value="LOCAL" />
<updated>1573634195472</updated>
</task>
<option name="localTasksCounter" value="649" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="441534000" />
<option name="totallyTimeSpent" value="442258000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1090,9 +1067,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
... ... @@ -1136,13 +1110,6 @@
</state>
</provider>
</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="867">
<caret line="51" column="16" selection-start-line="51" selection-start-column="16" selection-end-line="62" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Dashboard.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="725">
... ... @@ -1183,16 +1150,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</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="286">
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<state relative-caret-position="303">
<caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
<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/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="51" column="52" selection-start-line="51" selection-start-column="52" selection-end-line="51" selection-end-column="52" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -49,7 +49,7 @@
<tr>
<td>{:__('Other_images')}:</td>
<td>
{notempty name="$other_images"}
{notempty name="$row['other_images']"}
{php}$other_images = explode(',',$row['other_images']);{/php}
<ul class="row list-inline plupload-preview" id="p-other_images" data-listidx="0">
{foreach name="$other_images" item="o_i"}
... ...