wupengfei 2 年之前
父节点
当前提交
ac26c18058
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      .idea/workspace.xml
  2. 2 2
      application/operate/controller/SupplierGoods.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/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -203,7 +203,7 @@
       <workItem from="1670633686675" duration="15717000" />
       <workItem from="1670719843429" duration="8446000" />
       <workItem from="1670807412269" duration="9728000" />
-      <workItem from="1671065604459" duration="817000" />
+      <workItem from="1671065604459" duration="958000" />
     </task>
     <servers />
   </component>

+ 2 - 2
application/operate/controller/SupplierGoods.php

@@ -133,9 +133,9 @@ class SupplierGoods extends Controller
             ->where(['is_deleted'=>0])->order('id desc')
             ->select()->toArray();
         // 文章列表
-        $this->article_list = \app\common\model\ArticleIntro::with('itemChildren')
+        $this->article_list = []; /*\app\common\model\ArticleIntro::with('itemChildren')
             ->where(['is_deleted'=>0])->order('id desc')
-            ->select()->toArray();
+            ->select()->toArray();*/
         // 资料
         $this->datum_list  = DatumIntro::with('urlArr')
             ->where(['is_deleted'=>0])->order('id desc')