diff --git a/application/common.php b/application/common.php index a137a7a4804f8752ddfd0c8f7974c47ca029f004..6bc6c422c95e7df79e223bc4d0b2edd893b8e09d 100755 --- a/application/common.php +++ b/application/common.php @@ -2077,7 +2077,16 @@ function ParamsChecked($data, $params) $temp = db($v['checked_data'])->where([$v['key_name']=>$data[$v['key_name']]])->find(); if(!empty($temp)) { - return $v['error_msg']; + // 是否需要排除当前操作数据 + if(isset($v['checked_key'])) + { + if(empty($data[$v['checked_key']]) || (isset($temp[$v['checked_key']]) && $temp[$v['checked_key']] != $data[$v['checked_key']])) + { + return str_replace('{$var}', $data[$v['key_name']], $v['error_msg']); + } + } else { + return $v['error_msg']; + } } break; } diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 838407ab31c8575b65fffca67024a472c94251b7..8a14903b90cd45aaf9c5fd36650184c31fd762d8 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -328,9 +328,18 @@ class Common extends Controller $this->assign('is_header', 1); $this->assign('is_footer', 1); - // 图片host地址 + // 附件host地址 $this->assign('attachment_host', config('shopxo.attachment_host')); + // css/js引入host地址 + $this->assign('public_host', config('shopxo.public_host')); + + // 当前url地址 + $this->assign('my_url', __MY_URL__); + + // 当前http类型 + $this->assign('my_http', __MY_HTTP__); + // seo $this->assign('home_seo_site_title', MyC('home_seo_site_title')); $this->assign('home_seo_site_keywords', MyC('home_seo_site_keywords')); diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html index b98323979e02d17f7756018df9709d6005d4eb60..a20377bae7ce0aa7139c03663232b7b437cfcbd7 100755 --- a/application/index/view/default/public/footer.html +++ b/application/index/view/default/public/footer.html @@ -24,42 +24,42 @@ - - + + - + - - + + - - - - + + + + - + - + - - - + + + - + - + {{if isset($is_load_baidu_map_api) and $is_load_baidu_map_api eq 1}} - + {{/if}} @@ -78,17 +78,17 @@ - - + + {{if !empty($plugins_js)}} - + {{/if}} {{if !empty($module_js)}} - + {{/if}} @@ -107,7 +107,11 @@ {{elseif is_array($hook) /}} {{foreach $hook as $hook_js}} {{if !empty($hook_js) and is_string($hook_js)}} - + {{if substr($hook_js, 0, 4) eq 'http'}} + + {{else /}} + + {{/if}} {{/if}} {{/foreach}} {{/if}} diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html index e63e3724ae577c156c6ace4533c24a8518dd3f28..cc5345c045cd98996558ea952e5178ed07b3ac1d 100755 --- a/application/index/view/default/public/header.html +++ b/application/index/view/default/public/header.html @@ -5,11 +5,11 @@ {{$home_seo_site_title}} - + - - + + @@ -17,19 +17,19 @@ - - - - - + + + + + - - + + {{if !empty($plugins_css)}} - + {{/if}} {{if !empty($module_css)}} - + {{/if}} @@ -40,7 +40,11 @@ {{elseif is_array($hook) /}} {{foreach $hook as $hook_css}} {{if !empty($hook_css) and is_string($hook_css)}} - + {{if substr($hook_css, 0, 4) eq 'http'}} + + {{else /}} + + {{/if}} {{/if}} {{/foreach}} {{/if}} @@ -48,9 +52,9 @@ {{/if}}