Skip to content

Commit 7687898

Browse files
author
zhangjiangbin
committed
修正页面错误
1 parent 659155e commit 7687898

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

‎app/Http/Controllers/UserController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ public function makeInvite(Request $request)
404404
$obj = new Invite();
405405
$obj->uid = $user['id'];
406406
$obj->fuid = 0;
407-
$obj->code = strtoupper(mb_substr(md5(microtime() . $this->makeRandStr(6)), 8, 16));
407+
$obj->code = strtoupper(mb_substr(md5(microtime() . $this->makeRandStr(6)), 8, 12));
408408
$obj->status = 0;
409409
$obj->dateline = date('Y-m-d H:i:s', strtotime("+7 days"));
410410
$obj->save();

‎resources/views/admin/layouts.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<span class="arrow"></span>
149149
</a>
150150
<ul class="sub-menu">
151-
<li class="nav-item {{in_array(Request::path(), ['admin/articleList']) ? 'active open' : ''}}">
151+
<li class="nav-item {{in_array(Request::path(), ['admin/articleList', 'admin/addArticle', 'admin/editArticle']) ? 'active open' : ''}}">
152152
<a href="{{url('admin/articleList')}}" class="nav-link ">
153153
<i class="icon-list"></i>
154154
<span class="title">文章列表</span>
@@ -189,20 +189,20 @@
189189
</li>
190190
</ul>
191191
</li>
192-
<li class="nav-item {{in_array(Request::path(), ['admin/nodeList', 'admin/addNode', 'admin/editNode', 'admin/groupList', 'admin/addGroup', 'admin/editGroup']) ? 'active open' : ''}}">
192+
<li class="nav-item {{in_array(Request::path(), ['admin/nodeList', 'admin/addNode', 'admin/editNode', 'admin/groupList', 'admin/addGroup', 'admin/editGroup', 'admin/nodeMonitor']) ? 'active open' : ''}}">
193193
<a href="javascript:;" class="nav-link nav-toggle">
194194
<i class="icon-layers"></i>
195195
<span class="title">节点管理</span>
196196
<span class="arrow"></span>
197197
</a>
198198
<ul class="sub-menu">
199-
<li class="nav-item {{in_array(Request::path(), ['admin/nodeList']) ? 'active open' : ''}}">
199+
<li class="nav-item {{in_array(Request::path(), ['admin/nodeList', 'admin/addNode', 'admin/editNode', 'admin/nodeMonitor']) ? 'active open' : ''}}">
200200
<a href="{{url('admin/nodeList')}}" class="nav-link ">
201201
<i class="icon-list"></i>
202202
<span class="title">节点列表</span>
203203
</a>
204204
</li>
205-
<li class="nav-item {{in_array(Request::path(), ['admin/groupList']) ? 'active open' : ''}}">
205+
<li class="nav-item {{in_array(Request::path(), ['admin/groupList', 'admin/addGroup', 'admin/editGroup']) ? 'active open' : ''}}">
206206
<a href="{{url('admin/groupList')}}" class="nav-link ">
207207
<i class="icon-grid"></i>
208208
<span class="title">节点分组</span>

‎resources/views/admin/nodeList.blade.php‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,20 @@
7676
@if($node->compatible) <span class="label label-info">兼</span> @endif
7777
@if($node->single) <span class="label label-danger">单</span> @endif
7878
</td>
79-
<td> <span class="label label-info"> {{$node->protocol}} </span> </td>
80-
<td> <span class="label label-info"> {{$node->obfs}} </span> </td>
79+
<td>
80+
@if($node->single)
81+
<span class="label label-info"> {{$node->single_protocol}} </span>
82+
@else
83+
<span class="label label-info"> {{$node->protocol}} </span>
84+
@endif
85+
</td>
86+
<td>
87+
@if($node->single)
88+
<span class="label label-info"> {{$node->single_obfs}} </span>
89+
@else
90+
<span class="label label-info"> {{$node->obfs}} </span>
91+
@endif
92+
</td>
8193
<td>
8294
<button type="button" class="btn btn-sm blue btn-outline" onclick="editNode('{{$node->id}}')">
8395
<i class="fa fa-pencil"></i>

‎resources/views/ticket/replyTicket.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<div class="timeline-item">
5353
<div class="timeline-badge">
5454
@if ($reply->user->is_admin)
55-
<img class="timeline-badge-userpic" src="/assets/images/avatar.jpg">
55+
<img class="timeline-badge-userpic" src="/assets/images/avatar.png">
5656
@else
5757
<div class="timeline-icon">
5858
<i class="icon-user font-green-haze"></i>

‎sql/db.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ INSERT INTO `ss_config` VALUES ('32', 'tls1.2_ticket_auth', '3', '1', '0', '2017
237237
INSERT INTO `ss_config` VALUES ('33', 'tls1.2_ticket_fastauth', '3', '0', '0', '2017-08-01 14:02:19', '2017-08-01 14:02:19');
238238
INSERT INTO `ss_config` VALUES ('34', 'auth_chain_c', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
239239
INSERT INTO `ss_config` VALUES ('35', 'auth_chain_d', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
240-
INSERT INTO `ss_config` VALUES ('36', 'auth_chain_f', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
240+
INSERT INTO `ss_config` VALUES ('36', 'auth_chain_e', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
241+
INSERT INTO `ss_config` VALUES ('37', 'auth_chain_f', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
241242

242243

243244
-- ----------------------------

‎sql/update/20171219.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-- 兼容SSRR
22
INSERT INTO `ss_config` VALUES ('34', 'auth_chain_c', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
33
INSERT INTO `ss_config` VALUES ('35', 'auth_chain_d', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
4-
INSERT INTO `ss_config` VALUES ('36', 'auth_chain_f', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
4+
INSERT INTO `ss_config` VALUES ('36', 'auth_chain_e', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');
5+
INSERT INTO `ss_config` VALUES ('37', 'auth_chain_f', '2', '0', '0', '2017-08-01 14:02:31', '2017-08-01 14:02:31');

0 commit comments

Comments
 (0)