diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php
index d13f04ead..b87c112cc 100755
--- a/application/admin/controller/Slide.php
+++ b/application/admin/controller/Slide.php
@@ -53,7 +53,7 @@ class Slide extends Common
         $params = input();
 
         // 分页
-        $number = 10;
+        $number = MyC('admin_page_number', 10, true);
 
         // 条件
         $where = SlideService::SlideListWhere($params);
diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index 39e4c1ddd..bd4ab32fb 100755
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -190,6 +190,7 @@ class User extends Common
                 // 浏览器名称
                 $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户注册', 1));
 
+                $this->assign('referer_url', $this->GetrefererUrl());
                 return $this->fetch();
             } else {
                 $this->assign('msg', '已经登录了，如要注册新账户，请先退出当前账户');
diff --git a/application/index/view/default/user/reg_info.html b/application/index/view/default/user/reg_info.html
index ba1a14de6..101ea8b28 100755
--- a/application/index/view/default/user/reg_info.html
+++ b/application/index/view/default/user/reg_info.html
@@ -14,14 +14,17 @@
 
 <!-- conntent start  -->
 <div class="am-g my-content">
-    <div class="am-u-md-8 am-u-sm-centered">
+    <div class="am-u-md-8 am-u-lg-5 am-u-sm-centered">
         <div class="register-container">
-            {{if MyC('home_user_login_state') eq 1}}
-                <span>已有帐号？</span>
-                <a href="{{:MyUrl('index/user/logininfo')}}">
-                    <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius">立即登录</button>
-                </a>
-            {{/if}}
+            <div class="register-top">
+                {{if MyC('home_user_login_state') eq 1}}
+                    <span>已有帐号？</span>
+                    <a href="{{:MyUrl('index/user/logininfo')}}">
+                        <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius">立即登录</button>
+                    </a>
+                {{/if}}
+            </div>
+
             <div data-am-widget="tabs" class="am-tabs am-tabs-d2">
                 <ul class="am-tabs-nav am-cf">
                     <li class="am-active"><a href="[data-tab-panel-0]">账号注册</a></li>
@@ -31,13 +34,13 @@
                 <div class="am-tabs-bd">
                     <div data-tab-panel-0 class="am-tab-panel am-active">
                         <!-- form start -->
-                        <form class="am-form form-validation" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
-                            <div class="am-form-group am-form-group-refreshing">
+                        <form class="am-form form-validation-username" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>用户名</label>
                                 <input type="text" name="accounts" class="am-radius" id="accounts" placeholder="用户名" data-validation-message="请填写有效的用户名" required />
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>设置登录密码</label>
                                 <div class="am-input-group am-input-group-sm">
                                     <input type="password" name="pwd" class="am-radius" placeholder="设置登录密码" pattern="{{:lang('common_regex_pwd')}}" data-validation-message="密码格式 6~18 个字符之间" required />
@@ -46,22 +49,34 @@
                                     </span>
                                 </div>
                             </div>
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
+                                <label>验证码</label>
+                                <div class="am-input-group am-input-group-sm">
+                                    <input type="number" name="verify" class="am-radius" placeholder="验证码" minlength="6" maxlength="6" data-validation-message="验证码格式 6 位数字" required />
+                                    <span class="am-input-group-btn">
+                                        <span class="am-btn am-btn-default am-radius form-verify">
+                                            <img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="form-verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+                                            <a href="javascript:;" class="form-verify-tips" onClick="document.getElementById('form-verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}#'+Math.random();">更换一张</a>
+                                        </span>
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <input type="hidden" name="type" value="username" />
-                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
+                                <button type="submit" class="am-btn am-btn-primary am-btn-block am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
                             </div>
                         </form>
                         <!-- form end -->
                     </div>
                     <div data-tab-panel-1 class="am-tab-panel ">
                         <!-- form start -->
-                        <form class="am-form form-validation" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
-                            <div class="am-form-group am-form-group-refreshing">
+                        <form class="am-form form-validation-mobile" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>手机号码</label>
                                 <input type="text" name="accounts" class="am-radius" id="accounts" placeholder="手机号码" pattern="{{:lang('common_regex_mobile')}}" data-validation-message="手机号码格式错误" required />
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>验证码</label>
                                 <div class="am-input-group am-input-group-sm">
                                     <input type="number" name="verify" class="am-radius" placeholder="验证码" minlength="6" maxlength="6" data-validation-message="验证码格式 6 位数字" required />
@@ -71,7 +86,7 @@
                                 </div>
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>设置登录密码</label>
                                 <div class="am-input-group am-input-group-sm">
                                     <input type="password" name="pwd" class="am-radius" placeholder="设置登录密码" pattern="{{:lang('common_regex_pwd')}}" data-validation-message="密码格式 6~18 个字符之间" required />
@@ -80,22 +95,22 @@
                                     </span>
                                 </div>
                             </div>
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <input type="hidden" name="type" value="sms" />
-                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
+                                <button type="submit" class="am-btn am-btn-primary am-btn-block am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
                             </div>
                         </form>
                         <!-- form end -->
                     </div>
                     <div data-tab-panel-2 class="am-tab-panel ">
                         <!-- form start -->
-                        <form class="am-form form-validation" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
-                            <div class="am-form-group am-form-group-refreshing">
+                        <form class="am-form form-validation-email" method="post" action="{{:MyUrl('index/user/reg')}}" request-type="ajax-fun" request-value="RegisterSuccessBack">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>电子邮箱</label>
                                 <input type="email" name="accounts" class="am-radius" id="accounts" placeholder="电子邮箱" data-validation-message="电子邮箱格式错误" required />
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>验证码</label>
                                 <div class="am-input-group am-input-group-sm">
                                     <input type="number" name="verify" class="am-radius" placeholder="验证码" minlength="6" maxlength="6" data-validation-message="验证码格式 6 位数字" required />
@@ -105,7 +120,7 @@
                                 </div>
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <label>设置登录密码</label>
                                 <div class="am-input-group am-input-group-sm">
                                     <input type="password" name="pwd" class="am-radius" placeholder="设置登录密码" pattern="{{:lang('common_regex_pwd')}}" data-validation-message="密码格式 6~18 个字符之间" required />
@@ -115,17 +130,39 @@
                                 </div>
                             </div>
 
-                            <div class="am-form-group am-form-group-refreshing">
+                            <div class="am-form-group am-form-group-refreshing business-form-block">
                                 <input type="hidden" name="type" value="email" />
-                                <button type="submit" class="am-btn am-btn-primary am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
+                                <button type="submit" class="am-btn am-btn-primary am-btn-block am-radius am-btn-sm btn-loading-example" data-am-loading="{loadingText: '处理中...'}">注册</button>
                             </div>
                         </form>
                         <!-- form end -->
                     </div>
                 </div>
             </div>
+            
+            <div class="register-bottom am-cf">
+                <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" class="am-fr m-t-5">忘记密码？</a>
+            </div>
 
-            <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" class="am-fr m-t-5">忘记密码？</a>
+            <!-- verify win start -->
+            <div class="am-modal am-modal-no-btn" tabindex="-1" id="verify-win">
+                <div class="am-modal-dialog am-radius">
+                    <div class="am-modal-hd">
+                        <a href="javascript:;" class="am-close am-close-spin" data-am-modal-close>&times;</a>
+                    </div>
+                    <div class="am-modal-bd">
+                        <div class="base">
+                            <input type="text" placeholder="图形验证码" maxlength="6" id="verify-img-value" data-validation-message="请输入有效的图形验证码" class="am-form-field am-radius" />
+                            <div class="am-fl">
+                                <img src="{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}" class="am-radius c-p" id="verify-img" onClick="this.src=this.src+'#'+Math.random();" />
+                                <a href="javascript:;" class="verify-tips" onClick="document.getElementById('verify-img').src='{{:MyUrl('index/user/userverifyentry', ['type'=>'reg'])}}#'+Math.random();">看不清换一张</a>
+                            </div>
+                        </div>
+                        <button type="button" class="am-btn am-btn-secondary am-radius am-btn-sm block m-t-20 btn-loading-example verify-submit-win" data-am-loading="{spinner:'circle-o-notch', loadingText:'发送中...'}" data-win="1">确认</button>
+                    </div>
+                </div>
+            </div>
+            <!-- verify win end -->
         </div>
 
 
@@ -159,4 +196,31 @@
 </div>
 <!-- conntent end  -->
 
-{{include file="public/footer" /}}
\ No newline at end of file
+{{include file="public/footer" /}}
+
+<script type="text/javascript">
+// 注册成功回调
+function RegisterSuccessBack(e)
+{
+    if(e.code == 0)
+    {
+        $.AMUI.progress.done();
+        Prompt(e.msg, 'success');
+
+        // 登录返回html处理
+        if((e.data.body_html || null) != null)
+        {
+            $('body').append(e.data.body_html);
+        }
+
+        setTimeout(function()
+        {
+            window.location.href = '{{$referer_url}}';
+        }, 1500);
+    } else {
+        $('form.form-validation').find('button[type="submit"]').button('reset');
+        $.AMUI.progress.done();
+        Prompt(e.msg);
+    }
+}
+</script>
\ No newline at end of file
diff --git a/public/static/index/default/css/user.reginfo.css b/public/static/index/default/css/user.reginfo.css
index af56b2c4a..b099db6a6 100644
--- a/public/static/index/default/css/user.reginfo.css
+++ b/public/static/index/default/css/user.reginfo.css
@@ -1,5 +1,17 @@
+/**
+ * 中间
+ */
+.my-content {
+    background: #FAFAFA url(http://b2b2c.shopnctest.com/dema/member/templates/default/images/register_bg.png);
+    width: 100%;
+    overflow: hidden;
+    padding-bottom: 50px;
+}
 .register-container, .register-container .am-tabs {
-    margin-top: 20px;
+    margin: 20px 0 0 0;
+}
+.register-container {
+    padding-top: 10px;
 }
 .register-container .am-tabs {
     background: rgba(0,0,0,0.15);
@@ -8,10 +20,60 @@
 .register-container .am-tabs .am-tabs-bd {
     background: #fff;
 }
+.register-container form.am-form .am-form-group {
+    padding: 5px 0 !important;
+}
+.register-container .am-tabs-d2 .am-tabs-nav a {
+    text-decoration: none;
+}
+.register-container .am-tabs-d2 .am-tabs-nav > .am-active a {
+    color: #d2364c;
+}
+.register-container .am-tabs-d2 .am-tabs-nav > .am-active {
+    border-bottom: 2px solid #d2364c;
+}
+.register-container .am-tabs-d2 .am-tabs-nav > .am-active:after {
+    border-bottom-color: #d2364c;
+}
+.register-container .register-bottom {
+    margin-top: 10px;
+}
 
-.my-content {
-    background: #FAFAFA url(http://b2b2c.shopnctest.com/dema/member/templates/default/images/register_bg.png) repeat 50% 50%;
-    width: 100%;
-    height: 680px;
-    overflow: hidden;
-}
\ No newline at end of file
+/**
+ * 表单验证码
+ */
+.register-container form.form-validation-username .form-verify {
+    padding: 0;
+}
+.register-container form.form-validation-username .form-verify img {
+    height: 26px;
+}
+.register-container form.form-validation-username .form-verify a.form-verify-tips {
+    font-size: 12px;
+    text-decoration: none;
+    line-height: 28px;
+    color: #FFF;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr='#7F000000', endColorstr='#7F000000');
+    background: rgba(0,0,0,0.5);
+    text-align: center;
+    display: none;
+    width: 83px;
+    height: 28px;
+    position: absolute;
+    z-index: 1;
+    top: -1px;
+    left: -1px;
+}
+.register-container form.form-validation-username .form-verify:hover a.form-verify-tips {
+    display: block;
+}
+
+/**
+ * 弹窗图片验证码
+ */
+.register-container .verify-submit-win{ margin-top: 20px; display: block; }
+.register-container .reg-switch-tips { font-weight: 100; font-size: 12px; color: #f87689; margin-left: 20px; }
+.register-container #verify-win .am-modal-bd { margin-top: 10px; }
+.register-container #verify-win .am-modal-bd .base { overflow: hidden; }
+.register-container #verify-win .am-modal-bd .base .verify-tips { font-size: 12px; }
+.register-container #verify-img { vertical-align: middle; }
\ No newline at end of file
diff --git a/public/static/index/default/js/user.js b/public/static/index/default/js/user.reginfo.js
similarity index 94%
rename from public/static/index/default/js/user.js
rename to public/static/index/default/js/user.reginfo.js
index d8a9536a8..cd4c2b614 100755
--- a/public/static/index/default/js/user.js
+++ b/public/static/index/default/js/user.reginfo.js
@@ -1,3 +1,8 @@
+// 表单初始化
+FromInit('form.form-validation-username');
+FromInit('form.form-validation-mobile');
+FromInit('form.form-validation-email');
+
 $(function()
 {
 	$verify_win = $('#verify-win');