laiguoran пре 5 година
родитељ
комит
fae53825f6

+ 2 - 2
app/public/js/component/input.js

@@ -15,7 +15,7 @@ Vue.component('input-text', {
     '<div class="form-group" :class="{ required: required }">' +
         '<label>{{ label }}</label>' +
         '<input :type="[ password ? \'password\' : \'text\']" :id="id" :name="name" :value="value" :placeholder="placeholder" ' +
-            ':maxlength="maxlength" :readonly="readonly" :disabled="disabled" class="form-control"/>' +
+            ':maxlength="maxlength" :readonly="readonly" :disabled="disabled" class="form-control form-control-sm"/>' +
     '</div>'
 });
 
@@ -70,4 +70,4 @@ Vue.component('input-dropdown', {
         '</div>' +
         '<div class="col-lg-4"></div>' +
     '</div>'
-});
+});

+ 2 - 2
app/public/js/messages_zh.js

@@ -20,7 +20,7 @@ $.extend($.validator.messages, {
 	number: "请输入有效的数字",
 	digits: "只能输入数字",
 	creditcard: "请输入有效的信用卡号码",
-	equalTo: "你的输入不相同",
+	equalTo: "两次输入的密码不一致",
 	extension: "请输入有效的后缀",
 	maxlength: $.validator.format("最多可以输入 {0} 个字符"),
 	minlength: $.validator.format("最少要输入 {0} 个字符"),
@@ -30,4 +30,4 @@ $.extend($.validator.messages, {
 	min: $.validator.format("请输入不小于 {0} 的数值")
 });
 
-}));
+}));

+ 1 - 0
app/public/js/profile.js

@@ -6,6 +6,7 @@
  * @version
  */
 $(document).ready(function() {
+    autoFlashHeight();
     try {
         if (user !== '') {
             $(".title-bar h2").text(user);

+ 15 - 13
app/view/profile/info.ejs

@@ -7,19 +7,21 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <div class="row m-0">
-                <div class="col-5 my-3">
-                    <!--账号资料-->
-                    <form action="/profile/save" method="post" id="base-form">
-                        <input-text label="账号" value="<%= accountData.account %>" readonly="readonly"></input-text>
-                        <input-text label="姓名" value="<%= accountData.name %>" placeholder="请输入姓名" name="name"></input-text>
-                        <input-text label="单位" value="<%= accountData.company %>" name="company"></input-text>
-                        <input-text label="角色/职称" value="<%= accountData.role %>" name="role"></input-text>
-                        <input-text label="手机" value="<%= accountData.mobile %>" name="mobile" maxlength="11"></input-text>
-                        <input-text label="电话" value="<%= accountData.telephone %>" name="telephone"></input-text>
-                        <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                        <button type="submit" class="btn btn-primary btn-sm" id="base-submit">确认修改</button>
-                    </form>
+            <div class="sjs-height-0">
+                <div class="row m-0">
+                    <div class="col-5 my-3">
+                        <!--账号资料-->
+                        <form action="/profile/save" method="post" id="base-form">
+                            <input-text label="账号" value="<%= accountData.account %>" readonly="readonly"></input-text>
+                            <input-text label="姓名" value="<%= accountData.name %>" placeholder="请输入姓名" name="name"></input-text>
+                            <input-text label="单位" value="<%= accountData.company %>" name="company"></input-text>
+                            <input-text label="角色/职称" value="<%= accountData.role %>" name="role"></input-text>
+                            <input-text label="手机" value="<%= accountData.mobile %>" name="mobile" maxlength="11"></input-text>
+                            <input-text label="电话" value="<%= accountData.telephone %>" name="telephone"></input-text>
+                            <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
+                            <button type="submit" class="btn btn-primary btn-sm" id="base-submit">确认修改</button>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>

+ 16 - 14
app/view/profile/safe.ejs

@@ -7,20 +7,22 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <div class="row m-0">
-                <div class="col-5 my-3">
-                    <!--账号安全-->
-                    <form action="/profile/password" method="post" id="password-form">
-                        <% if(accountData.password !== 'SSO password') { %>
-                        <input-text label="旧密码" password="true" name="password"></input-text>
-                        <input-text label="新密码" password="true" name="new_password" id="new_password"></input-text>
-                        <input-text label="确认新密码" password="true" name="confirm_password"></input-text>
-                        <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                        <button type="submit" class="btn btn-primary btn-sm" id="modify-password">修改密码</button>
-                        <% } else { %>
-                        <p>SSO用户请到<a href="#">此处</a>修改密码</p>
-                        <% } %>
-                    </form>
+            <div class="sjs-height-0">
+                <div class="row m-0">
+                    <div class="col-5 my-3">
+                        <!--账号安全-->
+                        <form action="/profile/password" method="post" id="password-form">
+                            <% if(accountData.password !== 'SSO password') { %>
+                                <input-text label="旧密码" password="true" name="password"></input-text>
+                                <input-text label="新密码" password="true" name="new_password" id="new_password"></input-text>
+                                <input-text label="确认新密码" password="true" name="confirm_password"></input-text>
+                                <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
+                                <button type="submit" class="btn btn-primary btn-sm" id="modify-password">修改密码</button>
+                            <% } else { %>
+                                <p>SSO用户请到<a href="#">此处</a>修改密码</p>
+                            <% } %>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>

+ 2 - 0
app/view/profile/sign.ejs

@@ -7,6 +7,7 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
+            <div class="sjs-height-0">
             <div class="row m-0">
                 <div class="col-5 my-3">
                     <!--账号资料-->
@@ -48,6 +49,7 @@
                     </form>
                 </div>
             </div>
+            </div>
         </div>
     </div>
 </div>

+ 2 - 0
app/view/profile/sms.ejs

@@ -7,6 +7,7 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
+            <div class="sjs-height-0">
             <div class="row m-0">
                 <div class="col-5 my-3">
                     <% if (accountData.auth_mobile !== '') { %>
@@ -67,6 +68,7 @@
                     <% } %>
                 </div>
             </div>
+            </div>
         </div>
     </div>
 </div>