Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -1085,6 +1085,9 @@
             },
             {
                 is_advance: true //再到着
+            },
+            {
+                is_soon_sold_out: true //即将售罄
             }
         ],
         

@@ -82,22 +82,22 @@ headerNavHammer.on('tap', function(e) {
     }
 });
 
-formHammer = new Hammer(document.getElementById('img-form'));
+if (document.getElementById('img-form') !== null) {
+    formHammer = new Hammer(document.getElementById('img-form'));
 
-formHammer.on('tap', function(e) {
-    if ($(e.target).hasClass('upload-img-remove')) {
-        $uploadImgList.html('');
-        imgStr = '';
-        setTimeout(function() {
-            $imgAdd.show();
-        }, 50);
+    formHammer.on('tap', function(e) {
+        if ($(e.target).hasClass('upload-img-remove')) {
+            $uploadImgList.html('');
+            imgStr = '';
+            setTimeout(function() {
+                $imgAdd.show();
+            }, 50);
 
-    }
-});
+        }
+    });
+}
 
 // 点赞与取消点赞
-// suggestContentHammer = new Hammer(document.getElementById('suggest-content'));
-
 $likeBtn.bind('click', function() {
     var id = $(this).closest('.suggest-item').attr('data-id'),
         $that = $(this);

+.iHelp{
+	width: 100%;
+	height: auto;
+	overflow: hidden;
+	.helpSearch{
+		width: 90%;
+		height: 84rem / $pxConvertRem;
+		overflow: hidden;
+		position: relative;
+		margin: 0 auto;
+		input{
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+			border:none;
+			font-size: 54em / $pxConvertRem;
+		}
+		i{	
+			height: 100%;
+			line-height: 88rem / $pxConvertRem;
+			position: absolute;
+			right: 20rem / $pxConvertRem;
+			top: 0;
+			color: #e0e0e0;
+		}
+	}
+	ul{
+		width: 100%;
+		height: auto;
+		overflow: hidden;
+		display: block;
+		border-top: 1px solid #e0e0e0;
+		li{
+			width: 95%;
+			height: 80rem / $pxConvertRem;
+			line-height: 84rem / $pxConvertRem;
+			overflow: hidden;
+			font-size: 54em / $pxConvertRem;
+			border-bottom: 1px solid #e0e0e0;
+			float: right;
+			color: #444444;
+			&:last-of-type{
+				border-bottom:none;
+			}
+			span{
+				width: 88%;
+				height: 100%;
+				overflow: hidden;
+				float: left;
+			}
+			i{
+				color: #e0e0e0;
+			}
+		}
+	}
+}
\ No newline at end of file

 $vip: sprite-map("me/vip/*.png", $spacing: 10px);
 $fav: sprite-map("me/fav/*.png", $spacing: 5px);
 
-@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang";
+@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp";
 

@@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
 
     //发表意见
     .create-new-suggest {
-        display: block;
+        display: inline-block;
         color: #444;
         width: 100%;
         height: pxToRem(88px);

@@ -69,6 +69,10 @@ $basicBtnC:#eb0313;
               border: 1px solid #000;
               color: #000;
           }
+          .soonSoldOut-tag{
+              background-color:#ffac5b;
+              color:#fff;
+          }
 }
 .good-detail-page {
     overflow: hidden;

+{{> layout/header}}
+<div class="iHelp">
+	<div class="helpSearch">
+		<input type="text">
+		<i class="iconfont">&#xe60f;</i>
+	</div>
+	<ul>
+		{{# iHelp}}
+		<li><a href="{{ url }}"><span>{{ name }}</span><i class="iconfont num">&#xe604;</i></a></li>
+		{{/ iHelp}}
+	</ul>
+</div>
+{{> layout/footer}}

@@ -94,7 +94,7 @@
             </a>
         </div>
         <div class="group-list">
-            <a class="list-item" href="/help.html">
+            <a class="list-item" href="/home/IHelp">
                 <span class="iconfont icon">&#xe639;</span>
                 帮助
                 <span class="iconfont num">&#xe604;</span>

@@ -2,6 +2,7 @@
 <div class="good-detail-page yoho-page">
     <div class="banner-container">
         <div class="tag-container">
+            <p class="good-tag soonSoldOut-tag">即将售罄</p>
             {{# tags}}
                 {{# is_new}}
                     <p class="good-tag new-tag">NEW</p>
@@ -18,6 +19,9 @@
                 {{# is_limited}}
                     <p class="good-tag limit-tag">限量商品</p>
                 {{/ is_limited}}
+                {{# is_soon_sold_out}}
+                    <p class="good-tag soonSoldOut-tag">即将售罄</p>
+                {{/ is_soon_sold_out}}
             {{/ tags}}
         </div>
         {{# bannerTop}}
@@ -102,7 +106,7 @@
 
     <div id="productDesc"></div>
     {{> product/recommend-for-you}}
-    
+
     {{#cartInfo}}
     <div class="cart-bar">
         {{#if numInCart}}

@@ -659,4 +659,28 @@ class HomeController extends AbstractAction
         $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
     }
 
-}
+    /**
+     * 帮助列表页
+     */
+    private function IHelpAction()
+    {   
+        $this->setTitle('帮助中心');
+        $this->setNavHeader('帮助中心');
+        $data = array(
+            'iHelp' => array(
+                array('name' => '新用户注册','url' => 'http://m.dev.yohobuy.com/' ),
+                array('name' => '交款须知' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '服务条款' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '网站订购流程' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '会员登录' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '网站订单修改' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => 'YOHO币' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '常见问题' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '支付方式' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '发票制度说明' ,'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '配送时间' ,'url' => 'http://m.dev.yohobuy.com/')
+            )
+        );
+        $this->_view->display('i-help', $data);
+    }
+}