Merge branch 'feature/vip2' into 'release/6.6'

Feature/vip2



See merge request !1370

@@ -110,7 +110,14 @@ function droitHtml(contents) {
             item.content = {
                 banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/0100d72b57f8c364e69cdfeb708b5d852a.jpg${imageView2}`,
                 intros: [
-                    {title: 'Dear:', data: ['近期将针对有货的VIP会员推出专享升级礼包服务，等级提升后即可领取，服务即将开启请随时关注最新APP会员权益动态！']},
+                    { title: '特权介绍', data: ['会员专享升级礼包，具体以实际领取为准。'] },
+                    { title: '领取说明', data: [
+                            '升级礼包在升级当日7天内可领取，领取后优惠券有效期7天。',
+                            '升级礼包可在会员中心-我的礼包页面领取。',
+                            '每个等级的礼包365天仅限领取一次。',
+                            '若在上述时间段内未领取，将无法补发升级礼包。'
+                        ]
+                    }
                 ]
             };
         } else if (item.displayName === '优享客服') {

@@ -280,7 +280,7 @@ const payAli = (req, res, next) => {
 
     // 支付宝支付校验
     if (!verifyResult.payResult) {
-        return res.render('pay/pay-failure', responseFailure);
+        return res.render('pay/pay-failure', _.assign(responseData, responseFailure));
     }
 
     req.ctx(payModel).getPayAli(param).then(result => {

@@ -374,6 +374,10 @@ class payModel extends global.yoho.BaseModel {
     alipayResultVerify(params) {
         let checkResult = {};
 
+        if (params.uid) {
+            delete params.uid;
+        }
+
         if (params.q) {
             delete params.q;
         }

@@ -29,3 +29,4 @@
 /* 帮助与反馈 */
 @import "service/chatQaList";
 @import "cart/pay-success";
+@import "cart/pay-failure";