init

application/common.php

@@ -587,4 +587,18 @@ function redis(){
 }
 function h5_link($path=''){
     return request()->domain().'/build/#/'.$path;
+}
+function buildUrl($url){
+    $params=input();
+    unset($params['page']);
+
+
+    $urlParams=parse_url($url,PHP_URL_QUERY);
+    parse_str($urlParams,$urlParamsArr);
+    $params=array_merge($urlParamsArr?:[],$params);
+    if(strpos($url,'?')===false){
+        return sprintf("%s?%s",$url,http_build_query($params));
+    }else{
+        return sprintf("%s?%s",explode('?',$url)[0],http_build_query($params));
+    }
 }

application/service/Layui.php

@@ -188,7 +188,7 @@ class Layui extends Paginator{
         if ($page == $this->currentPage()) {
             return $this->getActivePageWrapper($page);
         }
-
+        $url=buildUrl($url);
         return $this->getAvailablePageWrapper($url, $page);
     }
 

application/sub/config.php

@@ -9,4 +9,6 @@ return [
         'list_rows' => 15,
     ],
     'exception_handle'        => '\\app\\sub\\library\\ExceptionHandle',
+    'url_common_param'        => true,
+    'url_html_suffix'        => null,
 ];

application/sub/controller/Mobile.php

@@ -50,4 +50,31 @@ class Mobile extends SubCommon
         Db::commit();
         $this->success();
     }
+    #预占记录
+    public function hold_log(){
+        $data=input();
+        $user=$this->auth->getUser();
+        $this->validate($data,[
+            'id'=>['require','integer'],
+        ]);
+        $mobile=M::where('s_id',$this->auth->id)->findOrFail($data['id']);
+        $list=$mobile->holdLog()->order('id','desc')->with(['holdable'])->paginate(input('limit',15));
+        return view('',compact('list'));
+    }
+    #删除
+    public function delete(){
+        $data=input();
+        $user=$this->auth->getUser();
+        $this->validate($data,[
+            'id'=>['require','array'],
+            'id.0'=>['require','integer'],
+        ]);
+        foreach ($data as $id) {
+            $mobile = M::where('s_id', $this->auth->id)->findOrFail($id);
+            if($mobile) {
+                $mobile->delete();
+            }
+        }
+        $this->success();
+    }
 }

application/sub/view/mobile/hold_log.html

@@ -0,0 +1,47 @@
+{extend name="layout/sub"/}
+{block name='css'}
+<link rel="stylesheet" href="__SUB__/css/news.css" media="all" />
+{/block}
+{block name='body'}
+<div class="layui-form news_list">
+    <table class="layui-table">
+        <thead>
+        <tr>
+            <th width="20">ID</th>
+            <th width="100">用户名</th>
+            <th>状态</th>
+            <th>时间</th>
+        </tr>
+        </thead>
+        <tbody class="news_content">
+        {foreach name="list" item="a"}
+        <tr>
+            <td>{$a.id}</td>
+            <td>{$a.holdable.nickname}</td>
+            <td>{:$a.is_hold?'开启':'关闭'}</td>
+            <td>
+                {:date('Y-m-d H:i:s',$a.create_time)}
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+</div>
+<div id="page">
+    {$list->render()}
+</div>
+{/block}
+{block name='js'}
+
+<script>
+    layui.config({
+        base : "__SUB__/js/"
+    }).use(['form','layer','jquery','laypage'],function(){
+        var form = layui.form(),
+            layer = parent.layer === undefined ? layui.layer : parent.layer,
+            laypage = layui.laypage,
+            $ = layui.jquery;
+    })
+
+</script>
+{/block}

application/sub/view/order/mobile.html

@@ -33,6 +33,7 @@
             <th>底价</th>
             <th>预充</th>
             <th>预占</th>
+            <th>更新时间</th>
             <th>操作</th>
         </tr>
         </thead>
@@ -52,8 +53,12 @@
                 <input type="checkbox" value="{$a.id}" name="is_hold" class="hold-change" lay-filter="holdChange" lay-skin="switch" lay-text="开启|关闭" {$a.is_hold?'checked':''}>
             </td>
             <td>
+                {:date('Y-m-d H:i:s',$a.update_time)}
+            </td>
+            <td>
                 <a class="layui-btn layui-btn-mini news_edit" data-id="{$a.id}"><i class="iconfont icon-edit"></i> 编辑</a>
-                <a class="layui-btn layui-btn-danger layui-btn-mini news_del"><i class="layui-icon">&#xe640;</i> 删除</a>
+                <a class="layui-btn layui-btn-mini hold_log" data-id="{$a.id}"><i class="iconfont icon-weather"></i> 预占记录</a>
+                <a class="layui-btn layui-btn-danger layui-btn-mini news_del" data-id="{$a.id}"><i class="layui-icon">&#xe640;</i> 删除</a>
             </td>
         </tr>
         {/foreach}
@@ -164,6 +169,7 @@
                 }else{
                     layer.close(index)
                     layer.msg('修改成功')
+                    location.reload()
                 }
             })
         })
@@ -181,18 +187,30 @@
             })
         })
 
+        $('.hold_log').click(function () {
+            let id=$(this).data('id')
+            let index = layui.layer.open({
+                title : "预占记录",
+                type : 2,
+                area:['1000px','100%'],
+                content : '{:url("mobile/hold_log")}?id='+id,
+                success : function(layero, index){
+                }
+            })
+        })
+
 
         $("body").on("click",".news_del",function(){  //删除
             var _this = $(this);
             layer.confirm('确定删除此信息？',{icon:3, title:'提示信息'},function(index){
-                //_this.parents("tr").remove();
-                for(var i=0;i<newsData.length;i++){
-                    if(newsData[i].newsId == _this.attr("data-id")){
-                        newsData.splice(i,1);
-                        newsList(newsData);
+                $.post("{:url('mobile/delete')}",{id:[_this.data('id')]},function (res){
+                    if(res.code===1){
+                        layer.msg('删除成功')
+                    }else{
+                        layer.msg(res.msg)
                     }
-                }
-                layer.close(index);
+                    layer.close(index);
+               })
             });
         })
     })