Authored by 郭成尧

text-change

@@ -89,10 +89,10 @@ module.exports = function(useInRegister, useForBind, useForRelate) { @@ -89,10 +89,10 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
89 89
90 itime = setInterval(function() { 90 itime = setInterval(function() {
91 if (count === 0) { 91 if (count === 0) {
92 - $captchaTip.text('重新发送').removeClass('disable'); 92 + $captchaTip.text('重新获取').removeClass('disable');
93 clearInterval(itime); 93 clearInterval(itime);
94 } else { 94 } else {
95 - $captchaTip.text('重新发送 (' + count-- + '秒)'); 95 + $captchaTip.text('重新获取 (' + count-- + '秒)');
96 window.setCookie('count', count); 96 window.setCookie('count', count);
97 97
98 if (during && parseInt(during, 10) !== 0) { 98 if (during && parseInt(during, 10) !== 0) {
@@ -112,7 +112,7 @@ module.exports = function(useInRegister, useForBind, useForRelate) { @@ -112,7 +112,7 @@ module.exports = function(useInRegister, useForBind, useForRelate) {
112 } 112 }
113 }); 113 });
114 114
115 - // 重新发送验证码 115 + // 重新获取验证码
116 $captchaTip.on('touchstart', function() { 116 $captchaTip.on('touchstart', function() {
117 if ($captchaTip.hasClass('disable')) { 117 if ($captchaTip.hasClass('disable')) {
118 return; 118 return;
@@ -76,10 +76,10 @@ class RegisterNew { @@ -76,10 +76,10 @@ class RegisterNew {
76 76
77 itime = setInterval(() => { 77 itime = setInterval(() => {
78 if (count === 0) { 78 if (count === 0) {
79 - this.view.getVerifyCodeBtn.text('重新发送').addClass('active'); 79 + this.view.getVerifyCodeBtn.text('重新获取').addClass('active');
80 clearInterval(itime); 80 clearInterval(itime);
81 } else { 81 } else {
82 - this.view.getVerifyCodeBtn.text('重新发送 (' + count-- + '秒)'); 82 + this.view.getVerifyCodeBtn.text('重新获取 (' + count-- + '秒)');
83 window.setCookie('count', count); 83 window.setCookie('count', count);
84 84
85 if (during && parseInt(during, 10) !== 0) { 85 if (during && parseInt(during, 10) !== 0) {
@@ -84,7 +84,7 @@ page = { @@ -84,7 +84,7 @@ page = {
84 } 84 }
85 85
86 $resendBtn.prop('disabled', true); 86 $resendBtn.prop('disabled', true);
87 - $resendBtn.text('重新发送(' + second + ')'); 87 + $resendBtn.text('重新获取(' + second + ')');
88 this.timerId = setInterval(function() { 88 this.timerId = setInterval(function() {
89 let txt = self.resendText; 89 let txt = self.resendText;
90 90
@@ -95,7 +95,7 @@ page = { @@ -95,7 +95,7 @@ page = {
95 self.timerId = null; 95 self.timerId = null;
96 $resendBtn.prop('disabled', false); 96 $resendBtn.prop('disabled', false);
97 } else { 97 } else {
98 - txt = '重新发送(' + second + '秒)'; 98 + txt = '重新获取(' + second + '秒)';
99 } 99 }
100 100
101 $resendBtn.text(txt); 101 $resendBtn.text(txt);
@@ -75,10 +75,10 @@ class SmsLoginNew extends Page { @@ -75,10 +75,10 @@ class SmsLoginNew extends Page {
75 75
76 itime = setInterval(() => { 76 itime = setInterval(() => {
77 if (count === 0) { 77 if (count === 0) {
78 - this.selector.getVerifyCodeBtn.text('重新发送').addClass('active'); 78 + this.selector.getVerifyCodeBtn.text('重新获取').addClass('active');
79 clearInterval(itime); 79 clearInterval(itime);
80 } else { 80 } else {
81 - this.selector.getVerifyCodeBtn.text('重新发送 (' + count-- + '秒)'); 81 + this.selector.getVerifyCodeBtn.text('重新获取 (' + count-- + '秒)');
82 window.setCookie('count', count); 82 window.setCookie('count', count);
83 83
84 if (during && parseInt(during, 10) !== 0) { 84 if (during && parseInt(during, 10) !== 0) {
@@ -190,7 +190,7 @@ $disable-gray: #b0b0b0; @@ -190,7 +190,7 @@ $disable-gray: #b0b0b0;
190 .third-party-login { 190 .third-party-login {
191 @extend padding-75; 191 @extend padding-75;
192 192
193 - margin-top: 236px; 193 + margin-top: 130px;
194 text-align: center; 194 text-align: center;
195 195
196 > .tip-box { 196 > .tip-box {
@@ -228,7 +228,7 @@ $disable-gray: #b0b0b0; @@ -228,7 +228,7 @@ $disable-gray: #b0b0b0;
228 .third-party-login { 228 .third-party-login {
229 @extend padding-75; 229 @extend padding-75;
230 230
231 - margin-top: 236px; 231 + margin-top: 130px;
232 text-align: center; 232 text-align: center;
233 233
234 > .tip-box { 234 > .tip-box {