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

@@ -200,4 +200,16 @@ class BaseController extends Controller
         }
         return true;
     }
+
+
+    /**
+     * 是否post请求
+     * @return bool
+     */
+    protected final function isPost()
+    {
+        return \Illuminate\Support\Facades\Request::isMethod('post');
+    }
+
+
 }

@@ -169,6 +169,33 @@ class NavController extends BaseController
     }
 
 
+    /**
+     * @author：dc
+     * @time 2023/5/9 16:14
+     */
+    public function urls(){
+        // todo::需要配合 c端来
+        return $this->success([
+           [
+               'url'    =>  '/',
+               'name'    =>  '首页'
+           ],
+           [
+               'url'    =>  '/list',
+               'name'    =>  '列表'
+           ],
+           [
+               'url'    =>  '/page',
+               'name'    =>  '单页'
+           ],
+           [
+               'url'    =>  'goods',
+               'name'    =>  '商品'
+           ],
+        ]);
+    }
+
+
 
 
 

@@ -2,12 +2,10 @@
 
 namespace App\Http\Controllers\Bside;
 
-use App\Enums\Common\Code;
-use App\Exceptions\BsideGlobalException;
+
 use App\Models\Template\ATemplate;
 use App\Models\Template\BSetting;
-use App\Models\Template\BTemplate;
-use Illuminate\Support\Facades\DB;
+
 
 /**
  * 模板
@@ -46,11 +44,23 @@ class TemplateController extends BaseController
      * @time 2023/5/9 15:19
      */
     public function info(){
+
+        // 保存更新
+        if($this->isPost()){
+            $template_id = intval($this->param['template_id']??0);
+            if($template_id && ATemplate::_bFind($template_id)){
+                BSetting::_save($this->user['project_id'],$template_id);
+            }else{
+                return $this->response('无法使用不存在的模板','B_TEMPLATE_NOTFOUND');
+            }
+        }
+
+
         $conf = BSetting::_get($this->user['project_id']);
 
         $data = ATemplate::_bFind($conf['template_id']);
 
-        $this->success([
+        return $this->success([
             'template_id'    =>  $data['id']??0,
             'name'    =>  $data['name']??'',
             'thumb'    =>  $data['thumb']??'',

@@ -63,6 +63,14 @@ class BCustom extends Base
 
         $model->save();
 
+        // 创建路由标识
+        try {
+            RouteMap::setRoute($model->url,RouteMap::SOURCE_CUSTOM,$model->id,$project_id);
+        }catch (\Throwable $e){
+
+        }
+
+
         return $model->id;
     }
 

@@ -26,6 +26,8 @@ class RouteMap extends Model
     //路由类型
     const SOURCE_BLOG = 'blog';
     const SOURCE_NEWS = 'news';
+    // 自定义界面
+    const SOURCE_CUSTOM = 'custom';
     /**
      * 生成路由标识
      * @param $title

@@ -222,8 +222,8 @@ Route::middleware(['bloginauth'])->group(function () {
 
     // 模板
     Route::prefix('template')->group(function () {
-        Route::get('/', [\App\Http\Controllers\Bside\TemplateController::class, 'index'])->name('template_header_footer');
-        Route::get('/edit', [\App\Http\Controllers\Bside\TemplateController::class, 'edit_html'])->name('template_header_footer_edit');
+        Route::get('/', [\App\Http\Controllers\Bside\TemplateController::class, 'index'])->name('bside_template');
+        Route::any('/use-template', [\App\Http\Controllers\Bside\TemplateController::class, 'info'])->name('bside_template_use');
         Route::post('/edit', [\App\Http\Controllers\Bside\TemplateController::class, 'edit_save'])->name('template_header_footer_edit_save');
         Route::get('/system', [\App\Http\Controllers\Bside\TemplateController::class, 'system_all_html'])->name('template_header_footer_system');
     });
@@ -243,6 +243,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('/create', [\App\Http\Controllers\Bside\NavController::class, 'create'])->name('bside_nav_create');
         Route::post('/update', [\App\Http\Controllers\Bside\NavController::class, 'update'])->name('bside_nav_update');
         Route::delete('/delete', [\App\Http\Controllers\Bside\NavController::class, 'delete'])->name('bside_nav_delete');
+        Route::get('/default-urls', [\App\Http\Controllers\Bside\NavController::class, 'urls'])->name('bside_nav_default_urls');
     });