Merge branch 'release/6.0' into release/6.0.1

@@ -122,9 +122,6 @@ exports.inviteReg = (req, res, next) => {
 
 
     req.ctx(expandModel).promotionData(uid, isApp).then(result => {
     req.ctx(expandModel).promotionData(uid, isApp).then(result => {
         res.render('expand-new/invite-reg', {
         res.render('expand-new/invite-reg', {
-            pageHeader: headerModel.setNav({
-                navTitle: '注册完成'
-            }),
             isApp: isApp,
             isApp: isApp,
             width750: true,
             width750: true,
             localCss: true,
             localCss: true,

@@ -219,7 +219,7 @@ const payCod = (req, res, next) => {
 
 
     payModel.getPayCod(param).then(result => {
     payModel.getPayCod(param).then(result => {
         if (result.match === true) {
         if (result.match === true) {
-            aboutModel.about(req.yoho.isApp).then(resu => {
+            req.ctx(aboutModel).about(req.yoho.isApp).then(resu => {
                 res.render('pay/pay-cod', Object.assign(responseData, result, {wxFooter: resu}));
                 res.render('pay/pay-cod', Object.assign(responseData, result, {wxFooter: resu}));
             });
             });
         } else {
         } else {
@@ -272,7 +272,7 @@ const payAli = (req, res, next) => {
 
 
     payModel.getPayAli(param).then(result => {
     payModel.getPayAli(param).then(result => {
         if (result.match === true) {
         if (result.match === true) {
-            aboutModel.about(req.yoho.isApp).then(resu => {
+            req.ctx(aboutModel).about(req.yoho.isApp).then(resu => {
                 res.render('pay/pay-ali', Object.assign(responseData, result, {wxFooter: resu}));
                 res.render('pay/pay-ali', Object.assign(responseData, result, {wxFooter: resu}));
             });
             });
         } else {
         } else {

@@ -10,11 +10,11 @@
         <div class="coupon-tab">
         <div class="coupon-tab">
             <ul class="tab-navs" data-sticky>
             <ul class="tab-navs" data-sticky>
                 <li class="tab-nav pull-left active">
                 <li class="tab-nav pull-left active">
-                    <span data-target="#couponAvailable" data-trigger="tab" data-funHome>可用优惠券</span>
+                    <span data-target="#couponAvailable" data-trigger="tab" data-funCouponAvailable>可用优惠券</span>
                 </li>
                 </li>
                 <em class="pull-left">|</em>
                 <em class="pull-left">|</em>
                 <li class="tab-nav pull-left">
                 <li class="tab-nav pull-left">
-                    <span data-target="#couponUnavailable" data-trigger="tab" data-funGetNewGoods>不可用优惠券</span>
+                    <span data-target="#couponUnavailable" data-trigger="tab" data-funCouponUnavailable>不可用优惠券</span>
                 </li>
                 </li>
             </ul>
             </ul>
         </div>
         </div>

@@ -275,7 +275,7 @@ const index = (req, res, next) => {
         // 标识有微信分享
         // 标识有微信分享
         data.hasWxShare = true;
         data.hasWxShare = true;
 
 
-        let resu = yield aboutModel.about(req.yoho.isApp);
+        let resu = yield req.ctx(aboutModel).about(req.yoho.isApp);
 
 
         data.guang.wxFooter = resu;
         data.guang.wxFooter = resu;
         res.render('info/index', Object.assign({
         res.render('info/index', Object.assign({

@@ -180,8 +180,8 @@
         {{#unless @root.wap.ucenter.removePrefer}}
         {{#unless @root.wap.ucenter.removePrefer}}
             {{> common/recommend-for-you}}
             {{> common/recommend-for-you}}
         {{/unless}}
         {{/unless}}
-    </div>
 
 
-{{> common/set-trend-world}}
+        {{> common/set-trend-world}}
+    </div>
 {{> footer-tab}}
 {{> footer-tab}}
 
 

@@ -23,9 +23,9 @@
                 </a>
                 </a>
             </span>
             </span>
         </li>
         </li>
-        <li>
+        <li class="trend-word">
             <span>我的潮流口令</span>
             <span>我的潮流口令</span>
-            <span>
+            <span class="trend-right">
                 <a href="//m.yohobuy.com/home/tide-command" class="command">
                 <a href="//m.yohobuy.com/home/tide-command" class="command">
                     {{#if trendWord}}
                     {{#if trendWord}}
                         {{trendWord}}
                         {{trendWord}}

 {{#each list}}
 {{#each list}}
-    <div class="coupon-group" data-coupon-id={{couponId}}>
+    <div class="coupon-group{{#is-equal-or couponType '5'}} usable-frees{{/is-equal-or}}" data-coupon-id={{couponId}}>
         <div class="coupon-header">{{couponDetailInfomation}}</div>
         <div class="coupon-header">{{couponDetailInfomation}}</div>
         <div class="coupon-content">
         <div class="coupon-content">
             <div class="coupon-content-group1">
             <div class="coupon-content-group1">

@@ -4,6 +4,10 @@ require('common');
 
 
 let tip = require('plugin/tip');
 let tip = require('plugin/tip');
 
 
+$('.invite-reg-page').css('min-height', function() {
+    return $(window).height();
+});
+
 // 埋点
 // 埋点
 function point(type, trend) {
 function point(type, trend) {
     let pointJosn = {
     let pointJosn = {
@@ -33,6 +37,12 @@ $('.set').click(function() {
         success: function(result) {
         success: function(result) {
             tip.show(result.message);
             tip.show(result.message);
             point(1, $('.command-textarea').val());
             point(1, $('.command-textarea').val());
+
+            if (result.code === 200) {
+                setTimeout(function() {
+                    location.href = window.cookie('refer');
+                }, 500);
+            }
         }
         }
     });
     });
 });
 });

@@ -13,8 +13,6 @@ let $ = require('yoho-jquery'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
     orderInfo = require('cart/buynow/order-info').orderInfo;
     orderInfo = require('cart/buynow/order-info').orderInfo;
 
 
-require('plugin/tab');
-
 let isGetData;
 let isGetData;
 
 
 let $newCoupon = $('#new-coupon'),
 let $newCoupon = $('#new-coupon'),

@@ -5,9 +5,20 @@
  */
  */
 const $couponCodeInput = $('input[name=couponCode]');
 const $couponCodeInput = $('input[name=couponCode]');
 const $submit = $('.submit');
 const $submit = $('.submit');
+const $useCouponBtnGroup = $('.use-coupon-btn-group');
+
+let Tab = require('plugin/tab');
+
+Tab.prototype.couponavailable = () => {
+    $useCouponBtnGroup.removeClass('disable');
+};
+
+Tab.prototype.couponunavailable = () => {
+    $useCouponBtnGroup.addClass('disable');
+};
 
 
 $('.select-coupon-page').css('min-height', function() {
 $('.select-coupon-page').css('min-height', function() {
-    return $(window).height() - $('#yoho-header').height();
+    return $(window).height() - $('#yoho-header').height() + 20;
 });
 });
 
 
 /**
 /**

@@ -12,8 +12,6 @@ let $ = require('yoho-jquery'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
     conponNotAvaliableTmpl = require('cart/select-coupon/coupon-not-avaliable.hbs'),
     orderInfo = require('./order-info').orderInfo;
     orderInfo = require('./order-info').orderInfo;
 
 
-require('plugin/tab');
-
 let isGetData;
 let isGetData;
 
 
 let $newCoupon = $('#new-coupon'),
 let $newCoupon = $('#new-coupon'),

+module.exports = function() {
+    let args = Array.prototype.slice.call(arguments);
+    let v1 = args[0];
+    let opt = args[args.length - 1];
+    let isTrue = false;
+
+    for (let i = 1; i < args.length - 1; i++) {
+        if (v1 === args[i]) {
+            isTrue = true;
+            break;
+        }
+    }
+
+    if (isTrue) {
+        return opt.fn(this); // eslint-disable-line
+    } else {
+        return opt.inverse(this); // eslint-disable-line
+    }
+};

@@ -82,3 +82,8 @@ $('.withhold').click(function() {
     point(2);
     point(2);
     $('.set-trend-world').hide();
     $('.set-trend-world').hide();
 });
 });
+
+$('.set-trend-world').on('mousewheel touchmove', function(e) {
+    e.preventDefault();
+    return false;
+});

@@ -17,11 +17,13 @@
             width: 350px;
             width: 350px;
             line-height: 45px;
             line-height: 45px;
             display: inline-block;
             display: inline-block;
+            position: relative;
+            top: -34px;
         }
         }
     }
     }
 
 
     .invite-pass {
     .invite-pass {
-        margin: 66px 30px 0;
+        margin: 20px 30px 0;
         width: 692px;
         width: 692px;
         height: 661px;
         height: 661px;
         background-image: resolve("activity/expand-new/invite-state.png");
         background-image: resolve("activity/expand-new/invite-state.png");
@@ -46,7 +48,7 @@
         .instructions-title {
         .instructions-title {
             text-align: center;
             text-align: center;
             line-height: 48px;
             line-height: 48px;
-            font-weight: 200;
+            font-weight: 700;
             font-size: 24px;
             font-size: 24px;
         }
         }
 
 

@@ -202,6 +202,10 @@ $fontSizeSmall: 16px;
         }
         }
     }
     }
 
 
+    .disable {
+        display: none;
+    }
+
     .null {
     .null {
         position: absolute;
         position: absolute;
         left: 50%;
         left: 50%;

 .set-trend-world {
 .set-trend-world {
+    position: fixed;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 5;
+
     .back {
     .back {
         width: 100%;
         width: 100%;
         height: 100%;
         height: 100%;
@@ -9,7 +15,6 @@
         bottom: 0;
         bottom: 0;
         background: #000;
         background: #000;
         opacity: 0.65;
         opacity: 0.65;
-        z-index: 5;
     }
     }
 
 
     .set-content {
     .set-content {
@@ -24,7 +29,6 @@
         border-bottom-right-radius: 10px;
         border-bottom-right-radius: 10px;
         border-bottom-left-radius: 10px;
         border-bottom-left-radius: 10px;
         padding-bottom: 35px;
         padding-bottom: 35px;
-        z-index: 5;
 
 
         .banner {
         .banner {
             width: 100%;
             width: 100%;
@@ -68,11 +72,12 @@
             text-align: left;
             text-align: left;
             width: 430px;
             width: 430px;
             margin-left: 55px;
             margin-left: 55px;
-            line-height: 50px;
+            line-height: 36px;
             margin-bottom: 20px;
             margin-bottom: 20px;
             height: 0;
             height: 0;
             overflow: hidden;
             overflow: hidden;
-            font-size: 22px;
+            font-size: 21px;
+            font-weight: 700;
 
 
             .hide-explain {
             .hide-explain {
                 display: block;
                 display: block;
@@ -136,3 +141,48 @@
         padding: 64px 60px 40px;
         padding: 64px 60px 40px;
     }
     }
 }
 }
+
+.my-page {
+    .set-content {
+        width: 460px;
+        margin-top: 134px;
+        margin-left: -224px;
+        padding-bottom: 29px;
+
+        .banner {
+            height: 204px;
+        }
+
+        .title {
+            height: 43px;
+            width: 284px;
+            margin: 17px 85px;
+        }
+
+        .trend-world-area {
+            width: 422px;
+            height: 55px;
+            margin-left: 18px;
+            line-height: 55px;
+        }
+
+        .explain-main {
+            width: 400px;
+            margin-left: 30px;
+            line-height: 34px;
+            margin-bottom: 17px;
+
+            .hide-explain {
+                width: 18px;
+                height: 22px;
+            }
+        }
+
+        .btn {
+            height: 58px;
+            width: 204px;
+            margin-left: 17px;
+            line-height: 58px;
+        }
+    }
+}

@@ -103,10 +103,15 @@
             line-height: 46px;
             line-height: 46px;
             overflow: hidden;
             overflow: hidden;
 
 
+            .trend-code {
+                display: inline-block;
+                vertical-align: top;
+            }
+
             .code-set {
             .code-set {
                 margin-left: 8px;
                 margin-left: 8px;
-                width: 36px;
-                height: 32px;
+                width: 37px;
+                height: 52px;
                 background: url("/home/index/code-set.png");
                 background: url("/home/index/code-set.png");
                 background-size: 100%;
                 background-size: 100%;
                 background-repeat: no-repeat;
                 background-repeat: no-repeat;

@@ -115,4 +115,17 @@
             }
             }
         }
         }
     }
     }
+
+    .trend-word {
+        position: relative;
+
+        .trend-right {
+            padding-right: 28px;
+        }
+
+        .iconfont {
+            position: absolute;
+            right: 50px;
+        }
+    }
 }
 }

@@ -170,16 +170,6 @@ $usable-frees-background-color: #444;
         }
         }
     }
     }
 
 
-    .coupon-tab2 {
-        .coupon-header {
-            background-color: #b0b0b0;
-        }
-
-        .coupon-content {
-            border-top: 2px dashed #b0b0b0;
-        }
-    }
-
     .coupon-not-result {
     .coupon-not-result {
         width: 100%;
         width: 100%;
         height: auto;
         height: auto;

@@ -52,7 +52,8 @@
         .more {
         .more {
             color: #4a90e2;
             color: #4a90e2;
             display: block;
             display: block;
-            padding-bottom: 20px;
+            padding-bottom: 8px;
+            line-height: 50px;
         }
         }
     }
     }