彭俊 6 жил өмнө
parent
commit
1b1113863d

+ 5 - 2
app/Http/Controllers/Admin/MenuController.php

@@ -57,7 +57,7 @@ class MenuController extends Controller {
 			$model->icon = $req->input('menu_icon');
 			$model->sort = $req->input('menu_sort');
 			$model->parent_id = $req->input('parent_id');
-			$model->target = $req->input('target');
+			$model->target = $req->input('target',0);
 
 			$model->type = $req->input('type');
 			$model->save();
@@ -141,6 +141,7 @@ class MenuController extends Controller {
 		$url = $req->href ? $req->href : '';
 		$type = $req->type ? $req->type : '';
 		$target = $req->target ? $req->target : '';
+
 		$model = \App\Models\NavsModel::offset(($page - 1) * $limit)
 			->limit($limit);
 		if (!empty($field) && !empty($order)) {
@@ -167,6 +168,8 @@ class MenuController extends Controller {
 			}
 		}
 		$data = $model->get();
+
+
 		if (!$data) {
 			return;
 		}
@@ -197,7 +200,7 @@ class MenuController extends Controller {
 		$request['name'] = isset($req->name) ? trim($req->name) : null;
 		$request['href'] = isset($req->href) ? trim($req->href) : null;
 		$request['type'] = isset($req->type) ? trim($req->type) : null;
-		
+
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setLang('menu');
 		$dt->addColsFields('id', array('sort' => false, 'width' => 100));

+ 18 - 6
app/Http/Controllers/Api/SettlementController.php

@@ -14,7 +14,6 @@ use Illuminate\Support\Facades\DB;
 use App\Lib\Biz\Sport\WagentProxy;
 
 
-
 class SettlementController extends Controller
 {
     use RulePlus;
@@ -35,20 +34,33 @@ class SettlementController extends Controller
     public function debug()
     {
 
+
+        return;
+        $datas = DB::table("dc_navs")->select("id", "name", "href", "type")->get();
+        $r = trans('menu');
+        foreach ($datas as $val) {
+            $tname = trim($val->name);
+            if (isset($r[$tname])) {
+                if ($tname != $r[$tname]) {
+                    DB::table("dc_navs")->where("id", $val->id)->update(["name" => $r[$tname]]);
+                }
+            }
+        }
+
+        echo "ok";
+        return;
+
         $match = DB::table('money_buy_match')->where(['batch_id' => '15671599105'])->first();
         $result = DB::table('st_zq_result')->where(['match_id' => '1'])->get();
         $rule = new  ZqRule();
 
         //print_r([$match,$result]);exit ;
 
-        $result = $rule->B($match,$result,[]);
+        $result = $rule->B($match, $result, []);
         print_r($result);
 
 
-        exit ;
-
-
-
+        exit;
 
 
         ///$config = ['name' => 'test1agent', 'key' => 'abcdefg', 'secret' => 'asdfasdfasd', 'domain' => 'http://sports.bocai108.com', 'cachefile' => ''];

+ 2 - 0
resources/views/vip/menu_form.blade.php

@@ -61,6 +61,7 @@
     </div>
   </div>
 
+  <!--
   <div class="layui-form-item">
     <label class="layui-form-label">打开方式</label>
     <div class="layui-input-block">
@@ -77,6 +78,7 @@
     @endif
     </div>
   </div>
+  -->
 
 @if(S('ACTION')!='view')
   <div class="layui-form-item">

+ 67 - 59
resources/views/vip/system_menu.blade.php

@@ -1,14 +1,14 @@
 @extends('vip.layouts')
 @section('content')
     <style>
-        .layui-laydate-range{
+        .layui-laydate-range {
             width: auto;
         }
     </style>
     <!---注单管理-->
-	<script type="text/html" id="menudetail">
-	  <a href="/admin/menu/view?id=@{{d.id}}">@{{ d.name}}</a>
-	</script>
+    <script type="text/html" id="menudetail">
+        <a href="/admin/menu/view?id=@{{d.id}}">@{{ d.name}}</a>
+    </script>
     <div class="layui-row">
 
         <!--<div class="layui-col-xs12 layui-col-sm2 layui-col-md2">
@@ -17,78 +17,86 @@
         </div> -->
         <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
 
-            <form class="layui-form rewrite"  method="get" eventType=eventForm>
+            <form class="layui-form rewrite" method="get" eventType=eventForm>
                 <div class="layui-form-item">
 
                     <div class="layui-inline">
-						<label class="layui-form-label">{{ trans('menu.name') }}</label>
-						<div class="layui-input-inline">
-							<input type="text" name="name" id="name" lay-verify="required" autocomplete="off" eventType="event-query"  value="{{ $name }}" class="layui-input">
-						</div>
+                        <label class="layui-form-label">{{ trans('menu.name') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name" id="name" lay-verify="required" autocomplete="off"
+                                   eventType="event-query" value="{{ $name }}" class="layui-input">
+                        </div>
                     </div>
                     <div class="layui-inline">
-						<label class="layui-form-label">{{ trans('menu.href') }}</label>
-						<div class="layui-input-inline">
-							<input type="text" name="href" id="href" lay-verify="required" eventType="event-query"  value="{{ $href }}" autocomplete="off" class="layui-input">
-						</div>
+                        <label class="layui-form-label">{{ trans('menu.href') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="href" id="href" lay-verify="required" eventType="event-query"
+                                   value="{{ $href }}" autocomplete="off" class="layui-input">
+                        </div>
                     </div>
-                     <!--<input type=text name='href' value="/admin/remittance/index" eventType=event-query />-n->
+
                     <div class="layui-inline">
-						<!--<label class="layui-form-label">{{ trans('menu.parent_id') }}</label>
-						<div class="layui-input-inline">
-							<input type="text" name="parent_id" id="parent_id" lay-verify="required" autocomplete="off" class="layui-input">
-						</div>-->
+                        <label class="layui-form-label">{{ trans('menu.type') }}</label>
+                        <div class="layui-input-inline" style="width: 125px">
+                            <select name="type" id="type" lay-verify="" autocomplete="off" eventType="event-query"
+                                    value="{{ $type }}" class="layui-input">
+                                <option value="">{{ trans('menu.select_menutype') }}</option>
+                                @foreach(trans('status.dc_navs.type') as $k=>$v):
+                                <option value="{{$k}}" @if ($k==$type) selected @endif>{{$v}}</option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                    </div>
+
                     <div class="layui-inline">
-						<label class="layui-form-label">{{ trans('menu.type') }}</label>
-						<div class="layui-input-inline" style="width: 125px">
-							<select name="type"  id="type"  lay-verify="" autocomplete="off" eventType="event-query"  value="{{ $type }}" class="layui-input" >
-								<option value="">{{ trans('menu.select_menutype') }}</option>
-								@foreach(trans('status.dc_navs.type') as $k=>$v):
-									<option value="{{$k}}">{{$v}}</option>
-								@endforeach
-							</select>
-						</div>
-
-				   </div>
-
-					<div class="layui-inline">
-					<a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
-					<a  class="layui-btn   layui-btn-sm  layui-btn-primary reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                    <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-					</div>
-
-                     &nbsp;&nbsp;&nbsp;&nbsp; @if(checkRriv('/admin/menu/add'))<div class="layui-inline"><a href="/admin/menu/add"; class="layui-btn layui-btn-sm" >添加</a></div>@endif
-            @if(checkRriv('/admin/menu/delete'))<div class="layui-inline"><a href="javascript:delWin('/admin/menu/delete?id=');" class="layui-btn layui-btn-sm layui-btn-danger">{{ trans('common.delete') }}</a></div>@endif
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" data-type="reload" eventType="event-query-submit"
+                           style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a class="layui-btn   layui-btn-sm  layui-btn-primary reset" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;">重置</a>
+                        <!--
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                           -->
+                    </div>
+
+                    &nbsp;&nbsp;&nbsp;&nbsp; @if(checkRriv('/admin/menu/add'))
+                        <div class="layui-inline"><a href="/admin/menu/add" ; class="layui-btn layui-btn-sm">添加</a>
+                        </div>@endif
+                    @if(checkRriv('/admin/menu/delete'))
+                        <div class="layui-inline"><a href="javascript:delWin('/admin/menu/delete?id=');"
+                                                     class="layui-btn layui-btn-sm layui-btn-danger">{{ trans('common.delete') }}</a>
+                        </div>@endif
 
                 </div>
-        </form>
-    </div>
+            </form>
+        </div>
     </div>
-@push('dataTableJS')
+    @push('dataTableJS')
 
 
 
-  //重置表单
-  $('.reset').on('click',function(){
-	  $('input').val('');
-	  $('#type').val('');
-	  var type = $(this).data('type');
-	  active[type] ? active[type].call(this) : '';
-  });
+        //重置表单
+        $('.reset').on('click',function(){
+        $('input').val('');
+        $('#type').val('');
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+        });
 
-//刷新表单
-    $('.set').on('click',function(){
-    $('input').val('');
-    $('#type').val('');
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-    });
+        //刷新表单
+        $('.set').on('click',function(){
+        $('input').val('');
+        $('#type').val('');
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+        });
 
-@endpush
+    @endpush
 
-            @include('vip.datatable')
-            <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"  />
-        </div>
+    @include('vip.datatable')
+    <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"/>
+    </div>
 
     </div>
 @endsection