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

@@ -220,7 +220,7 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
 });
 });
 
 
 $('.nav-home').on('touchstart', function() {
 $('.nav-home').on('touchstart', function() {
-    $('.homebuttom').toggleClass('none');
+    $('.homebuttom').toggleClass('hide');
 });
 });
 
 
 (function() {
 (function() {

@@ -28,9 +28,15 @@ $('.nav-btn').on('touchstart', function(event) {
     $mobileWrap.addClass('menu-open');
     $mobileWrap.addClass('menu-open');
     $overlay.show().css('opacity', 0.3);
     $overlay.show().css('opacity', 0.3);
     $sideNav.addClass('on');
     $sideNav.addClass('on');
+    openSideNav = true;
     event.preventDefault();
     event.preventDefault();
     event.stopPropagation();
     event.stopPropagation();
-    openSideNav = true;
+
+    //设置boy高宽，页面不能上下滑动
+    $('body').css({
+        height: $(window).height(),
+        overflow: 'hidden'
+    });
     return false;
     return false;
 });
 });
 
 
@@ -41,6 +47,10 @@ function hideSideBar() {
         $('.overlay').hide();
         $('.overlay').hide();
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
         $sideNav.removeClass('on');
         $sideNav.removeClass('on');
+        $('body').css({
+            height: 'auto',
+            overflow: 'auto'
+        });
     }
     }
 }
 }
 
 
@@ -62,10 +72,6 @@ $sideNav.on('touchstart', 'li', function(e) {
     }
     }
 });
 });
 
 
