Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -8,6 +8,7 @@ use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Models\News\News as NewsModel;
 use App\Models\News\News as NewsModel;
 use App\Models\News\NewsCategory;
 use App\Models\News\NewsCategory;
+use App\Models\Product\Product;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
@@ -316,4 +317,17 @@ class NewsController extends BaseController
         $data = curl_c('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],false);
         $data = curl_c('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],false);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :不分页产品列表
+     * @name   :productNoPage
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/20 11:02
+     */
+    public function newsNoPage(NewsModel $news){
+        $this->map['status'] = $news::STATUS_ONE;
+        $lists = $news->list($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 }
 }

@@ -68,7 +68,20 @@ class ProductController extends BaseController
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
-        return $this->response('success',Code::SUCCESS,$lists);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :不分页产品列表
+     * @name   :productNoPage
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/20 11:02
+     */
+    public function productNoPage(Product $product){
+        $this->map['status'] = $product::STATUS_ON;
+        $lists = $product->list($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     /**
     /**

@@ -12,6 +12,7 @@ namespace App\Http\Logic\Bside\Scoring;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Scoring\RatingQuestion;
 use App\Models\Scoring\RatingQuestion;
 use App\Models\Scoring\ScoringSystem;
 use App\Models\Scoring\ScoringSystem;
+use App\Models\User\User;
 use AWS\CRT\Log;
 use AWS\CRT\Log;
 
 
 class RatingLogic extends BaseLogic
 class RatingLogic extends BaseLogic
@@ -34,7 +35,7 @@ class RatingLogic extends BaseLogic
     public function getRatingRead(){
     public function getRatingRead(){
         $data = [
         $data = [
             'company'=>$this->project['company'],
             'company'=>$this->project['company'],
-            'mobile'=>$this->project['mobile'],
+            'mobile'=>$this->user['mobile'],
             'uptime'=>$this->project['uptime'],
             'uptime'=>$this->project['uptime'],
             'domain'=>$this->user['domain'],
             'domain'=>$this->user['domain'],
             'question'=>$this->model->list(['type'=>$this->param['type']]),
             'question'=>$this->model->list(['type'=>$this->param['type']]),
@@ -43,6 +44,7 @@ class RatingLogic extends BaseLogic
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
+
     /**
     /**
      * @remark :提交统计
      * @remark :提交统计
      * @name   :ratingSave
      * @name   :ratingSave

@@ -82,6 +82,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'categoryTopList'])->name('news_category_categoryTopList');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'categoryTopList'])->name('news_category_categoryTopList');
         //新闻
         //新闻
         Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
         Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
+        Route::any('/newsNoPage', [\App\Http\Controllers\Bside\News\NewsController::class, 'newsNoPage'])->name('news_newsNoPage');
         Route::any('/get_category_list', [\App\Http\Controllers\Bside\News\NewsController::class, 'get_category_list'])->name('news_get_category_list');
         Route::any('/get_category_list', [\App\Http\Controllers\Bside\News\NewsController::class, 'get_category_list'])->name('news_get_category_list');
         Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'save'])->name('news_add');
         Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'save'])->name('news_add');
         Route::any('/edit_seo', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit_seo'])->name('news_edit_seo');
         Route::any('/edit_seo', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit_seo'])->name('news_edit_seo');
@@ -236,6 +237,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('product')->group(function () {
     Route::prefix('product')->group(function () {
         //产品
         //产品
         Route::get('/', [\App\Http\Controllers\Bside\Product\ProductController::class, 'index'])->name('product');
         Route::get('/', [\App\Http\Controllers\Bside\Product\ProductController::class, 'index'])->name('product');
+        Route::get('/productNoPage', [\App\Http\Controllers\Bside\Product\ProductController::class, 'productNoPage'])->name('product_productNoPage');
         Route::get('/info', [\App\Http\Controllers\Bside\Product\ProductController::class, 'info'])->name('product_info');
         Route::get('/info', [\App\Http\Controllers\Bside\Product\ProductController::class, 'info'])->name('product_info');
         Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
         Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');