Merge remote-tracking branch 'origin/feature/force-bind2' into release/6.5

@@ -199,9 +199,9 @@ module.exports = class extends global.yoho.BaseModel {
                 formData = [
                     {
                         inputTxt: ischeckMobile ? '输入新的手机号码' : '请输入手机号码',
-                        key: ischeckMobile ? 'mobilevalue2' : 'mobilevalue',
+                        key: 'mobilevalue2',
                         type: 'text',
-                        name: ischeckMobile ? 'mobile2' : 'mobile'
+                        name: 'mobile2'
                     }
                 ];
                 break;

@@ -110,7 +110,7 @@ module.exports = {
             port: '4444' // influxdb port
         },
         console: {
-            level: 'info',
+            level: 'debug',
             colorize: 'all',
             prettyPrint: true
         }

@@ -10,7 +10,7 @@ exports.showBind = function(goLoginCb, goNextCb) {
         content: infoTpl(),
         btns: [{
             id: 'login',
-            btnClass: ['btn-cancel'],
+            btnClass: ['bind-btn-cancel'],
             name: '去登录',
             cb: function() {
                 console.log('login');
@@ -18,7 +18,7 @@ exports.showBind = function(goLoginCb, goNextCb) {
             }
         }, {
             id: 'next',
-            btnClass: ['btn-ok'],
+            btnClass: ['bind-btn-ok'],
             name: '继续',
             cb: function() {
                 console.log('next');
@@ -38,14 +38,14 @@ exports.showBind2 = function(goLoginCb, goNextCb) {
         content: infoTpl2(),
         btns: [{
             id: 'login',
-            btnClass: ['btn-cancel'],
+            btnClass: ['bind-btn-cancel'],
             name: '去登录',
             cb: function() {
                 goLoginCb && goLoginCb();
             }
         }, {
             id: 'next',
-            btnClass: ['btn-ok'],
+            btnClass: ['bind-btn-ok'],
             name: '继续',
             cb: function() {
                 goNextCb && goNextCb();

@@ -26,24 +26,24 @@
         margin-bottom: 43px;
     }
 
-    .btn-cancel {
+    .bind-btn-cancel {
         border-radius: 3px;
         width: 120px;
-        height: 35px;
-        line-height: 35px;
+        height: 35px !important;
+        line-height: 35px !important;
         color: #999;
-        border: solid 1px #999;
+        border: solid 1px #999 !important;
         padding: 0 !important;
     }
 
-    .btn-ok {
+    .bind-btn-ok {
         width: 120px;
-        height: 35px;
+        height: 35px !important;
         color: white;
         background: #444;
         border-radius: 3px;
-        line-height: 35px;
-        border: solid 1px #444;
+        line-height: 35px !important;
+        border: solid 1px #444 !important;
         padding: 0 !important;
         margin-left: 38px !important;
     }