Merge branch 'feature/payEnd' into 'release/5.4'

增加支付失败



See merge request !173

@@ -60,6 +60,14 @@ const payAli = (req, res, next) => {
         title: '支付中心 | Yoho!Buy有货 | 潮流购物逛不停'
         title: '支付中心 | Yoho!Buy有货 | 潮流购物逛不停'
     };
     };
 
 
+    let responseFailure = {
+        pageHeader: headerModel.setNav({
+            navTitle: '支付中心',
+            navBtn: false
+        }),
+        title: '支付中心 | Yoho!Buy有货 | 潮流购物逛不停'
+    };
+
     let param = {
     let param = {
         uid: req.user.uid,
         uid: req.user.uid,
         udid: req.sessionID || require('md5')(req.ip) || 'yoho',
         udid: req.sessionID || require('md5')(req.ip) || 'yoho',
@@ -77,7 +85,7 @@ const payAli = (req, res, next) => {
 
 
     // 支付宝支付校验
     // 支付宝支付校验
     if (!verifyResult.payResult) {
     if (!verifyResult.payResult) {
-        return res.render('pay/pay-ali', responseData);
+        return res.render('pay/pay-failure', responseFailure);
     }
     }
 
 
     payModel.getPayAli(param).then(result => {
     payModel.getPayAli(param).then(result => {

+<div class="pay-back-page">
+    <div class="failure-order">
+        <p>订单提交失败！</p>
+
+        <div class="failure-notice">
+            <span class="iconfont">&#xe628;</span>提示：支付失败
+        </div>
+    </div>
+</div>

@@ -24,10 +24,14 @@ function getGender() {
 
 
 require('../channel/maybe-like')(getGender());
 require('../channel/maybe-like')(getGender());
 
 
-if ($('#goods-list').length === 0) {
-    $('.maybe-like').hide();
-}
+// 你可能喜欢没有数据就隐藏
+setTimeout(function() {
+    if ($('#goods-list').find('.good-info').length === 0) {
+        $('.maybe-like').hide();
+    }
+}, 200);
 
 
+// 防诈骗提示滚动
 if (tipConWidth > promptWidth - tipWidth) {
 if (tipConWidth > promptWidth - tipWidth) {
     var speed = 30;
     var speed = 30;
 
 

@@ -6,6 +6,7 @@
 @import "select-coupon";
 @import "select-coupon";
 @import "select-address";
 @import "select-address";
 @import "jit-detail";
 @import "jit-detail";
+@import "pay-failure";
 
 
 
 
 .icon-checkbox:before { content: "\e61c"; }
 .icon-checkbox:before { content: "\e61c"; }

+.pay-back-page {
+    font-family: helvetica,Arial,黑体;
+
+    .failure-order {
+        margin-top: 140px;
+        background-color: #fff;
+
+        p{
+            font-size: 37px;
+            font-weight: normal;
+            margin: 0;
+            padding: 0;
+            text-align: center;
+        }
+    }
+
+    .failure-notice {
+        text-align: center;
+        color: #24acaa;
+        display: block;
+        padding: 17px 30px 10px 0;
+
+        .iconfont {
+            margin-right: 10px;
+        }
+    }
+}