Merge branch 'release/security' into gray

@@ -191,7 +191,7 @@ const getBrandViewList = (channel, start, length) => {
                     switch (ssubValue.type * 1) {
                         case 1:
                             extQs = {
-                                query: ssubValue.brand_domain,
+                                query: ssubValue.brand_name,
                                 brand: ssubValue.id
                             };
                             ssubValue.brand_domain = 'search';

@@ -3,7 +3,7 @@
         {{> back/cover}}
         <div class="content">
             <h2 class="title3">重置登录密码</h2>
-            <p class="title-tip">您的账号密码过于简单请重置登录密码</p>
+            <p class="title-tip">系统检测到您的账号安全性较低，请重置登录密码</p>
             <form>
                 <ul>
                     <li class="input-container-li po-re">
@@ -39,7 +39,7 @@
                     </li>
                     <li class="input-container-li clearfix">
                         <div class="waak-repwd-tip">
-                            <span class="hide">由字母、数字组合，不能包含特殊字符</span>
+                            <span class="hide">必须由字母、数字组合，不能包含特殊字符</span>
                         </div>
                     </li>
                     <li class="input-container-li clearfix">