1、解决doc标签bug(零时)

2、手机站点的开关设置
This commit is contained in:
2017-01-01 08:27:49 +08:00
parent ffab826db0
commit c7bdf42447
3 changed files with 6 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ class Fornt extends Base {
//网站主题设置
$themes['mobile'] = config('mobile_themes') ? config('mobile_themes') : 'mobile';
$themes['pc'] = config('pc_themes') ? config('pc_themes') : 'default';
$view_path = $this->isMobile() ? 'template/' . $themes['mobile'] . '/' : 'template/' . $themes['pc'] . '/';
$view_path = ($this->isMobile() && config('open_mobile_site')) ? 'template/' . $themes['mobile'] . '/' : 'template/' . $themes['pc'] . '/';
$module = $this->request->module();
if (!in_array($module, array('index', 'install'))) {
$view_path_pre = $module . '/';

View File

@@ -71,6 +71,9 @@ class Document extends Base{
}
public function extend($name){
if (is_numeric($name)) {
$name = db('Model')->where('id', $name)->value('name');
}
$this->extend_db = db('Document' . ucfirst($name));
$name = strtoupper($name);
//$this->join('__DOCUMENT_' . $name . '__', $this->fk . '=' . $this->pk, 'LEFT');