Merge branch 'feature-lq-04' into release_preview

new_admincp/applications/zsb/views/nj/login.php

@@ -275,11 +275,16 @@ $phone = getPhone(4);
                                     </div>
                                     <div class="item clearfix">
                                         <div class="item_relative clearfix">
+                            <div class="qrcode_text qr-code-btn" style="float: left">扫码登录</div>
                                             <button type="button" class="submit" id="login_submit">登录</button>
                                             <div id="new_login_btn_none">正在登录</div>
-                                            <a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a class="register" href="<?=GB_BROKER_REG?>" target="_blank">立即注册</a>
                                         </div>
                                     </div>
+                    <div class="item clearfix"
+                         style="width:280px;margin:15px auto 10px auto;border-top:1px solid #d9d9d9;">
+                        <div class="item_relative clearfix" style="width: 130px;margin: 0 auto">
+                            <a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a
+                                class="register" href="<?= GB_BROKER_REG ?>" target="_blank">立即注册</a>
 								</div>
 						</div>