<input type="button" id="btn" value="免费获取验证码" />
<script type="text/javascript">
var wait=60;
function time(o) {
        if (wait == 0) {
            o.removeAttribute("disabled");            
            o.value="免费获取验证码";
            wait = 60;
        } else {
            o.setAttribute("disabled", true);
            o.value="重新发送(" + wait + ")";
            wait--;
            setTimeout(function() {
                time(o)
            },
            1000)
        }
    }
document.getElementById("btn").onclick=function(){time(this);}
</script>

function lists($key,$type){
        $where=[];
        $type && $where["rt.type"]=$type;
        return $this->alias("a")
            ->join("user","user.id=a.userid")
            ->join("roomtime rt","rt.id=a.rtid")
            ->join("room ro","rt.type=ro.id")
            ->where($where)
            ->order("a.id desc")->paginate(30,false,["query"=>request()->param()]);
    }

后面补充

拉取远程分支

git checkout -b dev(本地分支名称) origin/dev(远程分支名称)

合并分支

git checkout master

git merge xxx