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

@@ -5,6 +5,9 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\WebSettingTextLogic;
 use App\Http\Logic\Bside\Setting\WebSettingTextLogic;
 
 
+/**
+ * @name:描文本设置
+ */
 class WebSettingTextController extends BaseController
 class WebSettingTextController extends BaseController
 {
 {
     /**
     /**
@@ -14,9 +17,7 @@ class WebSettingTextController extends BaseController
      * @time   :2023/5/4 11:28
      * @time   :2023/5/4 11:28
      */
      */
     public function lists(WebSettingTextLogic $webSettingTextLogic){
     public function lists(WebSettingTextLogic $webSettingTextLogic){
-        $anchor_text = config('setting.anchor_text');
         $lists = $webSettingTextLogic->setting_text_lists();
         $lists = $webSettingTextLogic->setting_text_lists();
-        $lists['anchor_text'] = $anchor_text;
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
     /**
     /**
@@ -29,4 +30,6 @@ class WebSettingTextController extends BaseController
         $webSettingTextLogic->setting_text_save();
         $webSettingTextLogic->setting_text_save();
         $this->response('success');
         $this->response('success');
     }
     }
+
+
 }
 }

@@ -3,7 +3,9 @@
 namespace App\Http\Logic\Bside\Setting;
 namespace App\Http\Logic\Bside\Setting;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\WebSetting\WebSetting;
 use App\Models\WebSetting\WebSettingText;
 use App\Models\WebSetting\WebSettingText;
+use Illuminate\Support\Facades\DB;
 
 
 class WebSettingTextLogic extends BaseLogic
 class WebSettingTextLogic extends BaseLogic
 {
 {
@@ -23,6 +25,33 @@ class WebSettingTextLogic extends BaseLogic
      */
      */
     public function setting_text_lists(){
     public function setting_text_lists(){
         $lists = $this->model->list(['project_id'=>$this->user['project_id']]);
         $lists = $this->model->list(['project_id'=>$this->user['project_id']]);
+        $web_setting = new WebSetting();
+        $setting_info = $web_setting->read(['project_id'=>$this->user['project_id']],['anchor_setting']);
+        $lists['anchor_info'] = $setting_info;
+        $anchor_text = config('setting.anchor_text');
+        $lists['anchor_text'] = $anchor_text;
         $this->success($lists);
         $this->success($lists);
     }
     }
+
+    /**
+     * @name   :(设置描文本)setting_text_save
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/8 14:39
+     */
+    public function setting_text_save(){
+        DB::beginTransaction();
+        try {
+            //更新描文本设置
+            $web_setting = new WebSetting();
+            $web_setting->edit(['anchor_setting'=>$this->param['anchor_setting']],['project_id'=>$this->user['project_id']]);
+            $this->model->del(['project_id'=>$this->user['project_id']]);
+            $this->model->add($this->param['data']);
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('更新失败');
+        }
+        $this->success();
+    }
 }
 }

@@ -6,12 +6,11 @@ return [
         'is_enable'=>false,
         'is_enable'=>false,
         'num'=>3,
         'num'=>3,
         'text_view'=>[
         'text_view'=>[
-                '单页面',
-                '产品页',
-                '关键词也',
-                '新闻页',
-                '博客页',
+            '单页面'=>1,
+            '产品页'=>2,
+            '关键词也'=>3,
+            '新闻页'=>4,
+            '博客页'=>5,
         ],
         ],
     ],
     ],
-
 ];
 ];

@@ -131,6 +131,11 @@ Route::middleware(['bloginauth'])->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::prefix('text')->group(function () {
+            Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingTextController::class, 'lists'])->name('web_setting_text_lists');
+            Route::any('/save', [\App\Http\Controllers\Bside\Setting\WebSettingTextController::class, 'save'])->name('web_setting_text_save');
+        });
 
 
     });
     });
     //产品
     //产品