Merge branch 'develop/wap' into beta/wap

@@ -62,6 +62,10 @@ $sideNav.on('touchstart', 'li', function(e) {
     }
 });
 
+$sideNav.on('touchmove', function(e) {
+    e.stopPropagation();
+});
+
 //返回一级导航，收起二级导航
 $subNav.each(function() {
     $(this).find('li').eq(0).on('touchstart', function() {

@@ -80,6 +80,7 @@ $addressForm.on('submit', function() {
 
     isSubmiting = true;
     loading.showLoadingMask();
+    $submit.css('background', '#777');
     $.ajax({
         method: 'POST',
         url: '/home/saveAddress',
@@ -102,6 +103,8 @@ $addressForm.on('submit', function() {
     }).fail(function() {
         tip.show('网络出了点问题~');
         isSubmiting = false;
+        loading.hideLoadingMask();
+        $submit.css('background', '#444');
     });
     return false;
 });

@@ -27,7 +27,8 @@ function getGender() {
 
 require('../home/maybe-like')(getGender());
 
-
+//提前触发lazyload
+$(window).scrollTop(1).scrollTop(0);
 
 
 

@@ -64,11 +64,11 @@
 
         .nav-icon, .nav-img {
             position: absolute;
-            width: 48rem / $pxConvertRem;
-            height: 48rem / $pxConvertRem;
+            width: 38rem / $pxConvertRem;
+            height: 38rem / $pxConvertRem;
             top: 50%;
-            margin-top: -24rem / $pxConvertRem;
-            left: 30rem / $pxConvertRem;
+            margin-top: -19rem / $pxConvertRem;
+            left: 35rem / $pxConvertRem;
             background: no-repeat left center;
             background-size: 100% 100%;
         }
@@ -108,6 +108,13 @@
                 font-size: 36rem / $pxConvertRem;
             }
 
+            .nav-img, .nav-icon {
+                width: 48rem / $pxConvertRem;
+                height: 48rem / $pxConvertRem;
+                margin-top: -24rem / $pxConvertRem;
+                left: 30rem / $pxConvertRem;
+            }
+
         }
 
         .sub-nav {
@@ -234,8 +241,8 @@
     }
 
     li:first-child {
-        height: 88rem / $pxConvertRem;
-        line-height: 88rem / $pxConvertRem;
+        height: 90rem / $pxConvertRem !important;
+        line-height: 90rem / $pxConvertRem !important;
         background: #3e3e3e;
 
         a {

 .yoho-footer {
     font-size: 12px;
     background-color: #fff;
+    position: relative;
 
     .op-row {
-        position: relative;
         padding: 0 15px;
         height: 60px;
         line-height: 60px;
@@ -20,8 +20,8 @@
             margin-left: .3em;
             margin-right: 1em;
             max-width: 200rem / $pxConvertRem;
-            text-overflow:ellipsis; 
-            white-space:nowrap; 
+            text-overflow:ellipsis;
+            white-space:nowrap;
         }
 
         .back-to-top {
@@ -49,4 +49,4 @@
         bottom: 0;
     }
 
-}
\ No newline at end of file
+}

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

+<?php
+use Action\AbstractAction;
+
+/**
+ * 专为APP客户端调用的 hf(hotfix) Api
+ * 
+ * @name HfController
+ * @package 
+ * @copyright yoho.inc
+ * @version 1.0 (2016-2-3 11:34:40)
+ * @author fei.hong <fei.hong@yoho.cn>
+ */
+class HfController extends AbstractAction
+{
+    /* 私钥 */
+    const PRIVATE_KEY = 'fd4ad5fcsa0de589af23234ks1923ks';
+    
+    /**
+     * V1版本
+     * 
+     * 参数列表
+     * -------------------------------------------------------------------------
+     * 字段             描述                                    类型	示例
+     * app_version	当前版本号                              string	3.8.0
+     * uid              用户ID                                  string	13423331
+     * client_type	用户手机系统:Android,IOS                string	Android
+     * screen_size	屏幕尺寸                                string	1080x1920
+     * udid             设备唯一码                              string	1d123sadao3
+     * os_version	设备版本号                              string	1d123sadao3
+     * patchv           补丁版本号，如果本地没有补丁，传空	string	100
+     * 
+     * 返回列表
+     * -------------------------------------------------------------------------
+     * 字段             描述                                    类型	示例
+     * code             返回的code，200,304等，具体的服务器定义	int	200
+     * message          信息                                    string	"Config Success"
+     * md5              当前请求的唯一码                        string	"1234567890123456"
+     * data             配置参数数据，参考data列表              object	
+     * [
+     *   url            补丁url地址，没有传空                   string	http://yohocdn.com/fpath/fpkk.js
+     *   patchv         当前补丁的版本号，没有就传空            string	"100"
+     *   filecode       md5(md5(文件内容) + "yohopatch2016")    string	"1233321121212332"
+     * ]
+     */
+    public function v1Action()
+    {
+        $result = array('code' => 200, 'message' => 'Config Success', 'md5' => '', 'data' => array());
+        
+        // 根据版本号返回补丁文件信息
+        $version = $this->post('app_version');
+        switch ($version) {
+            case '4.0.0': // 版本号
+            case '3.8.0': 
+                $result['data']['url'] = 'http://cdn.yoho.cn/analysis/v1/js/om_code.js';
+                $result['data']['patchv'] = '100';
+                $result['data']['filecode'] = md5('496c71eb82ce76410d5e0b3a74c02b43' . 'yohopatch2016');
+                $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
+                break;
+            default: // 默认
+                $result['data']['url'] = '';
+                $result['data']['patchv'] = '';
+                $result['data']['filecode'] = '';
+                $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
+        }
+        
+        $this->echoJson($result);
+    }
+
+}