Merge branch 'feature/installment3' into release/5.2

@@ -318,7 +318,7 @@ const bindCard = (req, res) => {
         title: req.query.title || '使用新卡还款',
         title: req.query.title || '使用新卡还款',
         bindCard: {
         bindCard: {
             userName: req.query.name,
             userName: req.query.name,
-            banks: banks
+            banks: banks.join('、')
         },
         },
         isInstallmentPage: true
         isInstallmentPage: true
     });
     });
@@ -642,7 +642,7 @@ const cardDetail = (req, res) => {
     let uid = req.cookies.installmentUid;
     let uid = req.cookies.installmentUid;
     let cardIdNo = req.query.cardIdNo;
     let cardIdNo = req.query.cardIdNo;
 
 
-    installmentModel.getCardDetail(uid, cardIdNo).then(result => {
+    installmentModel.getCardDetail(uid, cardIdNo).then((result) => {
         res.render('installment/card-detail', {
         res.render('installment/card-detail', {
             module: 'home',
             module: 'home',
             page: 'card-detail',
             page: 'card-detail',

@@ -498,7 +498,7 @@ const getCardDetail = (uid, cardIdNo) => {
             return _processCardDetail(result.data);
             return _processCardDetail(result.data);
         } else {
         } else {
             logger.error('get getBankCards data return code is not 200');
             logger.error('get getBankCards data return code is not 200');
-            return '';
+            return Promise.reject(result);
         }
         }
     });
     });
 };
 };

@@ -20,7 +20,6 @@ var installment = {
         self.paramsInit();
         self.paramsInit();
 
 
         $(window).on('mousewheel', false);
         $(window).on('mousewheel', false);
-        self.noticeScroll('.notice', $('.notice').data('time') * 1000);
         ellipsis.init();
         ellipsis.init();
         self.setDetailText();
         self.setDetailText();
 
 
@@ -49,6 +48,7 @@ var installment = {
             self.$tab.eq(0).addClass('on').siblings().removeClass('on');
             self.$tab.eq(0).addClass('on').siblings().removeClass('on');
             self.$installmentCont.hide().eq(0).fadeIn();
             self.$installmentCont.hide().eq(0).fadeIn();
         }
         }
+        self.noticeScroll('.notice', $('.notice').data('time') * 1000);
 
 
         cookie.remove('installmentTab');
         cookie.remove('installmentTab');
 
 

@@ -35,7 +35,7 @@ yoho = {
     /**
     /**
      * 判断是否是 APP
      * 判断是否是 APP
      */
      */
-    isApp: /YohoBuy/i.test(navigator.userAgent || '') || qs.app_version,
+    isApp: /YohoBuy/i.test(navigator.userAgent || '') || qs && qs.app_version,
     isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''),
     isiOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(navigator.userAgent || ''),
     isAndroid: /Android/i.test(navigator.userAgent || ''),
     isAndroid: /Android/i.test(navigator.userAgent || ''),
 
 

@@ -35,11 +35,19 @@
         font-size: 18px;
         font-size: 18px;
     }
     }
 
 
+    .notice-wrap {
+        width: 100%;
+        height: auto;
+        overflow: hidden;
+        position: relative;
+    }
+
     .notice {
     .notice {
         width: 100%;
         width: 100%;
         height: 69px;
         height: 69px;
         border-bottom: 1px solid #efefef;
         border-bottom: 1px solid #efefef;
         padding-right: 0;
         padding-right: 0;
+        position: relative;
 
 
         .swiper-wrapper {
         .swiper-wrapper {
             float: left;
             float: left;

@@ -10,6 +10,7 @@
     box-sizing: border-box;
     box-sizing: border-box;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 }
+
 html,
 html,
 body {
 body {
     width: 100%;
     width: 100%;
@@ -17,11 +18,14 @@ body {
     font-family: helvetica, Arial, "黑体";
     font-family: helvetica, Arial, "黑体";
     line-height: 1.4;
     line-height: 1.4;
 }
 }
+
 .width750 {
 .width750 {
     font-size: 28px;
     font-size: 28px;
+
     .main-wrap {
     .main-wrap {
         max-width: 750px;
         max-width: 750px;
     }
     }
+
     .good-failure {
     .good-failure {
         background-size: 155px !important;
         background-size: 155px !important;
     }
     }
@@ -79,8 +83,8 @@ button {
 
 
 @font-face {
 @font-face {
     font-family: "iconfont";
     font-family: "iconfont";
-    src: resolve('iconfont.eot'); /* IE9 */
-    src: resolve('iconfont.eot?#iefix') format('embedded-opentype'), resolve('iconfont.woff') format('woff'), resolve('iconfont.ttf') format('truetype'), resolve('iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */
+    src: resolve("iconfont.eot"); /* IE9 */
+    src: resolve("iconfont.eot?#iefix") format("embedded-opentype"), resolve("iconfont.woff") format("woff"), resolve("iconfont.ttf") format("truetype"), resolve("iconfont.svg#iconfont") format("svg"); /* iOS 4.1- */
 }
 }
 
 
 .iconfont {
 .iconfont {
@@ -99,7 +103,7 @@ button {
     text-align: center;
     text-align: center;
     padding: 15PX;
     padding: 15PX;
     top: 50%;
     top: 50%;
-    background-color: rgba(0,0,0,.7);
+    background-color: rgba(0, 0, 0, 0.7);
     color: #fff;
     color: #fff;
     font-size: 18PX;
     font-size: 18PX;
     border: none;
     border: none;
@@ -108,15 +112,16 @@ button {
     margin: 0 auto;
     margin: 0 auto;
     left: 50%;
     left: 50%;
     transform: translateX(-50%);
     transform: translateX(-50%);
+    box-sizing: border-box;
 }
 }
 
 
 .order-failure {
 .order-failure {
-    background-image: resolve('common/order-good.jpg');
+    background-image: resolve("common/order-good.jpg");
     background-size: 100%;
     background-size: 100%;
 }
 }
 
 
 .good-failure {
 .good-failure {
-    background-image: resolve('common/order-good.jpg');
+    background-image: resolve("common/order-good.jpg");
     background-position-x: 40%;
     background-position-x: 40%;
     background-size: 132px !important;
     background-size: 132px !important;
 }
 }