Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2018-12-20 14:05:53 +08:00
parent 8c2ea9f91a 176472a7a8
commit 78873c7084
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/theme/default/style.css
-4
View File
@@ -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);}
www/theme/default/x.style.css
+4
View File
@@ -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}
xuanxuan/module/chat/ext/model/class/xuanxuan.class.php
+2 -2
View File
@@ -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;
}
xuanxuan/module/entry/ext/control/visit.php
+3
View File
@@ -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;
}