1

.idea/workspace.xml

@@ -4,7 +4,6 @@
     <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/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/UserTrack.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserTrack.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -222,7 +221,7 @@
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
       <workItem from="1665276346161" duration="19728000" />
-      <workItem from="1665362529961" duration="16646000" />
+      <workItem from="1665362529961" duration="16680000" />
     </task>
     <servers />
   </component>

application/api/controller/Mall.php

@@ -219,7 +219,7 @@ class Mall extends Base
         $list = UserTrack::where($sel_where)
             ->alias('t')
             ->field('t.id,t.update_int,t.date,t.first_id goods_id,i.name,i.cover,i.low_price')
-            ->leftJoin('StoreGoods i','t.second_id = i.id')
+            ->leftJoin('StoreGoods i','t.first_id = i.id')
             ->order('update_int desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();