wupengfei 2 年之前
父節點
當前提交
c82390e63f
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Mall.php
  3. 1 0
      application/common/model/UserTrack.php

+ 2 - 1
.idea/workspace.xml

@@ -4,6 +4,7 @@
     <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" />
@@ -221,7 +222,7 @@
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
       <workItem from="1665276346161" duration="19728000" />
-      <workItem from="1665362529961" duration="16507000" />
+      <workItem from="1665362529961" duration="16646000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/api/controller/Mall.php

@@ -218,7 +218,7 @@ class Mall extends Base
         if($title)  $sel_where[]  = ['i.name','like','%'.$title.'%'];
         $list = UserTrack::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.update_int,t.first_id goods_id,i.name,i.cover,i.low_price')
+            ->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')
             ->order('update_int desc')
             ->limit($this->off_set,$this->page_num)

+ 1 - 0
application/common/model/UserTrack.php

@@ -21,6 +21,7 @@ class UserTrack extends Model
             'year'=>date("Y"),
             'month'=>date("m"),
             'day'=>date("d"),
+            'date' => date('Y-m-d')
         ],'user_id',['user_id'=>$user_id,'type'=>$type,'first_id'=>$first_id,'second_id'=>$second_id]);
     }