Merge branch 'develop' into test

@@ -37,7 +37,7 @@ function getOrders(option) {
         page: order.page + 1
     };
 
-    var show = option && option.showLoadingMask;
+    var show = option && !option.noLoadingMask;
 
     if (inAjax) {
         return;

@@ -13,7 +13,11 @@ var consultFooterEle = document.getElementById('consult-content-footer'),
     consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
 
     navtabEle = document.getElementById('nav-tab'),
-    navtabHammer = navtabEle && new Hammer(navtabEle);
+    navtabHammer = navtabEle && new Hammer(navtabEle),
+
+    gotoConsultEle = document.getElementById('goto-consult'),
+    gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle);
+
 
 
 (function() {
@@ -50,10 +54,10 @@ if (navtabHammer) {
             if (!$this.hasClass('focus')) {
 
                 $('#nav-tab li').each(function() {
-                    $this.removeClass('focus');
+                    $(this).removeClass('focus');
                 });
                 $('#feedback-content .content').each(function() {
-                    $this.addClass('hide');
+                    $(this).addClass('hide');
                 });
 
                 $this.addClass('focus');
@@ -67,4 +71,10 @@ if (consultFooterHammer) {
     consultFooterHammer.on('tap', function() {
         location.href = $(consultFooterEle).find('a').attr('href');
     });
+}
+
+if (gotoConsultHammer) {
+    gotoConsultHammer.on('tap', function() {
+        location.href = $(gotoConsultEle).find('a').attr('href');
+    });
 }
\ No newline at end of file

@@ -47,14 +47,15 @@
 			font-size: 50px;
 		}
 		p{
-			width: 55.517241%;
+			width: 59.517241%;
 			height: auto;
-			padding: 0 5% 18em / $pxConvertRem;
+			margin: 0 3% 16em / $pxConvertRem;
 			float: left;
 			&:first-of-type{
-				padding-top: 0.75rem;
+				margin-top: 0.75rem;
 				font-size: 18px;
-				height: 76rem / $pxConvertRem;
+				height: auto;
+				min-height: 42px;
 				display: -webkit-box;
     			-webkit-line-clamp: 2;
     			-webkit-box-orient: vertical;

@@ -310,7 +310,6 @@
                         line-height: pxToRem(65px);
                         text-align: center;
                         font-size: pxToRem(22px);
-                        color: #fff;
 
                         .price-discount {
                             span {

 {{#coupons}}
-<div class="employ-main"  style="background-image:url('{{coupon_pic}}')">
+<div class="employ-main">
         <span>{{ money}}</span>
         <p class="coupon-name">{{ coupon_name}}</p>
         <p>有效期：{{ couponValidity}}</p>

 {{> layout/header}}
 <div class="goods-consults-page yoho-page">
-        <div class="goto-consult">
-                <i class="iconfont consult-logo">&#xe639;</i>
-                <span>我要咨询</span>
-                <a href="{{link}}" class="iconfont enter-consult-page">&#xe604;</a>
-        </div>
+            <div class="goto-consult" id="goto-consult">
+                    <i class="iconfont consult-logo">&#xe639;</i>
+                    <span>我要咨询</span>
+                    <a href="{{link}}" class="iconfont enter-consult-page">&#xe604;</a>
+            </div>
          {{# consults}}
          <div class="goods-consults" id="goods-consults">
             {{#list}}

@@ -251,7 +251,7 @@ class UserModel
 	                $product['link'] = isset($one['goods'][0]) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
-                    $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;
+                    $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false;
 
                     $brand['productList'][] = $product;
                 }

@@ -23,16 +23,16 @@ class NewsaleModel
     /* 男生频道取新品到着及折扣专区数据的位置码 */
 
     const CODE_TOP_NEW_BOYS = '3cf2c1be5217fbab6009ce83959e1e12';
-    const CODE_TOP_SALE_BOYS = 'e9c9be32d72e2906d404a72ee24cb523';
+    const CODE_TOP_SALE_BOYS = '153180b9a88c0b565848850c523bb637';
     /* 女生频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_GIRLS = '1cf7f9f10e2a2670e73d05c568793ad9';
-    const CODE_TOP_SALE_GIRLS = '785c0e6aab746949073c4ffb9d5106ac';
+    const CODE_TOP_SALE_GIRLS = '0b2d133419a0f7c381306fd3522365e1';
     /* 潮童频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_KIDS = '57457adececa6c748b29c90cad0ae940';
-    const CODE_TOP_SALE_KIDS = 'ad1bb67a6007819c86f737d74172fd2e';
+    const CODE_TOP_SALE_KIDS = 'de23648d28ee1e8a3f087a9dbac506f8';
     /* 创意生活频道取新品到着及折扣专区数据的位置码 */
     const CODE_TOP_NEW_LIFESTYLE = '04953a61cbf1db426a681e55d496d2fe';
-    const CODE_TOP_SALE_LIFESTYLE = '8132c7db3adbeb7b0d0002de9691c753';
+    const CODE_TOP_SALE_LIFESTYLE = '01269e498ff5b07756e0733ec0e88c75';
 
     /**
      * 获取新品到着的焦点图资源数据