Commit e59e6cc4 authored by xiabin's avatar xiabin

Merge remote-tracking branch 'origin/dev' into dev

parents 6aac202b c3adc2f6
...@@ -37,11 +37,11 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -37,11 +37,11 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<?php $form = ActiveForm::begin(['id' => 'token-input-form']); ?> <?php $form = ActiveForm::begin(['id' => 'token-input-form']); ?>
<div class="reg-box"> <div class="reg-box">
<div class="phone input-wrapper last-wrapper"> <div class="phone input-wrapper">
<input name="token" type="text" class="" value="<?= $model->token?>" placeholder="请输入6位验证码" required="" autofocus=""> <input name="token" type="text" class="" value="<?= $model->token?>" placeholder="请输入6位验证码" required="" autofocus="">
<span class="tips"><?= $model->getFirstError('token') ?></span> <span class="tips"><?= $model->getFirstError('token') ?></span>
</div> </div>
<div class="password input-wrapper last-wrapper""> <div class="verify-code-box input-wrapper last-wrapper"">
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(),[ <?= $form->field($model, 'verifyCode')->widget(Captcha::className(),[
'template' => "{image}", 'template' => "{image}",
'imageOptions' => ['alt' => '验证码'], 'imageOptions' => ['alt' => '验证码'],
......
...@@ -1026,6 +1026,29 @@ textarea.input-r-control { ...@@ -1026,6 +1026,29 @@ textarea.input-r-control {
border-radius: 100%; border-radius: 100%;
margin-right: 10px; margin-right: 10px;
} }
.v-code-box {
position: relative;
}
.v-code-box button {
position: absolute;
right: 0;
bottom: 5px;
}
.v-code-box .tip-vcode {
position: absolute;
right: 120px;
bottom: 13px;
font-size: 12px;
color: red;
}
.v-code-foot {
text-align: center;
padding: 20px 0 0;
}
.v-code-foot button {
width: 100%;
}
/*user center side menu*/ /*user center side menu*/
......
...@@ -1024,6 +1024,30 @@ textarea.input-r-control { ...@@ -1024,6 +1024,30 @@ textarea.input-r-control {
} }
.v-code-box {
position: relative;
}
.v-code-box button {
position: absolute;
right: 0;
bottom: 5px;
}
.v-code-box .tip-vcode {
position: absolute;
right: 120px;
bottom: 13px;
font-size: 12px;
color: red;
}
.v-code-foot {
text-align: center;
padding: 20px 0 0;
}
.v-code-foot button {
width: 100%;
}
/*user center side menu*/ /*user center side menu*/
.simple-menu li { .simple-menu li {
......
<!DOCTYPE html>
<html>
<head lang="zh-CN">
<title>提示页面</title>
<meta charset="UTF-8">
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/style.css">
<style>
.sus-tips {
position: absolute;
left: 50%;
top: 50%;
margin-top: -105px;
margin-left: -200px;
width: 400px;
padding: 40px;
text-align: center;
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 10px rgba(0,0,0,.05);
}
.sus-tips i {
display: inline-block;
width: 60px;
height: 60px;
font-size: 30px;
text-align: center;
line-height: 60px;
border-radius: 100%;
background-color:#24cf5f ;
color: #fff;
}
.sus-tips p {
padding: 40px 0 0;
color: #24cf5f;
font-size: 14px;
}
</style>
</head>
<body>
<div class="sus-tips">
<i class="glyphicon glyphicon-ok"></i>
<p>绑定成功</p>
</div>
<!-- <div class="danger-tip">
<img src="img/no-connection.gif">
<h3>提示信息</h3>
<p>这里请填写错误原因,不管三七二十一了,就这样写几个字吧!</p>
<button class="btn btn-default">返回</button>
</div>-->
</body>
</html>
\ No newline at end of file
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<h3>结算微信</h3> <h3>结算微信</h3>
<div class="clearfix"> <div class="clearfix">
<div class="band-wx-info pull-left"><img src="img/avatar2.jpg"><span>花园宝宝</span></div> <div class="band-wx-info pull-left"><img src="img/avatar2.jpg"><span>花园宝宝</span></div>
<button class="btn btn-default pull-left">取消绑定</button> <button class="btn btn-default pull-left" data-toggle="modal" data-target="#myModal">取消绑定</button>
</div> </div>
</div> </div>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<!--绑定结算--> <!--绑定结算-->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-sm"> <div class="modal-dialog modal-sm">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -153,6 +153,29 @@ ...@@ -153,6 +153,29 @@
</div> </div>
</div> </div>
</div> </div>
</div>-->
<!--绑定结算-->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="myModalLabel">取消绑定</h4>
</div>
<div class="modal-body">
<div class="v-code-box input-wrapper">
<input type="text" class="input-r-control" placeholder="请输入验证码" required="">
<button class="btn btn-nobg">获取验证码</button>
<span class="tip-vcode">验证码错误</span>
</div>
<div class="v-code-foot">
<button class="btn btn-success">确定</button>
</div>
</div>
</div>
</div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment