admin 7 роки тому
батько
коміт
c011066096

+ 1 - 1
app/Http/Controllers/AdminController.php

@@ -2179,7 +2179,7 @@ EOF;
         $apply = ReferralApply::query()->with(['user'])->where('id', $id)->first();
         if ($apply && $apply->link_logs) {
             $link_logs = explode(',', $apply->link_logs);
-            $list = ReferralLog::query()->with(['user', 'order.goods'])->whereIn('id', $link_logs)->paginate(15);
+            $list = ReferralLog::query()->with(['user', 'order.goods'])->whereIn('id', $link_logs)->paginate(15)->appends($request->except('page'));
         }
 
         $view['info'] = $apply;

+ 8 - 3
app/Http/Controllers/SensitiveWordsController.php

@@ -26,13 +26,18 @@ class SensitiveWordsController extends Controller
     // 添加敏感词
     public function addSensitiveWords(Request $request)
     {
-        $sensitiveWords = SensitiveWords::query()->where('words', trim($request->input('words')))->first();
-        if ($sensitiveWords) {
+        $words = trim($request->input('words'));
+
+        if (empty($words)) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '添加失败:请填写敏感词']);
+        }
+
+        if (SensitiveWords::query()->where('words', $words)->exists()) {
             return Response::json(['status' => 'fail', 'data' => '', 'message' => '添加失败:敏感词已存在']);
         }
 
         $obj = new SensitiveWords();
-        $obj->words = trim(strtolower($request->input('words')));
+        $obj->words = strtolower($words);
         $result = $obj->save();
         if ($result) {
             return Response::json(['status' => 'success', 'data' => '', 'message' => '添加成功']);

+ 1 - 1
resources/views/admin/addUser.blade.php

@@ -223,7 +223,7 @@
                                                 <div class="col-md-8">
                                                     <div class="input-group">
                                                         <input type="text" class="form-control" name="transfer_enable" value="1024" id="transfer_enable" autocomplete="off" required>
-                                                        <span class="input-group-addon">GiB</span>
+                                                        <span class="input-group-addon">GB</span>
                                                     </div>
                                                 </div>
                                             </div>

+ 1 - 1
resources/views/admin/editUser.blade.php

@@ -270,7 +270,7 @@
                                                 <div class="col-md-8">
                                                     <div class="input-group">
                                                         <input type="text" class="form-control" name="transfer_enable" value="{{$user->transfer_enable}}" id="transfer_enable" autocomplete="off" required>
-                                                        <span class="input-group-addon">GiB</span>
+                                                        <span class="input-group-addon">GB</span>
                                                     </div>
                                                 </div>
                                             </div>

+ 0 - 1
resources/views/admin/system.blade.php

@@ -980,7 +980,6 @@
         // 注册的默认标签
         $('#initial_labels_for_user').select2({
             theme: 'bootstrap',
-            placeholder: '设置后则可见相同标签的节点',
             allowClear: true,
             width:'100%'
         }).change(function () {

+ 1 - 1
resources/views/admin/userOnlineIPList.blade.php

@@ -77,7 +77,7 @@
                                             <tr class="odd gradeX">
                                                 <td> {{$user->id}} </td>
                                                 <td> {{$user->username}} </td>
-                                                <td> {{$user->port}} </td>
+                                                <td> <span class="label label-danger"> {{$user->port}} </span> </td>
                                                 <td>
                                                     @if ($user->status > 0)
                                                         <span class="label label-info">正常</span>