Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -28,10 +28,10 @@ const getTime = (time, a)=> {
  * @returns {number}
  */
 const getDate = (time)=> {
-    if (typeof (time) === "string") {
+    if (typeof (time) === 'string') {
         return new Date(time).getTime() / 1000;
     } else {
-        return new Date(time.getFullYear() + "-" + time.getMonth() + "-" + time.getDate()).getTime() / 1000;
+        return new Date(time.getFullYear() + '-' + time.getMonth() + '-' + time.getDate()).getTime() / 1000;
     }
 };
 
@@ -49,7 +49,7 @@ const index = (req, res, next) => {
 
     currencyModel.getIndexData(uid, page, queryType, beginTime).then(result=> {
         result.list.tabs[queryType].isActive = true;
-        result.list.coinList.forEach(function (x) {
+        result.list.coinList.forEach(function(x) {
             x.date = x.date.replace(/\-/g, '.');
         });
         result.list.selects[selectIndex > 2 ? 2 : selectIndex].isSelected = 'selected';

@@ -18,7 +18,7 @@ const logger = global.yoho.logger;
 const _ = require('lodash');
 
 const payments = {
-    alipay: 2
+    alipay: 33
 };
 
 /**

@@ -41,7 +41,7 @@ module.exports = () => {
                 let password = data.password;
                 let area = data.area;
 
-                return LoginService.signin(area, account, password);
+                return LoginService.signinAsync(area, account, password);
             }).then(result => {
                 if (result.code !== 200) {
                     return Promise.reject(new Error(result.message));

@@ -96,7 +96,7 @@ $(function() {
                 '<td class=\'width-opearte\'><div><span class=\'blue opreation update-address\' data-id=\'' +
                 info.address_id + '\'>修改</span>\n<em class="op-sep">|</em>\n' +
                 '<span class=\'blue opreation del-address\' data-id=\'' + info.address_id + '\'>删除</span>\n' +
-                '<span class=\'btn set-default opreation \' data-id=\'' + info.address_id + '\'>设为默认</span>'+
+                '<span class=\'btn set-default opreation \' data-id=\'' + info.address_id + '\'>设为默认</span>' +
                 '</div></td>';
             html += '</tr>';
             return html;
@@ -268,7 +268,7 @@ $(function() {
                 if (data.code === 200) {
                     $('.current-default').removeClass('current-default').text('设为默认');
                     $(self).addClass('current-default').text('默认地址');
-                    tbody.find('.table-body').eq(0).before('<tr class=\'table-body select-row\'>' + tr.html()+
+                    tbody.find('.table-body').eq(0).before('<tr class=\'table-body select-row\'>' + tr.html() +
                         '</tr>');
                     tr.remove();
                 } else {

@@ -258,6 +258,7 @@
 
             .btn {
                 display: inline-block;
+                width: 100px !important;
             }
         }
     }