From dad52fd56ca28c8ca7392168af8c8befb21322ba Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Tue, 22 Oct 2019 11:17:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9tab=5Ftest=5Fresource?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BA=8C=E8=BF=9B=E5=88=B6=E6=8E=92=E5=BA=8F=E4=BB=A5?=
 =?UTF-8?q?=E4=BE=BF=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Data/update.sql b/Data/update.sql
index 4723a230e..e5be98314 100644
--- a/Data/update.sql
+++ b/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超级签'
\ No newline at end of file
+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`;
\ No newline at end of file

From 4dba7bcfebf08078d3e50b95ebd62a4ad1718575 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Tue, 22 Oct 2019 11:32:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A5=E9=87=8D?=
 =?UTF-8?q?=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/Ssg/login.html | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Application/Mobile/View/Ssg/login.html b/Application/Mobile/View/Ssg/login.html
index 520c734b3..b5144e536 100644
--- a/Application/Mobile/View/Ssg/login.html
+++ b/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+"秒后再试")
         }
     }