Skip to content

J
Jz-Php
提交 dd6e0ab6 authored 作者: wangkr's avatar wangkr
浏览文件
操作

update

上级 f20e95f4
隐藏空白字符变更
内嵌 并排
正在显示 包含 93 行增加 和 185 行删除
.gitattributes deleted 100755 → 0
浏览文件 @ f20e95f4
config/cache.php merge=ours
config/admin.php merge=ours
config/session.php merge=ours
config/admin.php merge=ours
application/admin/view/staff/role.html
浏览文件 @ dd6e0ab6
...@@ -60,11 +60,7 @@ ...@@ -60,11 +60,7 @@
<script src="dist/js/md5.js"></script> <script src="dist/js/md5.js"></script>
<script src="dist/js/sha1.js"></script> <script src="dist/js/sha1.js"></script>
<script src="dist/js/util.js"></script> <script src="dist/js/util.js"></script>
<<<<<<< HEAD
<!--<script src="dist/js/getUserToken.js"></script>--> <!--<script src="dist/js/getUserToken.js"></script>-->
=======
<!-- <script src="dist/js/getUserToken.js"></script> -->
>>>>>>> test
<script> <script>
layui.use(['laydate','form','upload'], function(){ layui.use(['laydate','form','upload'], function(){
upload = layui.upload; upload = layui.upload;
......
application/em/controller/Invoice.php
浏览文件 @ dd6e0ab6
...@@ -269,6 +269,7 @@ class Invoice extends Base ...@@ -269,6 +269,7 @@ class Invoice extends Base
$settle_amount = 0; $settle_amount = 0;
foreach ($data as $v){ foreach ($data as $v){
$v->settle_amount = $v->settle_amount ?:0; $v->settle_amount = $v->settle_amount ?:0;
$v->payment_amount = is_numeric($v->payment_amount) ? $v->payment_amount : (float)$v->payment_amount;
$payment_amount += $v->payment_amount; $payment_amount += $v->payment_amount;
$settle_amount += $v->settle_amount; $settle_amount += $v->settle_amount;
} }
......
application/em/controller/Region.php 100644 → 100755
浏览文件 @ dd6e0ab6
File mode changed from 100644 to 100755
application/em/model/EmInvoice.php
浏览文件 @ dd6e0ab6
...@@ -51,6 +51,10 @@ class EmInvoice extends Base ...@@ -51,6 +51,10 @@ class EmInvoice extends Base
if($item['payment_balance'] == 0){ if($item['payment_balance'] == 0){
$item['paid_amount'] = $item['payment_amount'] ; $item['paid_amount'] = $item['payment_amount'] ;
} else { } else {
if(!is_numeric($item['payment_amount']) || !is_numeric($item['payment_balance'])){
$item['payment_amount'] = (float)$item['payment_amount'];
$item['payment_balance'] = (float)$item['payment_balance'];
}
$item['paid_amount'] = round($item['payment_amount'] - $item['payment_balance'],3); $item['paid_amount'] = round($item['payment_amount'] - $item['payment_balance'],3);
} }
......
application/em/view/region/region_list.html 100644 → 100755
浏览文件 @ dd6e0ab6
File mode changed from 100644 to 100755
config/admin.php
浏览文件 @ dd6e0ab6
<?php <?php
//配置文件 return
return [ [
//加密串 'passwd_salt'=>'gonn',
'passwd_salt' => 'gonn', 'passwd_init'=>'gonn',
'passwd_init' => 'gonn', 'encrypt_key'=>'INJq4HXEGI',
'encrypt_key' => 'INJq4HXEGI', 'login_pattern'=>'/^\w{2,}@\w+/',
'login_pattern' => '/^\w{2,}@\w+/', //开放模式 'upload_dir'=>'./static/uploads',
//'login_pattern' => '/^\w{2,}@gonn\.com\.cn$', 严格模式 'images_dir'=>'./static/uploads/images',
'upload_dir' => './static/uploads', 'files_dir'=>'./static/uploads/files',
'images_dir' => './static/uploads/images', 'search_area'=>'1',
'files_dir' => './static/uploads/files', 'order_per'=>'ZD',
'search_area' => '1', //1按部门搜索,2全局 'redis_host'=>'192.168.1.222',
'order_per' =>'ZD', 'redis_port'=>'6379',
'redis_host' => '192.168.1.222', 'base_url'=>'http://oa.gonn.com.cn/',
'redis_port' => 6379, ];
'base_url' => 'http://oa.gonn.com.cn/?m=login', \ No newline at end of file
];
config/cache.php
浏览文件 @ dd6e0ab6
<?php <?php
// +---------------------------------------------------------------------- return
// | ThinkPHP [ WE CAN DO IT JUST THINK ] [
// +---------------------------------------------------------------------- 'type'=>'complex',
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. 'default'=>[ 'type' => 'file',
// +---------------------------------------------------------------------- 'expire'=> 0,
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) 'prefix'=> '',
// +---------------------------------------------------------------------- 'path' => '',
// | Author: liu21st <liu21st@gmail.com> ],
// +---------------------------------------------------------------------- 'redis'=>[
'type' => 'redis',
// +---------------------------------------------------------------------- 'host' => '192.168.1.222',
// | 缓存设置 'expire'=> 0,
// +---------------------------------------------------------------------- 'prefix'=> '',
],
];
return [ \ No newline at end of file
// 缓存配置为复合类型
'type' => 'complex',
'default' => [
'type' => 'file',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
// 缓存目录
'path' => '',
],
'redis' => [
'type' => 'redis',
'host' => '192.168.1.222',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
],
// 添加更多的缓存类型设置
];
config/cookie.php
浏览文件 @ dd6e0ab6
<?php <?php
// +---------------------------------------------------------------------- return
// | ThinkPHP [ WE CAN DO IT JUST THINK ] [
// +---------------------------------------------------------------------- 'prefix'=>'',
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. 'expire'=>'1800',
// +---------------------------------------------------------------------- 'path'=>'/',
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) 'domain'=>'.gonn.com.cn',
// +---------------------------------------------------------------------- 'secure'=>'false',
// | Author: liu21st <liu21st@gmail.com> 'httponly'=>'',
// +---------------------------------------------------------------------- 'setcookie'=>'true',
];
// +---------------------------------------------------------------------- \ No newline at end of file
// | Cookie设置
// +----------------------------------------------------------------------
return [
// cookie 名称前缀
'prefix' => '',
// cookie 保存时间
'expire' => 1800,
// cookie 保存路径
'path' => '/',
// cookie 有效域名
'domain' => '.gonn.com.cn',
// cookie 启用安全传输
'secure' => false,
// httponly设置
'httponly' => '',
// 是否使用 setcookie
'setcookie' => true,
];
config/database.php
浏览文件 @ dd6e0ab6
<?php <?php
// +---------------------------------------------------------------------- return
// | ThinkPHP [ WE CAN DO IT JUST THINK ] [
// +---------------------------------------------------------------------- 'type'=>'mysql',
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. 'hostname'=>'192.168.1.214',
// +---------------------------------------------------------------------- 'database'=>'gonn',
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) 'username'=>'gonn',
// +---------------------------------------------------------------------- 'password'=>'gonn.123',
// | Author: liu21st <liu21st@gmail.com> 'hostport'=>'10036',
// +---------------------------------------------------------------------- 'dsn'=>'',
'params'=>[],
return [ 'charset'=>'utf8',
// 数据库类型 'prefix'=>'',
'type' => 'mysql', 'debug'=>'true',
// 服务器地址 'deploy'=>'0',
'hostname' => '192.168.1.214', 'rw_separate'=>'false',
// 数据库名 'master_num'=>'1',
'database' => 'gonn', 'slave_no'=>'',
// 用户名 'read_master'=>'false',
'username' => 'gonn', 'fields_strict'=>'true',
// 密码 'resultset_type'=>'array',
'password' => 'gonn.123', 'auto_timestamp'=>'false',
// 端口 'datetime_format'=>'Y-m-d H:i:s',
'hostport' => '10036', 'sql_explain'=>'false',
'builder'=>'',
// 连接dsn 'query'=>'\\think\\db\\Query',
'dsn' => '', 'break_reconnect'=>'false',
// 数据库连接参数 'break_match_str'=>[],
'params' => [], 'geturl'=>'http://jz.gonn.com.cn/',
// 数据库编码默认采用utf8 ];
'charset' => 'utf8', \ No newline at end of file
// 数据库表前缀
'prefix' => '',
// 数据库调试模式
'debug' => true,
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
'deploy' => 0,
// 数据库读写是否分离 主从式有效
'rw_separate' => false,
// 读写分离后 主服务器数量
'master_num' => 1,
// 指定从服务器序号
'slave_no' => '',
// 自动读取主库数据
'read_master' => false,
// 是否严格检查字段是否存在
'fields_strict' => true,
// 数据集返回类型
'resultset_type' => 'array',
// 自动写入时间戳字段
'auto_timestamp' => false,
// 时间字段取出后的默认时间格式
'datetime_format' => 'Y-m-d H:i:s',
// 是否需要进行SQL性能分析
'sql_explain' => false,
// Builder类
'builder' => '',
// Query类
'query' => '\\think\\db\\Query',
// 是否需要断线重连
'break_reconnect' => false,
// 断线标识字符串
'break_match_str' => [],
'geturl'=>'http://jz.gonn.com.cn/',
];
config/session.php
浏览文件 @ dd6e0ab6
<?php <?php
// +---------------------------------------------------------------------- return
// | ThinkPHP [ WE CAN DO IT JUST THINK ] [
// +---------------------------------------------------------------------- 'type'=>'redis',
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved. 'prefix'=>'',
// +---------------------------------------------------------------------- 'auto_start'=>'true',
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 ) 'host'=>'192.168.1.222',
// +---------------------------------------------------------------------- 'port'=>'6379',
// | Author: liu21st <liu21st@gmail.com> ];
// +---------------------------------------------------------------------- \ No newline at end of file
// +----------------------------------------------------------------------
// | 会话设置
// +----------------------------------------------------------------------
return [
'type' => 'redis',
'prefix' => '',
'auto_start' => true,
// redis主机
'host' => '192.168.1.222',
// redis端口
'port' => 6379,
];
public/dist/js/getUserToken.js
浏览文件 @ dd6e0ab6
...@@ -2,7 +2,7 @@ let userIdLocal = document.cookie.split('user=')[1]?(document.cookie.split('user ...@@ -2,7 +2,7 @@ let userIdLocal = document.cookie.split('user=')[1]?(document.cookie.split('user
let temp = sessionStorage.getItem('userIdLocal')?sessionStorage.getItem('userIdLocal'):'' let temp = sessionStorage.getItem('userIdLocal')?sessionStorage.getItem('userIdLocal'):''
if(userIdLocal == '') top.location.href="http://oa-test.gonn.tech/"; if(userIdLocal == '') top.location.href="http://oa.gonn.com.cn/";
if ( temp != userIdLocal || !sessionStorage.getItem('userToken')){ if ( temp != userIdLocal || !sessionStorage.getItem('userToken')){
sessionStorage.setItem("userIdLocal", userIdLocal) sessionStorage.setItem("userIdLocal", userIdLocal)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论