Browse Source

部分调整

huwhois 4 years ago
parent
commit
b2430521c2

+ 3 - 3
app/controller/Login.php

@ -21,7 +21,8 @@ class Login extends BaseController
21 21
    {
22 22
        if ($this->request->isPost()) {
23 23
            $param = $this->request->param();
24
24
            // var_dump($param);
25
            // exit;
25 26
            $username = $param['username'];
26 27
            $password = $param['password'];
27 28
            $captcha = $param['captcha'];
@ -30,6 +31,7 @@ class Login extends BaseController
30 31
                $this->error('用户名/密码/验证码不能为空');
31 32
            }
32 33
34
33 35
            if (!captcha_check($captcha)) {
34 36
                $this->error('验证码不正确', '/login');
35 37
            }
@ -39,8 +41,6 @@ class Login extends BaseController
39 41
            if (!$info || md5($password.$info->salt) != $info->password) {
40 42
                $this->error('用户名/密码不正确', '/login');
41 43
            }
42
            // var_dump($param);
43
            // exit;
44 44
            session('uid', $info->id);
45 45
            session('username', $info->username);
46 46
            session('role_id', $info->role_id);

+ 6 - 0
public/static/css/style.css

@ -35,6 +35,12 @@ span {
35 35
    color: #fff;
36 36
}
37 37
38
.header div.top-admin {
39
    float: right;
40
    position: relative;
41
    right: 20px;
42
}
43
38 44
.aside {
39 45
    position: absolute;
40 46
    top: 60px;

+ 1 - 1
view/commission/lists.html

@ -59,7 +59,7 @@
59 59
                    <td>{$val.remark}</td>
60 60
                    <td class="td-manager">
61 61
                        <a href="/order_item/{$val.order_id}">合同明细</a>
62
                        <a href="/commission/save/{$val.id}">修改</a>
62
                        <!-- <a href="/commission/save/{$val.id}">修改</a> -->
63 63
                        <a href="javascript:void(0);" onclick="del('{$val.id}', this)">删除</a>
64 64
                    </td>
65 65
                </tr>

+ 2 - 2
view/company/index.html

@ -48,7 +48,7 @@
48 48
                    <th class="text-center">id</th>
49 49
                    <th class="text-center">公司名称</th>
50 50
                    <th class="text-center">余额初期值</th>
51
                    <th class="text-center">当前余额</th>
51
                    <!-- <th class="text-center">当前余额</th> -->
52 52
                    <th class="text-center">操作</th>
53 53
                </tr>
54 54
            </thead>
@ -61,7 +61,7 @@
61 61
                    <td class="text-center">{$value.id}</td>
62 62
                    <td class="text-center">{$value['name']}</td>
63 63
                    <td class="text-center">{:number_format(bcdiv($value['initial_balance'],100,2),2)}</td>
64
                    <td class="text-center">{:number_format(bcdiv($value['current_balance'],100,2),2)}</td>
64
                    <!-- <td class="text-center">{//:number_format(bcdiv($value['current_balance'],100,2),2)}</td> -->
65 65
                    <td class="text-center">
66 66
                        <a href="/company/save/{$value['id']}">修改</a>
67 67
                        <a href="javascript:void(0);" class="ml-10" onClick="del('{$value.id}', this)">删除</a> 

+ 8 - 30
view/layout.html

@ -28,6 +28,10 @@
28 28
    <header class="header">
29 29
        <img src="/static/images/logo.png" alt="logo" class="logo">
30 30
        <span>北京赛亿科技有限公司</span>
31
        <div class="top-admin">
32
            <a href="{:url('sys_user/modifypwd')}">修改密码</a>
33
            <a href="javascript:void(0);" onClick="logout()">退出</a>
34
        </div>
31 35
    </header>
32 36
    <aside class="aside">
33 37
        <div class="col-md-12 lin-height text_center"><a href="/order">销售订单</a></div>
@ -56,38 +60,12 @@
56 60
            window.document.body.innerHTML = bdhtml;
57 61
        }
58 62
59
        // 修改其他业务费, 历史欠款
60
        function modify(obj) {
61
            var su_id = $(obj).data("su_id")
62
            var seller = $(obj).data("seller");
63
            var other_expenses = $(obj).data("other_expenses");
64
            var overdraft = $(obj).data("overdraft");
65
            $("#su_id").val(su_id);
66
            $("#seller").val(seller);
67
            $("#other_expenses").val(other_expenses);
68
            $("#overdraft").val(overdraft);
69
70
            $("#myModal").modal("show");
63
        function logout() {
64
            if(confirm('确定要退出')){
65
                window.location.href="/login/logout";
66
            }
71 67
        }
72 68
73
        $("#tj").click(function() {
74
            var data = {
75
                "id": Number($("#su_id").val()),
76
                "name": $("#seller").val(),
77
                "month": $("#month").val(),
78
                "other_expenses": Number($("#other_expenses").val()),
79
                "overdraft": Number($("#overdraft").val()),
80
            }
81
            console.log(data);
82
            // return false;
83
            $.post('/dosummary.php', data, function(res) {
84
                if (res.code == 0) {
85
                    window.location.reload();
86
                } else {
87
                    alert(res.msg);
88
                }
89
            }, 'json');
90
        })
91 69
    </script>
92 70
</body>
93 71

+ 1 - 1
view/login/index.html

@ -13,7 +13,7 @@
13 13
	<div class="login_m">
14 14
		<div class="login_logo"><img src="/static/images/logo.png" width="220" height="100"></div>
15 15
		<div class="login_boder">
16
			<form id="login_form" action="login/index" method="POST">
16
			<form id="login_form" action="/login/index" method="POST">
17 17
				<div class="login_padding">
18 18
					<h2>用户名</h2>
19 19
					<label>