Merge remote-tracking branch 'origin/feature/installment' into feature/installment

# Conflicts:
#	apps/home/controllers/installment.js

@@ -42,7 +42,7 @@ const _reviewStatus = (uid, status) => {
 // 还款列表公共处理块
 const _repaymentList = (req, res, next, title, params) => {
     params = _.assign({
-        uid: req.user.uid || 1
+        uid: req.cookies.installmentUid || 1
     }, params);
 
     installmentModel.getQueryAmtList(params).then((result) => {
@@ -58,7 +58,7 @@ const _repaymentList = (req, res, next, title, params) => {
 
 // 开通分期首页
 const index = (req, res, next) => {
-    let uid = req.user.uid || 512579468;
+    let uid = req.cookies.installmentUid || 512579468;
 
     Promise.all([installmentModel.getStauts(uid), installmentModel.getSearchIntallment()]).then((result) => {
 
@@ -121,7 +121,7 @@ const index = (req, res, next) => {
 // 开通结果显示
 const review = (req, res, next) => {
     let openStatus = req.query.status || false;
-    let uid = req.user.uid || 512579468;
+    let uid = req.cookies.installmentUid || 512579468;
     let data = {
         module: 'home',
         page: 'installment',
@@ -181,7 +181,7 @@ const repayRecordPage = (req, res) => {
 // ajax 请求还款记录
 const getRepayRecord = (req, res, next) => {
     let params = _.assign({
-        uid: req.user.uid || 1,
+        uid: req.cookies.installmentUid || 1,
         pageNo: req.query.page || 1
     });
 
@@ -199,7 +199,7 @@ const getRepayRecord = (req, res, next) => {
 
 // 账号管理
 const account = (req, res, next) => {
-    let uid = req.user.uid || 0;
+    let uid = req.cookies.installmentUid || 512579468;
 
     installmentModel.getBankCards(uid).then((result) => {
         res.render('installment/account', {
@@ -222,7 +222,7 @@ const startingService = (req, res) => {
 
 const activateService = (req, res, next) => {
     installmentModel.activateService({
-        uid: req.user.uid || 4,
+        uid: req.cookies.installmentUid || 4,
         userName: req.body.userName,
         identityCardNo: req.body.identityCardNo,
         cardNo: req.body.cardNo,
@@ -237,14 +237,14 @@ const activateService = (req, res, next) => {
 const getBankInfo = (req, res, next) => {
     installmentModel.getBankInfo({
         cardNo: req.query.cardNo,
-        uid: req.user.uid || 512579468 // TODO: fix uid
+        uid: req.cookies.installmentUid || 512579468 // TODO: fix uid
     }).then((result)=> {
         res.json(result);
     }).catch(next);
 };
 
 const verifyCode = (req, res, next) => {
-    installmentModel.sendVerifyCode(req.user.uid || 1, req.query.mobile).then((result)=> {
+    installmentModel.sendVerifyCode(req.cookies.installmentUid || 1, req.query.mobile).then((result)=> {
         res.json(result);
     }).catch(next);
 };
@@ -313,7 +313,7 @@ const orderDetail = (req, res) => {
 // 还款详情
 const repayDetail = (req, res, next) => {
     let params = {
-        uid: req.user.id || 512579468,
+        uid: req.cookies.installmentUid || 512579468,
         rePayNo: req.query.id || '',
         pageNo: 1
     };

@@ -196,17 +196,17 @@ const getStauts = (uid) => {
         method: 'user.instalment.getStatus',
         uid: uid
     }).then((result) => {
-        result = {
-            alg: 'SALT_MD5',
-            code: 200,
-            data: {
-                status: '2',
-                isShow: '1',
-                currCreditLimit: '3125.20'
-            },
-            md5: '6d729d4b35f10fc73531210bd7ecff91',
-            message: 'success'
-        };
+        // result = {
+        //     alg: 'SALT_MD5',
+        //     code: 200,
+        //     data: {
+        //         status: '2',
+        //         isShow: '1',
+        //         currCreditLimit: '3125.20'
+        //     },
+        //     md5: '6d729d4b35f10fc73531210bd7ecff91',
+        //     message: 'success'
+        // };
         if (result && result.code === 200) {
             return result.data.status;
         } else {
@@ -606,21 +606,21 @@ const getBankCards = (uid) => {
     }, {
         cache: true
     }).then((result) => {
-        result = {
-            alg: 'SALT_MD5',
-            code: 200,
-            data: [
-                {
-                    userName: '张三',
-                    cardNo: '25202200000',
-                    bankCode: 'ABC',
-                    bankName: '农业银行',
-                    mobile: '18021200000'
-                }
-            ],
-            md5: '6d729d4b35f10fc73531210bd7ecff91',
-            message: 'success'
-        };
+        // result = {
+        //     alg: 'SALT_MD5',
+        //     code: 200,
+        //     data: [
+        //         {
+        //             userName: '张三',
+        //             cardNo: '25202200000',
+        //             bankCode: 'ABC',
+        //             bankName: '农业银行',
+        //             mobile: '18021200000'
+        //         }
+        //     ],
+        //     md5: '6d729d4b35f10fc73531210bd7ecff91',
+        //     message: 'success'
+        // };
         if (result && result.code === 200) {
             return _processBankCards(result.data);
         } else {

@@ -4,6 +4,8 @@ var $ = require('yoho-jquery'),
 
 var $this, $title;
 
+require('../common');
+
 lazyLoad($('img.lazy'));
 ellipsis.init();
 
@@ -27,3 +29,5 @@ $('.detail-tab span').on('click', function() {
         });
     }
 });
+
+window.setCookie('installmentUid', window.queryString.uid);

@@ -54,8 +54,8 @@ $('.repay-list label').on('click', function() {
         total = totalCancelChecked(index);
 
         if (total === 0) {
-            $currAmt.html(currAmt - amt);
-            $currFee.html(currFee - fee);
+            $currAmt.html((currAmt - amt).toFixed(2));
+            $currFee.html((currFee - fee).toFixed(2));
         } else {
             tip.show('请按时间顺序取消选择，不可以跨期');
             return false;
@@ -64,8 +64,8 @@ $('.repay-list label').on('click', function() {
         total = totalChecked(index);
 
         if (total === index) {
-            $currAmt.html(amt + currAmt);
-            $currFee.html(fee + currFee);
+            $currAmt.html((amt + currAmt).toFixed(2));
+            $currFee.html((fee + currFee).toFixed(2));
         } else {
             tip.show('请按时间顺序添加还款，不可以跨期');
             return false;
@@ -85,8 +85,8 @@ $('.repayment-bottom label').on('click', function() {
 
     if ($(this).prev().is(':checked')) {
         $('.repay-list input').prop('checked', false);
-        $currAmt.html('0');
-        $currFee.html('0');
+        $currAmt.html('0.00');
+        $currFee.html('0.00');
     } else {
         $('.repay-list input').prop('checked', true);
         $('.repay-list li').each(function() {
@@ -94,8 +94,8 @@ $('.repayment-bottom label').on('click', function() {
             totalFee += (+$(this).attr('data-currfee'));
         });
 
-        $currAmt.html(totalAmt);
-        $currFee.html(totalFee);
+        $currAmt.html(totalAmt.toFixed(2));
+        $currFee.html(totalFee.toFixed(2));
     }
 });
 
@@ -114,7 +114,8 @@ $('.repayment-btn').on('click', function() {
     });
 
     $(this).attr('href',
-        path + '?openby:yohobuy={"action":"go.instalmentRepayment","params":{"list":' + list + '}}');
+        path + '?openby:yohobuy={"action":"go.instalmentRepayment","params":{"list":' +
+        encodeURIComponent(JSON.stringify(list)) + ',"amount":' + (+$currAmt.html()) + '}}');
 });
 
 

@@ -5,7 +5,7 @@
         border-bottom: 1px solid #e0e0e0;
 
         .cont {
-            width: 370px;
+            width: 320px;
             overflow: hidden;
             float: left;
             margin-top: 20px;
@@ -53,7 +53,7 @@
 
         label {
             margin-left: 60px;
-            width: 390px;
+            width: 320px;
             height: 120px;
             float: left;
         }