diff --git a/application/admin/controller/posts/Sites.php b/application/admin/controller/posts/Sites.php index d1906b8d..59cd6080 100644 --- a/application/admin/controller/posts/Sites.php +++ b/application/admin/controller/posts/Sites.php @@ -35,7 +35,7 @@ class Sites extends Backend { //从站点管理登录，进入自己的站点配置页 if(Session::has("user_site_id")) { - $this->redirect('posts/sites/config?addtabs=1'); + $this->redirect('posts/sites/edit?addtabs=1'); } //超级管理员从总后台登录 else { @@ -70,88 +70,6 @@ class Sites extends Backend } } - /** - * Config - */ - public function config() - { - $row = $this->model->get(Session::get("user_site_id")); - - $settings = ['seo' => [ - 'zh-cn' => [ - 'title'=>'', - 'keywords'=>'', - 'description'=>'' - ] - ], 'custom' => '']; - - if($this->request->isPost()){ - - $params = $this->request->post("row/a"); - if ($params) { - foreach ($params as $k => $v) { - if( in_array($k, ['name','domain','lang'])){ - if($k=='lang') - $params[$k] = implode(',', $v); - }else{ - unset($params[$k]); - } - } - $seo = $this->request->post("seo/a"); - $custom = $this->request->post("custom/a"); - if ($seo) { - $settings['seo'] = json_encode($seo, JSON_UNESCAPED_UNICODE); - } - if ($custom) { - $arr = []; - foreach ($custom as $k => $v) { - $arr[$v['field']] = $v['value']; - } - $settings['custom'] = json_encode($arr, JSON_UNESCAPED_UNICODE); - } - if($row) $params['id'] = $row['id']; - try - { - //是否采用模型验证 - if ($this->modelValidate) - { - $name = basename(str_replace('\\', '/', get_class($this->model))); - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : true) : $this->modelValidate; - $this->model->validate($validate); - } - $result = $this->model->allowField(true)->save($params); - - if ($result !== false) - { - $this->model->config()->save($settings); - $this->model->refreshRulesCache(); - $this->success(); - } - else - { - $this->error($this->model->getError()); - } - } - catch (\think\exception\PDOException $e) - { - $this->error($e->getMessage()); - } - } - $this->error(__('Parameter %s can not be empty', '')); - } - - $this->view->assign('row', $row); - - if($row) { - $settings['seo'] = !empty($row->config->seo) ? json_decode($row->config->seo, true) : null; - $settings['custom'] = !empty($row->config->custom) ? json_decode($row->config->custom, true) : null; - } - $this->view->assign('settings', $settings); - $this->view->assign('multilanguage', Seven::build_langs('row[lang]', $row?$row['lang']:'', ['type'=>'checkbox'])); - return $this->view->fetch(); - - } - /** * Add */ @@ -222,13 +140,26 @@ class Sites extends Backend */ public function edit($ids = NULL) { - if(!$this->auth->isSuperAdmin()) { - $this->error(__('You have no permission')); - } + if(!$this->auth->isSuperAdmin()){ + $ids=Session::get("user_site_id"); + } + $row = $this->model->get($ids); if (!$row) $this->error(__('No Results were found')); + $settings = ['seo' => [ + 'zh-cn' => [ + 'title'=>'', + 'keywords'=>'', + 'description'=>'' + ] + ], 'custom' => [ + 'logo' => '', + 'favicon' => '', + ] + ]; + if ($this->request->isPost()) { @@ -252,6 +183,8 @@ class Sites extends Backend } $settings['custom'] = json_encode($arr, JSON_UNESCAPED_UNICODE); } + + if(!$row) $row=$this->model; try { @@ -265,7 +198,7 @@ class Sites extends Backend $result = $row->allowField(true)->save($params); if ($result !== false) { - $row->config()->save($settings); + $row->config->save($settings); $this->model->refreshRulesCache(); $this->success(); } @@ -281,10 +214,10 @@ class Sites extends Backend } $this->error(__('Parameter %s can not be empty', '')); } - $arr['seo'] = !empty($row->config->seo) ? json_decode($row->config->seo,true) : null; - $arr['custom'] = !empty($row->config->custom) ? json_decode($row->config->custom,true) : null; + $row['seo'] = !empty($row->config->seo) ? json_decode($row->config->seo,true) : null; + $row['custom'] = !empty($row->config->custom) ? json_decode($row->config->custom,true) : null; $this->view->assign("row", $row); - $this->view->assign('settings', $arr); + $this->view->assign('editstyle', $this->auth->isSuperAdmin()?'1':'0'); $this->view->assign('multilanguage', Seven::build_langs('row[lang]', $row['lang'], ['type'=>'checkbox'])); return $this->view->fetch(); } diff --git a/application/admin/view/posts/sites/edit.html b/application/admin/view/posts/sites/edit.html index 9f1428bb..a5c24138 100644 --- a/application/admin/view/posts/sites/edit.html +++ b/application/admin/view/posts/sites/edit.html @@ -1,7 +1,18 @@ +
+ {if $editstyle==1}
+ {/if}
+ {if $editstyle!=1} +
+

{:__('Basic')}

+
+ {else /}
+ {/if} + +
@@ -38,6 +58,7 @@ {$multilanguage}
+ {if $editstyle==1}
@@ -49,31 +70,37 @@
+ {/if}
-
+
+ {if $editstyle!=1} +
+

SEO配置

+
+ {/if}
- +
- +
- +
- {foreach name="settings['seo']" item="lang" key="language"} + {foreach name="row['seo']" item="lang" key="language"} {notin name="language" value="zh-cn"}

{:__('Lang')} - {:config('site.multilanguages')[$language]}({$language})

@@ -99,21 +126,41 @@
-
-
-
- 变量名 - 变量值 -
- {foreach name="$settings['custom']" item="vo" key="key"} -
- - - -
- {/foreach} -
{:__('Append')}
-
+
+ {if $editstyle!=1} +
+

自定义变量

+
+ {/if} +
+
+
+
变量名
+
类型
+
变量值
+
+
+ {foreach name="$row['custom']" item="vo" key="key"} +
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+ {/foreach} +
+ {:__('Append')} +
+
@@ -121,7 +168,7 @@
-
+
@@ -151,4 +198,26 @@
+ + \ No newline at end of file diff --git a/public/assets/js/backend/posts/sites.js b/public/assets/js/backend/posts/sites.js index a02b5c39..9ddb1277 100644 --- a/public/assets/js/backend/posts/sites.js +++ b/public/assets/js/backend/posts/sites.js @@ -31,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function {field: 'lang', title: __('Lang'), operate:false}, {field: 'status', title: __('Status'),searchList: {normal: __('Normal'), hidden: __('Hidden')}, formatter: Table.api.formatter.status}, {field: 'createtime', title: __('Createtime'), operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD"', formatter: Table.api.formatter.datetime}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,formatter: Table.api.formatter.operate} ] ] }); @@ -43,14 +43,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function Controller.api.bindevent(); }, edit: function () { - Controller.api.bindevent(); - }, - config: function(){ $.validator.config({ rules: { domain: function(ele){ - _value = $.trim(element.value.toString()); + _value = $.trim(ele.value.toString()); + if(_value==$('#c-domain-old').val()) return ; if (!_value.match(/^[A-Za-z0-9]+$/)) { return __('Please enter a valid URL'); } @@ -75,19 +73,44 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function } } }); + Controller.api.bindevent(); }, api: { bindevent: function () { - $(document).on("click", ".fieldlist .btn-append", function () { - var rel = parseInt($(this).closest("dl").children('dd').length)-2; - $(this).closest("dl").attr("rel", rel); - $('
').insertBefore($(this).parent()); + $(document).on('change', '.ctype',function(){ + if($(this).val()=='') return false; + $tarDiv = $(this).closest('.row').find('.custom-val'); + nodeName = $tarDiv.children(0).attr('name'); + switch($(this).val()){ + case "text": + $tarDiv.html('') + break; + case "file": + + var random = $(this).closest('dd').data('index');// Math.floor(Math.random()*(10000-1+1)+1); + $tarDiv.html('
    '); + Form.api.bindevent($tarDiv); + break; + case "textarea": + $tarDiv.html('') + break; + default: + break; + } + return false; }); - $(document).on("click", ".fieldlist dd .btn-remove", function () { - var that=this; - $(that).parent().remove(); - return; + $(document).on("click", ".varlist .btn-append", function () { + var rel = parseInt($(this).closest("dl").children('dd').length)-2; + var html = Template('appendtpl', {key: rel}); + $tar=$(html).insertBefore($(this).parent()); + Form.api.bindevent($tar); + }); + $(document).on("click", ".varlist dd .btn-remove", function (e) { + e.preventDefault(); + $(this).closest(".form-inline").off(); + $(this).closest(".form-inline").remove(); + return false; }); $(document).on('click', 'input[name*="row[lang]"]', function(e){ @@ -108,6 +131,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function } }); + Form.api.bindevent($("form[role=form]")); } }