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

@@ -26,7 +26,13 @@ const getMeThumb = () => {
         cache: true,
         code: 200
     }).then(result => {
-        return result.data.list[0].data[0].src;
+
+        let thumb = {
+            banner: result.data.list[0].data[0].src,
+            url: result.data.list[0].data[0].url
+        };
+
+        return thumb;
     });
 };
 

@@ -73,7 +73,6 @@ const getUserReturn = (uid, page) => {
                 }
             } : false;
 
-
             data.list.forEach(item => {
                 item.orderGoods = item.goods;
                 item.createTime = item.orderCreateTime;
@@ -644,7 +643,7 @@ const _setExchangeDetailData = (data) => {
                 list.reminder = true;
                 list.inDoor = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
             }
 
             break;
@@ -652,7 +651,7 @@ const _setExchangeDetailData = (data) => {
             if (data.deliveryTpyeName === '寄回换货') {
                 list.takeGoods = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`;
             } else {
                 list.takeGoods = true;
             }
@@ -662,14 +661,14 @@ const _setExchangeDetailData = (data) => {
                 send: true,
                 doubt: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 40:
             Object.assign(list, {
                 finish: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             break;
         case 91:

@@ -14,9 +14,11 @@
                         </li>
                     {{/each}}
                 </ul>
-                {{#if banner}}
-                    <img class="banner-img" data-original="{{image banner 150 120}}">
-                {{/if}}
+                {{#banner}}
+                    <a href="{{url}}">
+                        <img class="banner-img" data-original="{{image banner 150 120}}">
+                    </a>
+                {{/banner}}
             </div>
 
             {{!-- 右侧页面内容 --}}

 {{# data}}
 
     {{#if total}}
-
         <div class="favorite-brands">
             <span class="num">您共收藏了{{total}}个品牌</span>
             <div class="brands-list clearfix">
@@ -82,7 +81,7 @@
         </div>
     {{^}}
         <div class="favorite-empty">
-            <p>您还没有收藏的店铺, 去<a href="{{siteUrl}}">首页</a>看看吧</p>
+            <p>您还没有收藏的品牌, 去<a href="{{siteUrl}}">品牌频道</a>看看吧</p>
         </div>
     {{/if}}
 {{/data}}

@@ -30,7 +30,7 @@
 
         <div class="way">
             {{#if takeGoods}}
-            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
             {{/if}}
 
             {{#if reminder}}
@@ -50,7 +50,7 @@
             {{/if}}
 
             {{#if doubt}}
-            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
+            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
             {{/if}}
 
             {{#if auditSuccess}}
@@ -155,7 +155,9 @@
                 <span>问题描述：{{remark}}</span>
                 <div class="reason-img">照片凭证：
                     <div class="evidence">
-                        <img src="{{evidenceImages}}">
+                        {{# evidenceImages}}
+                        <img src="{{image . 70 90}}">
+                        {{/ evidenceImages}}
                     </div>
                 </div>
             </div>

@@ -19,9 +19,13 @@
     <h4 class="status-title">发票信息</h4>
     {{#if invoice}}
     {{# invoice}}
+    {{#if showInvoice}}
     <p class="text">发票类型：{{typeText}}</p>
     <p class="text">发票抬头：{{title}}</p>
     <p class="text">发票内容：{{contentValue}}</p>
+    {{^}}
+    <p class="text">暂不需要发票</p>
+    {{/if}}
     {{/ invoice}}
     {{^}}
     <p class="text">暂不需要发票</p>

@@ -7,7 +7,7 @@
             {{# btns}}
                 <li>
                     {{#if isPayBtn}}
-                    <a href="{{payUrl}}">
+                    <a href="{{payUrl}}" target="_blank">
                         <span class="{{classStr}}">{{name}}</span>
                     </a>
                     {{^}}

@@ -10,6 +10,8 @@
         <span>尺码：
             <span class="bold">{{sizeName}}</span>
         </span>
+        {{#if buyNumber}}
         <p class="bold buy-number"><span class="iconfont">&#xe61d;</span>{{buyNumber}}</p>
+        {{/if}}
     </div>
 </div>

@@ -49,27 +49,25 @@
                 </div>
             </li>
 
-            <form id="verification-form" class="verification-form" method="POST" action="/passport/back/backmobile">
-                <li>
-                    <div class="sms-captcha-wrapper">
-                        <input id="captcha" class="input va captcha left" type="text" name="code" maxlength="4"
-                               placeholder="请输入短信验证码">
+            <li>
+                <div class="sms-captcha-wrapper">
+                    <input id="captcha" class="input va captcha left" type="text" name="code" maxlength="4"
+                           placeholder="请输入短信验证码">
 
-                        {{> err-tip}}
-                    </div>
-                    <a id="send-captcha" class="btn send-captcha left">获取短信验证码</a>
+                    {{> err-tip}}
+                </div>
+                <a id="send-captcha" class="btn send-captcha left">获取短信验证码</a>
 
-                </li>
-                <li class="blank">
-                    <input name="area" id="area" type="hidden" value="{{area}}">
-                    <input name="mobile" id="mobile" type="hidden" value="{{mobile}}">
-                    <input name="verifyCode" id="captchaPic" type="hidden" value="{{verifyCode}}">
-                    <input name="refer" id="refer" type="hidden" value="">
-                </li>
-                <li>
-                    <a id="next-step" class="next-step disable" href="javascript:;">下一步</a>
-                </li>
-            </form>
+            </li>
+            <li class="blank">
+                <input name="area" id="area" type="hidden" value="{{area}}">
+                <input name="mobile" id="mobile" type="hidden" value="{{mobile}}">
+                <input name="verifyCode" id="captchaPic" type="hidden" value="{{verifyCode}}">
+                <input name="refer" id="refer" type="hidden" value="">
+            </li>
+            <li>
+                <a id="next-step" class="next-step disable" href="javascript:;">下一步</a>
+            </li>
 
         </ul>
 

@@ -302,10 +302,10 @@ function bindConfirmEvent() {
             if ($specialReason.length && $specialReason.get(0).style.display === 'block') {
                 goodObj.remark = $specialReason.find('.right-content').find('.mark-text').val();
 
-                $imgs = $specialReason.find('.right-content').find('img');
+                $imgs = $specialReason.find('.right-content').find('.thumb-box');
 
                 $imgs.each(function(idx, img) {
-                    imgs.push(img.src);
+                    imgs.push($(img).data('img'));
                 });
 
                 goodObj.evidence_images = imgs;
@@ -380,10 +380,17 @@ function bindUploadEvent() {
                 callback: function(result) {
                     var img;
                     var $t;
+                    var o;
 
                     if (result.code === 200) {
                         n = parseInt($(that).siblings('.thumb-box').length, 10);
-                        img = imgBoxTpl({src: result.data});
+                        o = {src: result.data};
+
+                        if (result.imgs && result.imgs.length) {
+                            o.url = result.imgs[0];
+                        }
+
+                        img = imgBoxTpl(o);
                         $t = $(that).next('.img-up-tip');
                         $(that).before(img);
 

@@ -62,8 +62,6 @@ $('body').on('click', function(e) {
         return false;
     }
 
-    e.preventDefault();
-
     if (!$('.package-list').hasClass('hide')) {
         $('.package-list').addClass('hide');
     }

@@ -67,6 +67,7 @@
         .contact {
             line-height: 50px;
             height: 50px;
+            color: #219dd6;
 
             span {
                 margin-left: 20px;
@@ -75,6 +76,7 @@
             .iconfont {
                 font-size: 12px;
                 margin-right: 5px;
+                color: #219dd6;
             }
         }
     }
@@ -200,6 +202,10 @@
 
         .good-name {
             margin-bottom: 8px;
+            display: -webkit-box;
+            overflow: hidden;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
         }
     }
 
@@ -234,6 +240,7 @@
             float: left;
             width: 70px;
             height: 90px;
+            margin-right: 10px;
 
         }