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

@@ -37,6 +37,9 @@ class WebSettingHtmlLogic extends BaseLogic
             $info = $this->param;
             $info = $this->param;
         }else{
         }else{
             $info = $this->model->read(['project_id'=>$this->user['project_id']]);
             $info = $this->model->read(['project_id'=>$this->user['project_id']]);
+            if($info === false){
+                $info = [];
+            }
         }
         }
         return $this->success($info);
         return $this->success($info);
     }
     }

@@ -130,7 +130,6 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::prefix('service')->group(function () {
         Route::prefix('service')->group(function () {
             Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingServiceController::class, 'lists'])->name('web_setting_service_lists');
             Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingServiceController::class, 'lists'])->name('web_setting_service_lists');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingServiceController::class, 'save'])->name('web_setting_service_save');
             Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingServiceController::class, 'save'])->name('web_setting_service_save');
-            Route::any('/del', [\App\Http\Controllers\Bside\Setting\WebSettingServiceController::class, 'del'])->name('web_setting_service_del');
         });
         });
 
 
     });
     });