|
|
@@ -24,12 +24,16 @@ class IndexController extends FrontController
|
|
|
$data = RedisDataServer::creatServer()->getData( $key_name, 'json');
|
|
|
if(!$data){
|
|
|
//数据库查找当前数据
|
|
|
- $configs = Config::whereIn('key',['logo','title','tel','email','cn_address','en_address','wx_image','icp','put_on_record','lon','lat'])->pluck('value','key')->toArray();
|
|
|
+ $configs = Config::whereIn('key',['logo','cn_title','en_title','tel','email','cn_address','en_address','wx_image','icp','put_on_record','lon','lat'])->pluck('value','key')->toArray();
|
|
|
//中英文数据分组
|
|
|
$data['cn']['address'] = $configs['cn_address'];
|
|
|
+ $data['cn']['title'] = $configs['cn_title'];
|
|
|
$data['en']['address'] = $configs['en_address'];
|
|
|
+ $data['en']['title'] = $configs['en_title'];
|
|
|
unset($configs['cn_address']);
|
|
|
unset($configs['en_address']);
|
|
|
+ unset($configs['cn_title']);
|
|
|
+ unset($configs['en_title']);
|
|
|
foreach ($configs as $key=>$value){
|
|
|
$data[$key] = $value;
|
|
|
}
|