wupengfei 1 jaar geleden
bovenliggende
commit
973153683b
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      .idea/workspace.xml
  2. 1 1
      application/operate/controller/Activity.php

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/sponsor/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/sponsor/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -313,7 +313,7 @@
       <workItem from="1683680449159" duration="24035000" />
       <workItem from="1683766597228" duration="22109000" />
       <workItem from="1683852930702" duration="24375000" />
-      <workItem from="1684112329391" duration="17047000" />
+      <workItem from="1684112329391" duration="19628000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/operate/controller/Activity.php

@@ -94,7 +94,7 @@ class Activity extends Controller
      */
     protected function _form_filter(&$data)
     {
-        $all_area =      $all_area = ChinaArea::where('level','<=',3)->select();
+        $all_area  = ChinaArea::where('level','<=',3)->select();
         $this->all_area  = make_tree($all_area);
         // 文章列表
         $this->article_list =\app\common\model\ArticleIntro::with('itemChildren')