王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 da15cdfb6184d25675a573b1f9a3687d15ce4455 1 个父辈 773026b8
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 23 行增加 和 24 行删除
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
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/admin/controller/Dashboard.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Dashboard.php" afterDir="false" />  
10 <change beforePath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/dashboard/index.html" afterDir="false" />
11 </list> 10 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -38,8 +37,8 @@ @@ -38,8 +37,8 @@
38 <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> 37 <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
39 <entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html"> 38 <entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
40 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
41 - <state relative-caret-position="521">  
42 - <caret line="462" column="88" selection-start-line="462" selection-start-column="88" selection-end-line="462" selection-end-column="88" /> 40 + <state relative-caret-position="181">
  41 + <caret line="430" column="40" selection-start-line="430" selection-start-column="40" selection-end-line="430" selection-end-column="40" />
43 <folding> 42 <folding>
44 <element signature="e#3513#5412#0" /> 43 <element signature="e#3513#5412#0" />
45 <element signature="e#5423#10316#0" /> 44 <element signature="e#5423#10316#0" />
@@ -413,21 +412,7 @@ @@ -413,21 +412,7 @@
413 <workItem from="1573259331081" duration="30435000" /> 412 <workItem from="1573259331081" duration="30435000" />
414 <workItem from="1573432217070" duration="2199000" /> 413 <workItem from="1573432217070" duration="2199000" />
415 <workItem from="1573519427130" duration="17475000" /> 414 <workItem from="1573519427130" duration="17475000" />
416 - <workItem from="1573605070739" duration="13596000" />  
417 - </task>  
418 - <task id="LOCAL-00580" summary=" 商户申请">  
419 - <created>1573542164527</created>  
420 - <option name="number" value="00580" />  
421 - <option name="presentableId" value="LOCAL-00580" />  
422 - <option name="project" value="LOCAL" />  
423 - <updated>1573542164527</updated>  
424 - </task>  
425 - <task id="LOCAL-00581" summary=" 商户申请">  
426 - <created>1573542341131</created>  
427 - <option name="number" value="00581" />  
428 - <option name="presentableId" value="LOCAL-00581" />  
429 - <option name="project" value="LOCAL" />  
430 - <updated>1573542341131</updated> 415 + <workItem from="1573605070739" duration="13929000" />
431 </task> 416 </task>
432 <task id="LOCAL-00582" summary=" 商户申请"> 417 <task id="LOCAL-00582" summary=" 商户申请">
433 <created>1573542575057</created> 418 <created>1573542575057</created>
@@ -758,11 +743,25 @@ @@ -758,11 +743,25 @@
758 <option name="project" value="LOCAL" /> 743 <option name="project" value="LOCAL" />
759 <updated>1573626294912</updated> 744 <updated>1573626294912</updated>
760 </task> 745 </task>
761 - <option name="localTasksCounter" value="629" /> 746 + <task id="LOCAL-00629" summary="后台bug">
  747 + <created>1573627704456</created>
  748 + <option name="number" value="00629" />
  749 + <option name="presentableId" value="LOCAL-00629" />
  750 + <option name="project" value="LOCAL" />
  751 + <updated>1573627704456</updated>
  752 + </task>
  753 + <task id="LOCAL-00630" summary="后台bug">
  754 + <created>1573627771014</created>
  755 + <option name="number" value="00630" />
  756 + <option name="presentableId" value="LOCAL-00630" />
  757 + <option name="project" value="LOCAL" />
  758 + <updated>1573627771014</updated>
  759 + </task>
  760 + <option name="localTasksCounter" value="631" />
762 <servers /> 761 <servers />
763 </component> 762 </component>
764 <component name="TimeTrackingManager"> 763 <component name="TimeTrackingManager">
765 - <option name="totallyTimeSpent" value="437378000" /> 764 + <option name="totallyTimeSpent" value="437711000" />
766 </component> 765 </component>
767 <component name="ToolWindowManager"> 766 <component name="ToolWindowManager">
768 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 767 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1167,8 +1166,8 @@ @@ -1167,8 +1166,8 @@
1167 </entry> 1166 </entry>
1168 <entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html"> 1167 <entry file="file://$PROJECT_DIR$/application/admin/view/dashboard/index.html">
1169 <provider selected="true" editor-type-id="text-editor"> 1168 <provider selected="true" editor-type-id="text-editor">
1170 - <state relative-caret-position="521">  
1171 - <caret line="462" column="88" selection-start-line="462" selection-start-column="88" selection-end-line="462" selection-end-column="88" /> 1169 + <state relative-caret-position="181">
  1170 + <caret line="430" column="40" selection-start-line="430" selection-start-column="40" selection-end-line="430" selection-end-column="40" />
1172 <folding> 1171 <folding>
1173 <element signature="e#3513#5412#0" /> 1172 <element signature="e#3513#5412#0" />
1174 <element signature="e#5423#10316#0" /> 1173 <element signature="e#5423#10316#0" />
@@ -428,9 +428,9 @@ @@ -428,9 +428,9 @@
428 </div> 428 </div>
429 </div>--> 429 </div>-->
430 {if condition="$auth['group_id'] eq 6"} 430 {if condition="$auth['group_id'] eq 6"}
431 - <div class="col-lg-4"> 431 + <div class="col-lg-8">
432 <div class="box box-success"> 432 <div class="box box-success">
433 - <div class="box-header"><h3 class="box-title">{:__('Server info')}</h3></div> 433 + <div class="box-header"><h3 class="box-title">商户信息</h3></div>
434 <div class="box-body" style="padding-top:0;"> 434 <div class="box-body" style="padding-top:0;">
435 <table class="table table-striped"> 435 <table class="table table-striped">
436 <tbody> 436 <tbody>