1557492053 1 year ago
parent
commit
7dc7cd675a
2 changed files with 4 additions and 4 deletions
  1. 1 1
      addons/cms/library/Service.php
  2. 3 3
      addons/cms/view/default/common/layout.html

+ 1 - 1
addons/cms/library/Service.php

@@ -230,7 +230,7 @@ class Service
             ->select();
         foreach ($fields as $k => $v) {
             //优先取编辑的值,再次取默认值
-            $v->value = isset($values[$v['name']]) ? $values[$v['name']] : (is_null($v['defaultvalue']) ? '' : $v['defaultvalue']);
+            $v->value = $values[$v['name']] ?? (is_null($v['defaultvalue']) ? '' : $v['defaultvalue']);
             $v->rule = str_replace(',', '; ', $v->rule);
             if (in_array($v['type'], ['checkbox', 'lists', 'images'])) {
                 $checked = '';

+ 3 - 3
addons/cms/view/default/common/layout.html

@@ -63,7 +63,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="{cms:config name='cms.indexurl'/}"><img
+                <a class="navbar-brand" href="https://www.xunsoftware.com"><img
                         src="{$Think.config.cms.sitelogo|default='/assets/addons/cms/img/logo.png'|cdnurl}"
                         style="height:100%;" alt=""></a>
             </div>
@@ -182,7 +182,7 @@
                 </div>
                 <div class="bottom_menu_item">
                     <div class="bottom_menu_title">关于我们</div>
-                    <div class="bottom_menu_li"><a href="index.html">首页</a></div>
+                    <div class="bottom_menu_li"><a href="https://www.xunsoftware.com/">首页</a></div>
                     <!-- <div class="bottom_menu_li">关于我们</div> -->
                     <div class="bottom_menu_li toContactMy">联系我们</div>
                     <!-- <div class="bottom_menu_li toCooperation">合作伙伴</div> -->
@@ -212,7 +212,7 @@
                 </div>
                 <div class="bottom_menu_item">
                     <div class="bottom_menu_title">关于我们</div>
-                    <div class="bottom_menu_li"><a href="index.html">首页</a></div>
+                    <div class="bottom_menu_li"><a href="https://www.xunsoftware.com">首页</a></div>
                     <!-- <div class="bottom_menu_li">关于我们</div> -->
                     <div class="bottom_menu_li toContactMy">联系我们</div>
                     <!-- <div class="bottom_menu_li toCooperation">合作伙伴</div> -->