Merge branch 'feature/yoho-coin-new' of git.dev.yoho.cn:web/yohobuy into feature/yoho-coin-new

+var $ = require('jquery');
+var page = 0;
+
+$(window).scroll(function() {
+    if ($(window).scrollTop() + $(window).height() > $('body').height() - 1) {
+        page++;
+        $.ajax({
+        type: 'POST',
+        url: '/home/currencyDetail',
+        dataType: 'html',
+        data: {
+            page: page
+        },
+        success: function(data) {
+            console.log(data);
+        }
+    });
+        return;
+    }
+});

@@ -15,3 +15,4 @@ require('./address');
 require('./suggest');
 require('./suggest');
 require('./browse-record');
 require('./browse-record');
 require('./address-act');
 require('./address-act');
+require('./currency');

 .yoho-coin-detail-page {
 .yoho-coin-detail-page {
     background: #f0f0f0;
     background: #f0f0f0;
     padding-bottom: pxToRem(40px);
     padding-bottom: pxToRem(40px);
-
+    .money{
+        width: 100%;
+        height: pxToRem(70px);
+        background:#fff;
+        margin-bottom: pxToRem(20px);
+        line-height: pxToRem(70px);
+        font-size: pxToRem(30px);
+        text-indent: 1em;
+        span{
+            color: #f00;
+            font-weight: bold;
+        }
+    }
     .coin-detail {
     .coin-detail {
         background: #fff;
         background: #fff;
         border-top: 1px solid #e0e0e0;
         border-top: 1px solid #e0e0e0;

 {{> layout/header}}
 {{> layout/header}}
 <div class="yoho-coin-detail-page yoho-page">
 <div class="yoho-coin-detail-page yoho-page">
+    {{# money}}
+    <div class="money">你拥有的有货币：<span>{{ money}}</span></div>
+    {{/ money}}
     <ul class="coin-detail">
     <ul class="coin-detail">
         {{# currency}}
         {{# currency}}
         <li>
         <li>

+{{> layout/header}}
+	{{ iHelp}}
+{{> layout/footer}}

@@ -77,7 +77,7 @@
                 优惠券
                 优惠券
                 <span class="iconfont num">{{coupon_num}} &#xe604;</span>
                 <span class="iconfont num">{{coupon_num}} &#xe604;</span>
             </a>
             </a>
-            <a class="list-item" href="/home/currency">
+            <a class="list-item" href="/home/currencyDetail">
                 <span class="iconfont icon">&#xe635;</span>
                 <span class="iconfont icon">&#xe635;</span>
                 YOHO 币
                 YOHO 币
                 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
                 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>

@@ -286,3 +286,8 @@
     seajs.use('js/me/logistic');
     seajs.use('js/me/logistic');
 </script>
 </script>
 {{/if}}
 {{/if}}
+{{#if currency}}
+<script>
+    seajs.use('js/me/currency');
+</script>
+{{/if}}

@@ -257,7 +257,7 @@ class HomeController extends AbstractAction
 		$currency = UserModel::getYohoCoinData($this->_uid);
 		$currency = UserModel::getYohoCoinData($this->_uid);
 
 
 		$currency['pageFooter'] = true;
 		$currency['pageFooter'] = true;
-		$this->_view->display('currency', $currency);
+		$this->_view->display('currency-new', $currency);
 	}
 	}
 
 
 	/**
 	/**