diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 15f4dc5578..39d8931ad3 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -15,7 +15,3 @@ /* Finish task #5068*/ .main-table .table{cursor:pointer;} - -.xuanxuan-card{padding-bottom:55px;} -.xuancard-actions{width: 100%;text-align: center; padding: 10px 0;} -.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999; box-shadow: 0 -2px 10px rgba(0,0,0,0.15);} diff --git a/www/theme/default/x.style.css b/www/theme/default/x.style.css index 008679eb9a..f9df141c7a 100644 --- a/www/theme/default/x.style.css +++ b/www/theme/default/x.style.css @@ -5,4 +5,8 @@ body{padding:0px; margin: 0px} #main{padding: 0px;} #main .container{padding: 0px;} #mainMenu{margin-top:0px;} + +.xuanxuan-card{padding-bottom:55px;} +.xuancard-actions{width: 100%;text-align: center; padding: 10px 0;} +.xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999; box-shadow: 0 -2px 10px rgba(0,0,0,0.15);} .cell .histories{min-height:350px} diff --git a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php index 98c7f643bd..1422d76ecb 100644 --- a/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php +++ b/xuanxuan/module/chat/ext/model/class/xuanxuan.class.php @@ -80,11 +80,11 @@ class xuanxuanChat extends chatModel { if($this->config->requestType == 'GET') { - $url = "/index.php?m={$moduleName}&f={$methodName}"; + $url = $this->config->webRoot . "index.php?m={$moduleName}&f={$methodName}"; } else { - $url = "/{$moduleName}-{$methodName}-"; + $url = $this->config->webRoot . "{$moduleName}-{$methodName}-"; } $urls[$url] = $size; } diff --git a/xuanxuan/module/entry/ext/control/visit.php b/xuanxuan/module/entry/ext/control/visit.php index c764303b10..457d124e38 100644 --- a/xuanxuan/module/entry/ext/control/visit.php +++ b/xuanxuan/module/entry/ext/control/visit.php @@ -57,6 +57,9 @@ class entry extends control $user->lastTime = $last; $user->ip = $this->session->clientIP->IP; + $xxInstalled = $user->account . 'installed'; + if(!isset($this->config->xxclient->$xxInstalled)) $this->loadModel('setting')->setItem("system.common.xxclient.{$user->account}installed", '1'); + $this->session->set('user', $user); $this->app->user = $this->session->user; }