Merge branch 'feature/annual-account' into 'master'

Feature/annual account

年度账单样式及h5跳转登录方式修改等

See merge request !205

@@ -14,6 +14,11 @@ const index = (req, res, next) => {
     let uid = +req.query.uid || +req.user.uid;
     let curUrl = 'http://m.yohobuy.com/activity/annual-account';
 
+    if (!uid) {
+        res.redirect('/signin.html?refer=http://m.yohobuy.com/activity/annual-account');
+        return;
+    }
+
     annualAccountModel.getAccountData({
         uid: uid,
         year: '2016'

@@ -8,13 +8,13 @@
 
 const router = require('express').Router(); // eslint-disable-line
 const cRoot = './controllers';
-const auth = require('../../doraemon/middleware/auth');
 const demo = require(`${cRoot}/demo`);
 const coupon = require(`${cRoot}/coupon`);
 const wechat = require(`${cRoot}/wechat`);
 const student = require(`${cRoot}/student`);
 const live = require(`${cRoot}/live`);
 const invite = require(`${cRoot}/invite`);
+const auth = require('../../doraemon/middleware/auth');
 
 const couponFloor = require(`${cRoot}/coupon-floor`);
 const vipDay = require(`${cRoot}/vipDay`);
@@ -162,7 +162,7 @@ router.get('/redbag/2017', redbag.index);
 router.get('/individuation', individuation.productLst);
 
 // 2016 年度账单
-router.get('/annual-account', auth, annualAccount.index);
+router.get('/annual-account', annualAccount.index);
 router.get('/annual-account/share', annualAccount.share);
 router.get('/app-downloads', appDownloads.index);
 

 {{#data}}
 <div class="annual-account-page ch" data-login="{{loginUrl}}" data-is-app="{{isApp}}">
-    <div class="annual-bg ch"></div>
+
     <input type="hidden" value="{{sUrl}}" id="s-url">
     <div class="audio-btn"></div>
     <audio preload="auto" loop="loop" id="audio">

@@ -54,6 +54,9 @@ function listenVideo() {
         }
     });
 }
+$('body').css({
+    height: $(window).height()
+});
 
 $(function() {
     var $purdah1 = $('.purdah1'),
@@ -72,6 +75,11 @@ $(function() {
 
     $commonH.css({height: $(window).height()});
 
+    setTimeout(function() {
+        $('.top-downloadbar').css({zIndex: 9});
+    }, 400);
+
+
     audioAction();
     listenVideo();
 

 .annual-account-page {
     width: 640px;
     overflow: hidden;
+    background-image: resolve("activity/annual-account/bg.gif");
+    background-size: cover;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1;
 
     .audio-btn {
         width: 49px;
@@ -10,7 +16,7 @@
         position: fixed;
         top: 30px;
         right: 30px;
-        z-index: 99;
+        z-index: 8;
     }
 
     .audio-f {
@@ -18,16 +24,6 @@
         background-size: contain;
     }
 
-    .annual-bg {
-        width: 100%;
-        background-image: resolve("activity/annual-account/bg.gif");
-        background-size: cover;
-        position: fixed;
-        left: 0;
-        top: 0;
-        z-index: -1;
-    }
-
     .nav-1 {
         width: 100%;
         background: resolve("activity/annual-account/account-bg.png") no-repeat;