Merge branch 'feature/installment3' into release/5.2

@@ -18,7 +18,7 @@ const _serverCrash = (res, params) => {
 // 还款列表公共处理块
 // 还款列表公共处理块
 const _repaymentList = (req, res, opt, params) => {
 const _repaymentList = (req, res, opt, params) => {
     params = _.assign({
     params = _.assign({
-        uid: req.cookies.installmentUid || 1
+        uid: req.cookies.installmentUid
     }, params);
     }, params);
 
 
     installmentModel.getQueryAmtList(params).then((result) => {
     installmentModel.getQueryAmtList(params).then((result) => {
@@ -262,7 +262,7 @@ const repayRecordPage = (req, res) => {
 // ajax 请求还款记录
 // ajax 请求还款记录
 const getRepayRecord = (req, res) => {
 const getRepayRecord = (req, res) => {
     let params = _.assign({
     let params = _.assign({
-        uid: req.cookies.installmentUid || 1,
+        uid: req.cookies.installmentUid,
         pageNo: req.query.page || 1
         pageNo: req.query.page || 1
     });
     });
 
 
@@ -358,7 +358,7 @@ function getRealIP(req) {
 const activateService = (req, res) => {
 const activateService = (req, res) => {
 
 
     installmentModel.activateService({
     installmentModel.activateService({
-        uid: req.cookies.installmentUid || 532892,
+        uid: req.cookies.installmentUid,
         userName: req.body.userName,
         userName: req.body.userName,
         identityCardNo: req.body.identityCardNo,
         identityCardNo: req.body.identityCardNo,
         cardNo: req.body.cardNo,
         cardNo: req.body.cardNo,
@@ -382,7 +382,7 @@ const activateService = (req, res) => {
 const getBankInfo = (req, res) => {
 const getBankInfo = (req, res) => {
     installmentModel.getBankInfo({
     installmentModel.getBankInfo({
         cardNo: req.query.cardNo,
         cardNo: req.query.cardNo,
-        uid: req.cookies.installmentUid || 512579468 // TODO: fix uid
+        uid: req.cookies.installmentUid
     }).then((result)=> {
     }).then((result)=> {
         res.json(result);
         res.json(result);
     }).catch(() => {
     }).catch(() => {
@@ -415,7 +415,7 @@ const orderIndex = (req, res) => {
 
 
 const orderList = (req, res) => {
 const orderList = (req, res) => {
     const params = {
     const params = {
-        uid: req.cookies.installmentUid || 8041876, // TODO: fix me
+        uid: req.cookies.installmentUid,
         type: req.query.type || 1,
         type: req.query.type || 1,
         page: req.query.page || 1,
         page: req.query.page || 1,
         limit: req.query.limit || 10
         limit: req.query.limit || 10
@@ -451,7 +451,7 @@ const orderList = (req, res) => {
 
 
 const orderDetail = (req, res) => {
 const orderDetail = (req, res) => {
     const params = {
     const params = {
-        uid: req.cookies.installmentUid || 8041876, // TODO: fix me
+        uid: req.cookies.installmentUid,
         orderCode: req.params.id
         orderCode: req.params.id
     };
     };
 
 
@@ -545,7 +545,7 @@ const orderDetail = (req, res) => {
 // 还款详情
 // 还款详情
 const repayDetail = (req, res) => {
 const repayDetail = (req, res) => {
     let params = {
     let params = {
-        uid: req.cookies.installmentUid || 512579468,
+        uid: req.cookies.installmentUid,
         rePayNo: req.query.id || '',
         rePayNo: req.query.id || '',
         pageNo: 1
         pageNo: 1
     };
     };
@@ -607,7 +607,7 @@ const serverCrash = (req, res) => {
 
 
 // 银行卡列表
 // 银行卡列表
 const bankCard = (req, res) => {
 const bankCard = (req, res) => {
-    let uid = req.cookies.installmentUid || 512579468;
+    let uid = req.cookies.installmentUid;
 
 
     installmentModel.getBankCards(uid).then((result) => {
     installmentModel.getBankCards(uid).then((result) => {
         res.render('installment/bank-card', {
         res.render('installment/bank-card', {
@@ -628,7 +628,6 @@ const bankCard = (req, res) => {
 
 
 // 银行卡详情
 // 银行卡详情
 const cardDetail = (req, res) => {
 const cardDetail = (req, res) => {
-
     installmentModel.getCardDetail(req.cookies.installmentUid, req.query.cardIdNo).then(result => {
     installmentModel.getCardDetail(req.cookies.installmentUid, req.query.cardIdNo).then(result => {
         res.render('installment/card-detail', {
         res.render('installment/card-detail', {
             module: 'home',
             module: 'home',

@@ -166,8 +166,8 @@ const _processBankCards = (list) => {
 const _processCardDetail = (list) => {
 const _processCardDetail = (list) => {
     list = list || {};
     list = list || {};
 
 
-    list.isMaster = +list.masterType;
-    list.cardNo = list.cardNo.replace(/\*/g, '');
+    list.isMaster = list.masterType === '1' ? true : false;
+    list.cardNo = list.cardNo ? list.cardNo.replace(/\*/g, '') : list.cardNo;
 
 
     return list;
     return list;
 };
 };
@@ -526,7 +526,8 @@ const setMasterCard = (params) => {
 const getNotices = () => {
 const getNotices = () => {
     return api.get('', {
     return api.get('', {
         method: 'app.resources.getNotices',
         method: 'app.resources.getNotices',
-        position: 8
+        position: 8,
+        client_type: 'iphone'
     }, {
     }, {
         cache: true
         cache: true
     }).then((res) => {
     }).then((res) => {

@@ -419,14 +419,14 @@
 
 
     .group-list {
     .group-list {
         background: #fff;
         background: #fff;
-        margin-top: 30px;
+        margin-top: 25px;
         border-top: 1px solid #e1e1e1;
         border-top: 1px solid #e1e1e1;
         border-bottom: 1px solid #e1e1e1;
         border-bottom: 1px solid #e1e1e1;
         padding-left: 26px;
         padding-left: 26px;
 
 
         li {
         li {
-            height: 88px;
-            line-height: 88px;
+            height: 80px;
+            line-height: 80px;
             border-bottom: 1px solid #e1e1e1;
             border-bottom: 1px solid #e1e1e1;
             font-size: 28px;
             font-size: 28px;
             overflow: hidden;
             overflow: hidden;
@@ -456,7 +456,7 @@
         display: none;
         display: none;
 
 
         .banner-center {
         .banner-center {
-            margin: 30px auto;
+            margin-top: 25px;
             height: 210px;
             height: 210px;
 
 
             .banner-list {
             .banner-list {