Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Mobile/View/Ssg/login.html

@@ -229,9 +229,11 @@ var PhoneObj = {
     countDown:function(dom){  
         PhoneObj.codeflag = false; 
         PhoneObj.i = PhoneObj.i - 1;  
-        dom.html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");  
+        $("#getPhoneCode").html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");  
+        $("#forgetGetPhoneCode").html(PhoneObj.i+"秒后重发").css("backgroundColor","#f5f5f5").css("color","#A9A9A9");  
         if (PhoneObj.i == 0) {  
-            dom.html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");  
+            $("#getPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");  
+            $("#forgetGetPhoneCode").html("重新发送").css("backgroundColor","#21B1EB").css("color","#fff");  
             PhoneObj.codeflag = true;  
             PhoneObj.i = 60;  
             return;  
@@ -244,6 +246,8 @@ var PhoneObj = {
     sendPhoneCode:function(phone,fun){
         if(PhoneObj.codeflag){
             if(PhoneObj.checkPhone(phone)){
+                //无需等待网络响应直接倒计时
+                fun()
                 //获取验证码
                 $.ajax({
                     type: 'GET',
@@ -252,14 +256,15 @@ var PhoneObj = {
                     success: function (result) {
                         if (result.status != 1) {
                             alert(result.msg);
-                        } else {
-                            fun()
                         }
+                        //  else {
+                        //     fun()
+                        // }
                     }
                 })
             }
         }else{
-            alert("发送验证码频率过高，请等待"+PhoneObj.i+"秒后再试")
+            // alert("发送验证码频率过高，请等待"+PhoneObj.i+"秒后再试")
         }
     }
 

Data/update.sql

@@ -165,4 +165,10 @@ ADD COLUMN `user_token`  char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT
 -- ----------------------------
 -- 2019-10-17 zyx
 -- ----------------------------
-alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '运营平台 0双平台 1and 2ios 3超级签'
+alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '运营平台 0双平台 1and 2ios 3超级签'
+
+-- ----------------------------
+-- 2019-10-17 zyx
+-- ----------------------------
+ALTER TABLE `tab_test_resource`
+MODIFY COLUMN `user_account`  varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;