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

@@ -671,7 +671,8 @@ const setSizeData = (sizeInfo) => {
             gender;
         let size = {
             titleEn: 'SIZEINFO',
-            titleCn: '尺码信息'
+            titleCn: '尺码信息',
+            sizeImage: sizeInfo.sizeImage
         };
 
         sizeInfo.sizeInfoBo = _sizeInfoBoSort(sizeInfo.sizeInfoBo);
@@ -710,6 +711,7 @@ const setSizeData = (sizeInfo) => {
                 sizeTable.thead.push({
                     name: value.attributeName || ' ',
                     id: value.id,
+                    doubt: true,
                     width: 126
                 });
             });

@@ -256,7 +256,7 @@
                             <span class="cn">{{titleCn}}</span>
                         </label>
                     </div>
-                    <div class="size-info">
+                    <div class="size-info" data-img="{{sizeImage}}">
                         {{# param}}
                             {{> item/size-table}}
                         {{/ param}}
@@ -265,6 +265,8 @@
                             ※ 以上尺寸为实物人工测量，因测量方式不同会有1-2CM误差，相关数据仅作参考，以收到实物为准。  单位：CM<br>
                             ※ 参考尺码因衣服版型、剪裁不同会有误差，仅供参考
                         </p>
+                        {{!-- 解决首次弹出示意图弹窗因图片高度获取不到定位异常问题 --}}
+                        <img src="{{sizeImage}}" style="display: none;">
 
                         {{# taste}}
                             {{> item/size-table}}

@@ -2,7 +2,12 @@
     <thead>
         <tr>
             {{# thead}}
-                <th width="{{width}}">{{name}}</th>
+                <th width="{{width}}">
+                    {{name}}
+                    {{#if doubt}}
+                        <span class="show-img"></span>
+                    {{/if}}
+                </th>
             {{/ thead}}
         </tr>
     </thead>

@@ -6,8 +6,7 @@
                     {{# navbars}}
                     <li class="nav-item{{#if cur}} cur{{/if}}">
                         <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>
-                            <span class="nav-en">{{en}}</span>
-                            <span class="nav-cn">{{cn}}</span>
+                            {{en}}{{cn}}
                         </a>
                     </li>
                     {{/ navbars}}
@@ -23,8 +22,7 @@
                     {{# subNav}}
                         <li{{#if thirdNav}} class="contain-third"{{/if}}>
                             <a href="{{link}}">
-                                <span class="nav-en">{{en}}</span>
-                                <span class="nav-cn">{{cn}}</span>
+                                {{en}}{{cn}}
                             </a>
                             {{#if thirdNav}}
                             <div class="third-nav-wrapper">

 var cancelOrder = require('./order/cancel-order');
+var confirmReceive = require('./order/confirm-receive');
 var editOrder = require('./order/edit-order');
 var countDown = require('./order/countdown');
 
@@ -40,6 +41,13 @@ $('.order .edit-btn').on('click', function() {
     }, reload);
 });
 
+$('.complete-btn').on('click', function() {
+    var code = $(this).closest('.order').data('code');
+
+    confirmReceive.done(code);
+
+});
+
 if ($('.left-time').length) {
     countDown.intervalValue = 1000;
     countDown.showSec = true;

@@ -26,6 +26,8 @@ var $tradeWrapper = $('.trade-wrapper'),
 var $addToBag = $('#add-to-bag'),
     $soldOut = $('#sold-out');
 
+var $sizeInfo = $('.size-info');
+
 var $thumbCur = $('.thumb-wrap .cur'); // 当前选中展示图片
 
 var SLIDETIME = 200;
@@ -304,3 +306,13 @@ $('#collect-product').click(function() {
         }
     });
 });
+
+$sizeInfo.on('click', '.show-img', function() {
+    var img = $sizeInfo.data('img');
+
+    new Dialog({
+        className: 'item-doubt-dialog',
+        content: '<img src="' + img + '">',
+        btns: []
+    }).show();
+});

@@ -14,9 +14,9 @@
     }
 
     .icon-back {
-        width: 90%;
-        height: 90%;
-        margin: 5%;
+        width: 80%;
+        height: 80%;
+        margin: 10%;
 
         img {
             width: 100%;

@@ -17,10 +17,13 @@
             }
         }
 
+        .good-info {
+            width: 515px !important;
+        }
+
         &.returns {
             .good-info {
                 border: none;
-                width: 530px !important;
 
                 .detail {
                     width: 380px !important;

@@ -244,7 +244,7 @@
 
             .go-bag {
                 color: #fff;
-                background: #e92601;
+                background: #1b1b1b;
             }
         }
     }
@@ -406,6 +406,16 @@
                 left: 20px;
             }
 
+            .show-img {
+                width: 14px;
+                height: 14px;
+                display: inline-block;
+                position: relative;
+                top: 2px;
+                background: url('/product/doubt.png') no-repeat;
+                cursor: pointer;
+            }
+
             .model-name {
                 margin-left: 20px;
             }
@@ -420,6 +430,7 @@
         border: 1px solid #f3f3f3;
         padding: 40px 130px;
         margin-top: 80px;
+        overflow: hidden;
 
         .block-title {
             height: 0;
@@ -491,3 +502,11 @@
         margin-right: 4px;
     }
 }
+
+.item-doubt-dialog {
+    background: #fff;
+
+    .content {
+        width: 600px;
+    }
+}