Merge branch 'gray' into 'master'

Gray



See merge request !833

@@ -211,7 +211,11 @@ module.exports = class extends global.yoho.BaseModel {
         }, {
             code: 200
         }).then((result) => {
-            let currencyUrl = 'http://m.yohobuy.com/home/helpDetail?code=20151230-102233&caption=有货币介绍&name=有货币介绍';
+            let currencyUrl = helpers.urlFormat('/service/qaDetail', {
+                keyword: '%E6%9C%89%E8%B4%A7%E5%B8%81',
+                sonId: '233'
+            });
+
             let shareUrl = 'http://m.yohobuy.com/activity/share-buy';
 
             if (result && result.code === 200 && result.data) {

@@ -13,7 +13,7 @@
         {{# hotGoods}}
             <a class="goods-info" href="{{url}}" data-good-id="{{product_id}}">
                 <div class="goods-image">
-                    <img src="{{image2 default_images w=340 h=370 q=60}}">
+                    <img src="{{image default_images 318 425}}">
                 </div>
                 <div class="good-detail-text">
                     <div class="price">

@@ -16,13 +16,13 @@
             <a href="{{url}}" class="nav-sub-right">{{text}}</a>
     {{/shopPage}}
     {{#currencyPage}}
-    <a href="/home/helpDetail?code=20151230-102233&caption=有货币介绍&name=有货币介绍" class="iconfont nav-home">&#xe639;</a>
+    <a href="/service/qaDetail?keyword=%E6%9C%89%E8%B4%A7%E5%B8%81&sonId=233" class="iconfont nav-home">&#xe639;</a>
     {{/currencyPage}}
     {{#currencyDetailPage}}
-    <a href="/home/helpDetail?code=20111130-152530&caption=如何使用有货币支付&name=如何使用有货币支付" class="iconfont nav-home">&#xe639;</a>
+    <a href="/service/qaDetail?keyword=%E6%9C%89%E8%B4%A7%E5%B8%81&sonId=227" class="iconfont nav-home">&#xe639;</a>
     {{/currencyDetailPage}}
     {{#installmentPage}}
-    <a href="/home/helpDetail?code=20151230-102233&caption=有货分期&name=有货分期" class="iconfont nav-home">&#xe639;</a>
+    <a href="/service/qaDetail?keyword=%E6%9C%89%E8%B4%A7%E5%88%86%E6%9C%9F&sonId=179" class="iconfont nav-home">&#xe639;</a>
     {{/installmentPage}}
     {{#navPhone}}
     <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>

 {
   "name": "m-yohobuy-node",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -9,8 +9,8 @@ class IndexView extends View {
         this.receiveBtn = $('.receive-btn');
         this.tipClose = $('.close');
 
-        this.on('touchend touchcancel', '.receive-btn', this.btnClick.bind(this));
-        this.on('touchend touchcancel', '.close', this.tipClickHide.bind(this));
+        this.on('click', '.receive-btn', this.btnClick.bind(this));
+        this.on('click', '.close', this.tipClickHide.bind(this));
     }
 
     /**

@@ -8,7 +8,7 @@ class ListView extends View {
 
         this.receiveBtn = $('.receive-btn');
 
-        this.on('touchend touchcancel', '.receive-btn', this.receiveClick.bind(this));
+        this.on('click', '.receive-btn', this.receiveClick.bind(this));
     }
 
     /**

@@ -63,11 +63,11 @@
         display: block;
         position: relative;
         float: left;
-        margin: 0 5px 85px;
+        margin: 0 5px 45px;
 
         .goods-image {
             width: 100%;
-            height: 370px;
+            height: 425px;
 
             img {
                 width: 100%;
@@ -76,6 +76,9 @@
         }
 
         .good-detail-text {
+            position: relative;
+            top: -55px;
+
             .price {
                 height: 55px;
                 width: 100%;
@@ -113,7 +116,7 @@
             line-height: 60px;
             position: absolute;
             left: 65px;
-            bottom: -35px;
+            bottom: 20px;
             font-size: 28px;
         }
     }