gx

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Aside\Project;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\MinorLanguages;
+use App\Models\WebSetting\WebLanguage;
 
 
 /**
 /**
  * @remark :小语种
  * @remark :小语种
@@ -22,6 +23,13 @@ use App\Models\Project\MinorLanguages;
  */
  */
 class MinorLanguagesController extends BaseController
 class MinorLanguagesController extends BaseController
 {
 {
+    /**
+     * @remark :小语种列表
+     * @name   :getMinorLanguageList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/1 10:35
+     */
     public function getMinorLanguageList(){
     public function getMinorLanguageList(){
         $this->request->validate([
         $this->request->validate([
             'project_id'=>'required',
             'project_id'=>'required',
@@ -29,7 +37,20 @@ class MinorLanguagesController extends BaseController
             'project_id.required' => 'keyword不能为空',
             'project_id.required' => 'keyword不能为空',
         ]);
         ]);
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();
-        $lists = $languageModel->list($this->map,'id',['language','type','keywords','service_day']);
+        $lists = $languageModel->list($this->map,'id',['language','type','keywords','service_day','lang']);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @remark :获取所有的小语种
+     * @name   :getLanguages
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/1 10:11
+     */
+    public function getLanguages(){
+        $webLanguageModel = new WebLanguage();
+        $lists = $webLanguageModel->list($this->map,'id',['short','chinese']);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -90,7 +90,7 @@ class RankDataLogic extends BaseLogic
             foreach($languageList as $lang){
             foreach($languageList as $lang){
                 $remain_day = $lang_data[$lang['language']]['dabiao_day'] ?? 0;
                 $remain_day = $lang_data[$lang['language']]['dabiao_day'] ?? 0;
                 $data['langs'][$lang['language'] ?? ''] = [
                 $data['langs'][$lang['language'] ?? ''] = [
-                    'lang_text' => Translate::getTls($lang['tl'] ?? ''),
+                    'lang_text' => Translate::getTls($lang['language'] ?? ''),
                     'keyword_num' => $lang['keywords'] ?? 0,
                     'keyword_num' => $lang['keywords'] ?? 0,
                     'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,
                     'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,
                     'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0,
                     'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0,
@@ -488,7 +488,6 @@ class RankDataLogic extends BaseLogic
                 }
                 }
             }
             }
         }
         }
-
         $model->project_id = $project_id;
         $model->project_id = $project_id;
         $model->first_num = $first_num;
         $model->first_num = $first_num;
         $model->first_page_num = $first_page_num;
         $model->first_page_num = $first_page_num;

@@ -193,6 +193,7 @@ Route::middleware(['aloginauth'])->group(function () {
 
 
         Route::prefix('language')->group(function () {
         Route::prefix('language')->group(function () {
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
+            Route::any('/getLanguages', [Aside\Project\MinorLanguagesController::class, 'getLanguages'])->name('admin.getLanguages');
         });
         });
         //更新项目tdk
         //更新项目tdk
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');