-$sideNav.on('touchmove', function(e) {
-    return false;
-});
-
 //返回一级导航，收起二级导航
 //返回一级导航，收起二级导航
 $subNav.each(function() {
 $subNav.each(function() {
     $(this).find('li').eq(0).on('touchstart', function() {
     $(this).find('li').eq(0).on('touchstart', function() {

@@ -21,7 +21,7 @@ var appIconPosition = {
         bank: '-4rem'
         bank: '-4rem'
     };
     };
 
 
-//隐藏微信分享选项
+// 隐藏微信分享选项
 if (window.wx) {
 if (window.wx) {
     wx.hideOptionMenu();
     wx.hideOptionMenu();
 }
 }
@@ -44,10 +44,10 @@ if (typeof WeixinJSBridge === undefined) {
     onBridgeReady();
     onBridgeReady();
 }
 }
 
 
-//调用微信JS api 支付
+// 调用微信JS api 支付
 function jsApiCall(orderCode, jsApiParameters) {
 function jsApiCall(orderCode, jsApiParameters) {
 
 
-    //防止重复操作弹框
+    // 防止重复操作弹框
     window.WeixinJSBridge && window.WeixinJSBridge.invoke(
     window.WeixinJSBridge && window.WeixinJSBridge.invoke(
        'getBrandWCPayRequest',
        'getBrandWCPayRequest',
        jsApiParameters,
        jsApiParameters,
@@ -57,7 +57,7 @@ function jsApiCall(orderCode, jsApiParameters) {
     );
     );
 }
 }
 
 
-//微信支付
+// 微信支付
 function callpay(orderCode) {
 function callpay(orderCode) {
     var jsApiParameters;
     var jsApiParameters;
 
 
@@ -92,11 +92,7 @@ function callpay(orderCode) {
 function isWXOpen() {
 function isWXOpen() {
     var ua = window.navigator.userAgent.toLowerCase();
     var ua = window.navigator.userAgent.toLowerCase();
 
 
-    if (ua.indexOf('micromessenger') > 0) {
-        return true;
-    } else {
-        return false;
-    }
+    return ua.indexOf('micromessenger') > 0;
 }
 }
 
 
 function hideWeChatPay() {
 function hideWeChatPay() {
@@ -138,9 +134,7 @@ function loadIcon() {
 }
 }
 
 
 function showPage() {
 function showPage() {
-    var $pageList = $('.payapp-list');
-
-    $pageList.css('visibility', 'visible');
+    $('.payapp-list').css('visibility', 'visible');
 }
 }
 
 
 if (wxHammer) {
 if (wxHammer) {

@@ -9,7 +9,7 @@ var $ = require('jquery');
 var $resend = $('#resend');
 var $resend = $('#resend');
 
 
 var tip = require('../../plugin/tip'),
 var tip = require('../../plugin/tip'),
-    showErrTip = tip.show;
+    showTip = tip.show;
 
 
 $resend.on('touchstart', function(e) {
 $resend.on('touchstart', function(e) {
     e.preventDefault();
     e.preventDefault();
@@ -18,11 +18,7 @@ $resend.on('touchstart', function(e) {
         url: $resend.data('url'),
         url: $resend.data('url'),
         type: 'GET',
         type: 'GET',
         success: function(data) {
         success: function(data) {
-            if (data.code === 200) {
-                showErrTip(data.message);
-            } else {
-                showErrTip(data.message);
-            }
+            showTip(data.message);
         }
         }
     });
     });
 });
 });

@@ -21,32 +21,32 @@ var nickname = $('#nickname').val(),
     areaCode = $('#area-code').val().replace('+', '');
     areaCode = $('#area-code').val().replace('+', '');
 
 
 function startBind(password) {
 function startBind(password) {
-        $.ajax({
-            url: '/passport/bind/bindMobile',
-            type: 'post',
-            data: {
-                areaCode: areaCode.replace('+', ''),
-                phoneNum: phoneNum,
-                openId: openId,
-                sourceType: sourceType,
-                nickname: nickname,
-                password: password
-            },
-            success: function(res) {
-                if (res.code === 200) {
-                    tip.show('登录成功');
-                    setTimeout(function() {
-                        location.href = res.data.refer;
-                    }, 2000);
-                } else {
-                    tip.show(res.message);
-                }
-            },
-            error: function(err) {
-                tip.show('登录失败,请重试！');
+    $.ajax({
+        url: '/passport/bind/bindMobile',
+        type: 'post',
+        data: {
+            areaCode: areaCode.replace('+', ''),
+            phoneNum: phoneNum,
+            openId: openId,
+            sourceType: sourceType,
+            nickname: nickname,
+            password: password
+        },
+        success: function(res) {
+            if (res.code === 200) {
+                tip.show('登录成功');
+                setTimeout(function() {
+                    location.href = res.data.refer;
+                }, 2000);
+            } else {
+                tip.show(res.message);
             }
             }
-        });
-    }
+        },
+        error: function(err) {
+            tip.show('登录失败,请重试！');
+        }
+    });
+}
 
 
 api.bindEyesEvt({
 api.bindEyesEvt({
     status: 'open' //默认眼睛打开
     status: 'open' //默认眼睛打开

@@ -152,18 +152,6 @@
         }
         }
     }
     }
 
 
-    // li.new {
-    //     margin: (19rem / $pxConvertRem) 0 0;
-    //     border-top: 1px solid #e0e0e0;
-    //
-    //     a {}
-    //
-    //     i {
-    //         background: image-url("side-nav/new.png") no-repeat left center;
-    //         background-size: 100% 100%;
-    //     }
-    // }
-
     li.guang, li.trendfinder {
     li.guang, li.trendfinder {
         .nav-icon {
         .nav-icon {
             background: image-url("side-nav/guang.png") no-repeat left center;
             background: image-url("side-nav/guang.png") no-repeat left center;
@@ -208,15 +196,6 @@
             z-index: 2;
             z-index: 2;
         }
         }
 
 
-        /* img{
-            position: absolute;
-            max-width: 50rem / $pxConvertRem;
-            max-height: 50rem / $pxConvertRem;
-            left: 32rem / $pxConvertRem;
-            top: 50%;
-            margin-top: -25rem / $pxConvertRem;
-            border: none;
-        } */
         .nav-point {
         .nav-point {
             position: absolute;
             position: absolute;
             left: 0rem / $pxConvertRem;
             left: 0rem / $pxConvertRem;

@@ -122,12 +122,13 @@
 }
 }
 
 
 .homebuttom{
 .homebuttom{
-    display: block;
     width: 100%;
     width: 100%;
     height: 90rem / $pxConvertRem;
     height: 90rem / $pxConvertRem;
     overflow: hidden;
     overflow: hidden;
     border-top: 1px solid rgba(255,255,255,0.5);
     border-top: 1px solid rgba(255,255,255,0.5);
     color: #fff;
     color: #fff;
+    z-index: 2;
+    position: relative;
 
 
     &.boys {
     &.boys {
         @include background-image(linear-gradient(#323232, #414141));
         @include background-image(linear-gradient(#323232, #414141));
@@ -169,10 +170,9 @@
                 overflow: hidden;
                 overflow: hidden;
                 display: block;
                 display: block;
                 line-height: 40rem / $pxConvertRem;
                 line-height: 40rem / $pxConvertRem;
+                color: #fff;
             }
             }
         }
         }
     }
     }
 }
 }
-.none{
-    display: none;
-}
+

@@ -20,7 +20,7 @@
     {{/navTitle}}
     {{/navTitle}}
 </header>
 </header>
 {{#navBtn}}
 {{#navBtn}}
-<div class="homebuttom none {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
+<div class="homebuttom hide {{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
     <ul>
     <ul>
         <li>
         <li>
             <a href="{{ indexUrl }}">
             <a href="{{ indexUrl }}">

@@ -359,13 +359,19 @@ class UserModel
     {
     {
         $result = array('code' => 400, 'message' => '出错啦~');
         $result = array('code' => 400, 'message' => '出错啦~');
 
 
-        $record = UserData::delRecord($uid, $skn);
+        do {
+            if (empty($skn)) {
+                break;
+            }
 
 
-        // 处理数据
-        if ($record && isset($record['code'])) {
-            $result['code'] = $record['code'];
-            $result['message'] = $record['message'];
-        }
+            $record = UserData::delRecord($uid, $skn);
+
+            // 处理数据
+            if ($record && isset($record['code'])) {
+                $result['code'] = $record['code'];
+                $result['message'] = $record['message'];
+            }
+        } while (false);
 
 
         return $result;
         return $result;
     }
     }

@@ -56,7 +56,7 @@ class BrandController extends AbstractAction
     public function searchAction()
     public function searchAction()
     {
     {
         $this->setTitle('品牌一览');
         $this->setTitle('品牌一览');
-        $this->setNavHeader('品牌一览');
+        $this->setNavHeader('品牌一览', true, false);
 
 
         $channel = Helpers::getChannelByCookie();
         $channel = Helpers::getChannelByCookie();