Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/common/model/Banner.php

@@ -42,5 +42,11 @@ class Banner extends BaseModel
             ->bind(['image_url' => 'preview_url']);
     }
 
+    public function activeInfo(): HasOne
+    {
+        return $this->hasOne('ActiveMain', 'id', 'redirect_url')
+            ->hidden(['update_time']);
+    }
+
    
 }

app/store/controller/Presale.php

@@ -95,7 +95,7 @@ class Presale extends Controller
         // 评论详情
         $model = PreSaleModel::get($id);
         $data = $this->postForm();
-        $data['p_time'] = format_time(time());
+//        $data['p_time'] = format_time(time());
         // 更新记录
         if ($model->save($data)) {
             return $this->renderSuccess('更新成功');
@@ -108,7 +108,7 @@ class Presale extends Controller
      * @param int $id
      * @return Json
      */
-    public function delete(int $id): Json
+    public function del(int $id): Json
     {
         // 店员详情
         $model = PreSaleModel::get($id);

app/store/model/Banner.php

@@ -28,7 +28,7 @@ class Banner extends BannerModel
      */
     public function getList(): \think\Paginator
     {
-        $data = $this->order(['sort' => 'asc', 'create_time' => 'desc'])->paginate();
+        $data = $this->with(['activeInfo'])->order(['sort' => 'asc', 'create_time' => 'desc'])->paginate();
         return self::preload($data, ['image']);
     }