Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -60,7 +60,7 @@ const menuData = ()=> {
             },
             {
                 id: '5',
-                text: '有货服务条款'
+                text: '服务条款'
             }
         ]
     };

@@ -729,9 +729,9 @@ const setSizeData = (sizeInfo) => {
 
                 // 判断是否显示参考尺码
                 if (boyReference && (gender === 1 || gender === 3) && showReference) {
-                    sizes.push(value.boyReferSize.referenceName || ' ');
+                    sizes.push(_.get(value, 'boyReferSize.referenceName', ' '));
                 } else if (girlReference && (gender === 2 || gender === 3) && showReference) {
-                    sizes.push(value.girlReferSize.referenceName || ' ');
+                    sizes.push(_.get(value, 'girlReferSize.referenceName', ' '));
                 } else {
                     if (sizeTable.thead[1] && showReference) {
                         sizeTable.thead[1] = {};

@@ -9,7 +9,7 @@
             <div class="footer">
                 <span class="desc pay-notice left">{{../username}}如果<span class="blue">2小时</span>内您无法完成付款，系统会将您的订单取消</span>
                 <span id="order-detail-ctrl" class="right order-detail-ctrl">
-                    <em>展开详情</em>
+                    <em>收起详情</em>
                     <i class="iconfont down">&#xe616;</i>
                     <i class="iconfont up">&#xe617;</i>
                 </span>

@@ -94,7 +94,7 @@ $('#collect-btn').click(function() {
             new _alert(data.message).show();
             $this.toggleClass('collected');
         } else if (data.code === 400) {
-            window.location.href = 'http://www.yohobuy.com/passport/login';
+            window.location.href = 'http://www.yohoblk.com/passport/login';
         } else {
             new _alert(data.message).show();
         }
@@ -144,7 +144,7 @@ function comment() {
                  // clear comment-text
                 $('#comment-info').val('').keyup();
             } else if (data.code === 400) {
-                window.location.href = 'http://www.yohobuy.com/passport/login';
+                window.location.href = 'http://www.yohoblk.com/passport/login';
             } else {
                 new _alert(data.message).show();
             }

@@ -248,7 +248,7 @@ $('.print-price-radio').check({
     group: 'print-price',
     onChange: function(el, checked, value) {
         if (checked) {
-            $printPrice.isPrintPrice = value === 1 ? 'Y' : 'N';
+            $printPrice.printPrice = value === 1 ? 'Y' : 'N';
         }
     }
 });

@@ -129,7 +129,7 @@ $hoverColor: #379ed6;
             }
 
             .pro-name > a {
-                height: 100%;
+                height: 36px;
                 display: block;
                 line-height: 18px;
             }