彭俊 6 жил өмнө
parent
commit
d4e61075d3

+ 21 - 20
app/Lib/Biz/Sport/Common.php

@@ -1239,7 +1239,7 @@ class Common
             $bet_time = strtotime($bet_match->ctime);
             //取出所有有危险球的数据
             $warn_more = trim($result_match[0]->warn_more);
-           
+
             //当值为默认值时,表示没有危险球,不用再作判断了
             if ($warn_more == '[{"timei":"1970-1-1 0:0:1","rtype":0}]' || $warn_more == '' || $warn_more == '[]') {
                 return $defdata;
@@ -1250,7 +1250,8 @@ class Common
             foreach ($warn_more as $k => $v) {
                 //获取危险球出现时间 转时间戳
                 $warn_time = strtotime($v['timei']);
-                if (($warn_time - $bet_time) < 90) {
+
+                if (($warn_time - $bet_time) < 90 && ($warn_time - $bet_time) >= 0) {
                     $data = [
                         'code' => -1,
                         'warn_more' => $v
@@ -1279,25 +1280,25 @@ class Common
      * $array 数组
      * 查询字段
      * $value 字段值
-    */ 
-    static function filter_by_value ($array_l, $index, $value){ 
-        $data_json= json_encode($array_l); 
-        $array = json_decode($data_json,true);
-        if(is_array($array) && count($array)>0)  
-        { 
-            foreach(array_keys($array) as $key){ 
-                $temp[$key] = $array[$key][$index]; 
-                 
-                if ($temp[$key] == $value){ 
-
-                    $newarray = $array[$key]; 
-                    return $newarray; 
-
-                } 
-            } 
-        } 
+    */
+    static function filter_by_value($array_l, $index, $value)
+    {
+        $data_json = json_encode($array_l);
+        $array = json_decode($data_json, true);
+        if (is_array($array) && count($array) > 0) {
+            foreach (array_keys($array) as $key) {
+                $temp[$key] = $array[$key][$index];
+
+                if ($temp[$key] == $value) {
+
+                    $newarray = $array[$key];
+                    return $newarray;
+
+                }
+            }
+        }
         return [];
-    } 
+    }
 
 
 }

+ 1 - 1
resources/lang/zh-cn/wagent.php

@@ -18,7 +18,7 @@ return array(
     'star_time' => '时间起',
     'end_time' => '时间止',
     'agent_key_secret' => 'key/secret',
-    'zjrecord_xxrecord' => '资金纪录/线下纪录',
+    'zjrecord_xxrecord' => '资金记录/线下记录',
 
     //代理客户资金纪录
     'datetime' => '时间',

+ 9 - 1
resources/views/admin/Adminroot/view.blade.php

@@ -20,7 +20,7 @@
   <div class="layui-form-item">
     <label class="layui-form-label">* 最大操作金额</label>
     <div class="layui-input-inline">
-    <input type="text" name="max_money"  required  lay-verify="required|number" autocomplete="off"  class="layui-input" value="{{$data['settingmoney']}}">
+    <input type="text" name="max_money"  required  lay-verify="required|number|zhengnumber" autocomplete="off"  class="layui-input" value="{{$data['settingmoney']}}">
     </div>
   </div>
 
@@ -44,6 +44,14 @@
 //Demo
 layui.use(['form'], function(){
   var form = layui.form;
+
+    form.verify({
+        zhengnumber: function (value, item) { //value:表单的值、item:表单的DOM对象
+            if (value < 0) {
+                return "请输入正的数字!";
+            }
+        }
+    });
   
   //监听提交
   form.on('submit(submitForm)', function(data){

+ 3 - 3
resources/views/admin/Priv_code/view.blade.php

@@ -15,7 +15,7 @@
 			             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('priv_code.priv_name') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="priv_name"   id="priv_name"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($priv_code) {{ $priv_code['priv_name'] }} @endisset" class="layui-input">
+                <input type="text" name="priv_name"   id="priv_name"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($priv_code) {{ $priv_code['priv_name'] }} @endisset" class="layui-input" readonly="readonly">
                 </div>
             </div>
 
@@ -28,7 +28,7 @@
 			             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('priv_code.priv_code') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="priv_code"   id="priv_code"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($priv_code) {{ $priv_code['priv_code'] }} @endisset" class="layui-input">
+                <input type="text" name="priv_code"   id="priv_code"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($priv_code) {{ $priv_code['priv_code'] }} @endisset" class="layui-input"  readonly="readonly">
                 </div>
             </div>
 
@@ -41,7 +41,7 @@
 			             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('priv_code.remark') }}:</label>
                 <div class="layui-input-block">
-                <textarea  name="remark"   id="remark"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($priv_code) {{ $priv_code['remark'] }} @endisset </textarea>
+                <textarea  name="remark"   id="remark"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" readonly="readonly" >@isset($priv_code) {{ $priv_code['remark'] }} @endisset </textarea>
                 </div>
             </div>
 

+ 4 - 1
resources/views/admin/systemSet/arictle.blade.php

@@ -23,7 +23,7 @@
                         <label class="layui-form-label">{{ trans('notice.title') }}</label>
                         <div class="layui-input-inline">
                             <input type="text" name="title" id="title" eventType="event-query" value="{{ $title }}"
-                                   lay-verify="required" autocomplete="off"
+                                   lay-verify="" autocomplete="off"
                                    class="layui-input">
                         </div>
                     </div>
@@ -108,6 +108,9 @@
             $('#sub').on('click', function(){
             var title = $('#title').val();
             var type = $('#type').val();
+            $('#layui-form').submit();
+            return ;
+
 
             if((title == '' || title == null) && (type == '' || type == null) )
             {

+ 86 - 60
resources/views/admin/wagent/edit.blade.php

@@ -1,68 +1,94 @@
 @extends('vip.layouts')
 @section('content')
-<form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
-{!! csrf_field() !!}
-  <div class="layui-form-item">
-    <label class="layui-form-label">代理名称</label>
-    <div class="layui-input-block">
-      <input type="text" name="" required  lay-verify="required" placeholder="" autocomplete="off" value="{{ isset($agent_name)?$agent_name:'' }}" class="layui-input" style="width:200px;" readonly="readonly">
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">可用余额</label>
-    <div class="layui-input-block">
-    <input type="text" name=""   lay-verify="" placeholder="" autocomplete="off" class="layui-input" style="width:200px;" value="{{ isset($money)?$money:'' }}" readonly="readonly">
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">操 作:</label>
-        <div class="layui-input-block">
-            <input type="radio" name="type" value="1" title="加款" checked/>
-            <input type="radio" name="type" value="2" title="扣款">
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post"
+          eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">代理名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="" required lay-verify="required" placeholder="" autocomplete="off"
+                       value="{{ isset($agent_name)?$agent_name:'' }}" class="layui-input" style="width:200px;"
+                       readonly="readonly">
+            </div>
         </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">金 额:</label>
-    <div class="layui-input-block">
-    <input type="text" name="upmoney"   lay-verify="" placeholder="请输入金额" autocomplete="off" class="layui-input" style="width:200px;" value="" >
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label">状 态:</label>
-        <div class="layui-input-block">
-            <input type="radio" name="status" value="1" title="正常" @if($status==1) checked @endif >
-            <input type="radio" name="status" value="2" title="禁用" @if($status==2) checked @endif>
-            <input type="radio" name="status" value="3" title="待启用" @if($status==3) checked @endif>
-            <input type="radio" name="status" value="4" title="停用" @if($status==4) checked @endif>
+        <div class="layui-form-item">
+            <label class="layui-form-label">可用余额</label>
+            <div class="layui-input-block">
+                <input type="text" name="" lay-verify="" placeholder="number" autocomplete="off" class="layui-input"
+                       style="width:200px;" value="{{ isset($money)?$money:'' }}" readonly="readonly">
+            </div>
         </div>
-  </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">操 作:</label>
+            <div class="layui-input-block">
+                <input type="radio" name="type" value="1" title="加款" checked/>
+                <input type="radio" name="type" value="2" title="扣款">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">金 额:</label>
+            <div class="layui-input-block">
+                <input type="text" name="upmoney" lay-verify="number|zhengnumber" placeholder="请输入金额" autocomplete="off"
+                       class="layui-input" style="width:200px;" value="">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">状 态:</label>
+            <div class="layui-input-block">
+                <input type="radio" name="status" value="1" title="正常" @if($status==1) checked @endif >
+                <input type="radio" name="status" value="2" title="禁用" @if($status==2) checked @endif>
+                <input type="radio" name="status" value="3" title="待启用" @if($status==3) checked @endif>
+                <input type="radio" name="status" value="4" title="停用" @if($status==4) checked @endif>
+            </div>
+        </div>
+
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script>
+        //Demo
+
+
+
+        layui.use(['form'], function () {
+            var form = layui.form;
+
+            form.verify({
+                zhengnumber: function (value, item) { //value:表单的值、item:表单的DOM对象
+                    if (value < 0) {
+                        return "请输入正的数字!";
+                    }
+                }
+            });
+
+
 
-@if(S('ACTION')!='view')
-  <div class="layui-form-item">
-    <div class="layui-input-block">
-      <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
-      <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-    </div>
-  </div>
-@endif
-</form>
+            form.on('submit(upmoneyfiter)', function (data) {
+                console.log(data);
+                return false;
+                layer.msg(JSON.stringify(data.field));
+                return false;
+            });
 
-<script>
-//Demo
-layui.use(['form'], function(){
-  var form = layui.form;
+            //监听提交
+            form.on('submit(submitForm)', function (data) {
+                return true;
+            });
+        });
 
-  //监听提交
-  form.on('submit(submitForm)', function(data){
-    return true;
-  });
-});
-function cbFormSuccess(data){
-	layer.msg(data.msg);
-	setTimeout(function(){
-		//parent.window.location.reload();
-        window.location.href = "{{url("/admin/wagent/index")}}";
-	},2500);
-}
-</script>
+        function cbFormSuccess(data) {
+            layer.msg(data.msg);
+            setTimeout(function () {
+                //parent.window.location.reload();
+                window.location.href = "{{url("/admin/wagent/index")}}";
+            }, 2500);
+        }
+    </script>
 @endsection

+ 2 - 2
resources/views/admin/wagent/index.blade.php

@@ -33,9 +33,9 @@
     </script>
     
     <script type="text/html" id="zjrecord_xxrecord">
-        <span><a href="/admin/wagent/zjrecord?home_team=@{{ d.agent_name}}">资金录</a></span>
+        <span><a href="/admin/wagent/zjrecord?home_team=@{{ d.agent_name}}">资金录</a></span>
       <br>
-        <span><a href="/admin/wagent/xxrecord?home_team=@{{ d.agent_name}}">线下录</a></span>
+        <span><a href="/admin/wagent/xxrecord?home_team=@{{ d.agent_name}}">线下录</a></span>
     </script>
 
     <script type="text/html" id="status">