gx

lyh
app/Http/Controllers/Bside/BCom/CNoticeController.php
--- a/app/Http/Controllers/Bside/BCom/CNoticeController.php
查看文件 @3106afa
+++ b/app/Http/Controllers/Bside/BCom/CNoticeController.php
查看文件 @3106afa
@@ -69,17 +69,17 @@ class CNoticeController extends BaseController
                 $routeMapModel = new RouteMap();
                 $count = $routeMapModel->formatQuery(['project_id'=>$this->user['project_id']])->count();
                 $updateNotifyModel->edit(['status' => 1], ['project_id' => $this->user['project_id'], 'status' => 0]);
-                $this->addProgress($count,$this->param['type']);
+                $this->addProgress($count,$this->param['type'],$this->param['page']);
             }elseif($this->param['page'] == UpdateNotify::PAGE_SINGLE){
                 //更新所有已修改的更新
                 $count = $updateNotifyModel->formatQuery(['project_id' => $this->user['project_id'], 'status' => 0])->count();
                 $updateNotifyModel->edit(['status' => 1], ['project_id' => $this->user['project_id'], 'status' => 0]);
-                $this->addProgress($count,$this->param['type']);
+                $this->addProgress($count,$this->param['type'],$this->param['page']);
             }else{
                 //根据传递的参数更新
                 $count = count($this->param['url']);
                 $extent = json_encode(['url'=>$this->param['url']]);
-                $this->addProgress($count,$this->param['type'],$extent);
+                $this->addProgress($count,$this->param['type'],$this->param['page'],$extent);
             }
         }catch (\Exception $e){
             $this->response('error',Code::USER_ERROR);
@@ -108,7 +108,7 @@ class CNoticeController extends BaseController
                 $count = $routeMapModel->formatQuery(['project_id'=>$this->user['project_id']])->count();
                 $updateNotifyModel->edit(['minor_languages_status' => 1], ['project_id' => $this->user['project_id'], 'minor_languages_status' => 0]);
                 $extent = json_encode(['language'=>$this->param['language']]);
-                $this->addProgress($count,$this->param['type'],$extent);
+                $this->addProgress($count,$this->param['type'],$this->param['page'],$extent);
             }else{
                 $this->request->validate([
                     'url'=>'required',
@@ -120,7 +120,7 @@ class CNoticeController extends BaseController
                 //根据传递的参数更新
                 $count = count($this->param['url']);
                 $extent = json_encode(['url'=>$this->param['url'],'language'=>$this->param['language']]);
-                $this->addProgress($count,$this->param['type'],$extent);
+                $this->addProgress($count,$this->param['type'],$this->param['page'],$extent);
             }
         }catch (\Exception $e){
             $this->response('error',Code::USER_ERROR);
@@ -161,11 +161,12 @@ class CNoticeController extends BaseController
      * @method :post
      * @time   :2023/9/6 17:01
      */
-    public function addProgress($count,$type,$extend = ''){
+    public function addProgress($count,$type,$page,$extend = ''){
         $data = [
             'total_num'=>$count,
             'current_num'=>0,
             'type'=>$type,
+            'page'=>$page,
             'extend'=>$extend,
             'project_id'=>$this->user['project_id'],
             'created_at'=>date('Y-m-d H;i:s')