Merge branch 'cocacola' into dev

@@ -20,14 +20,14 @@ public class RandomUtil {
 	public static String getCharAndNumr(int numLength,int charLength) {
 	public static String getCharAndNumr(int numLength,int charLength) {
         String val = "";
         String val = "";
         Random random = new Random();
         Random random = new Random();
-        for (int i = 0; i < 6; i++) {
+        for (int i = 0; i < numLength; i++) {
             // 输出字母还是数字
             // 输出字母还是数字
             val += String.valueOf(random.nextInt(10));	            
             val += String.valueOf(random.nextInt(10));	            
         }
         }
-        for(int j=0;j<2;j++){
+        for(int j=0;j<charLength;j++){
         	 int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; 
         	 int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; 
              val += (char) (choice + random.nextInt(26));
              val += (char) (choice + random.nextInt(26));
         }
         }
-        return val;
+        return val.toLowerCase();
     }
     }
 }
 }

@@ -33,6 +33,7 @@
 			height: auto;
 			height: auto;
 			overflow: hidden;
 			overflow: hidden;
 			position: relative;
 			position: relative;
+			padding-bottom: 2rem;
 		}
 		}
 		.footer img, .banner img{
 		.footer img, .banner img{
 			width: 100%;
 			width: 100%;
@@ -278,7 +279,7 @@ $('#verification').bind('input propertychange', function(){
 							 clearInterval(time);
 							 clearInterval(time);
 							
 							
 						} else {
 						} else {
-							$('.centent span').eq('0').removeClass('verification-code').html('重新发送(' + (60-num) + ')');
+							$('.centent span').eq('0').removeClass('verification-code').html('重新发送' + (60-num));
 						}
 						}
 					},1000);
 					},1000);
 				} else {
 				} else {