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

@@ -643,7 +643,7 @@ const _setExchangeDetailData = (data) => {
                 list.reminder = true;
                 list.reminder = true;
                 list.inDoor = true;
                 list.inDoor = true;
                 list.auditSuccess = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`;
             }
             }
 
 
             break;
             break;
@@ -651,7 +651,7 @@ const _setExchangeDetailData = (data) => {
             if (data.deliveryTpyeName === '寄回换货') {
             if (data.deliveryTpyeName === '寄回换货') {
                 list.takeGoods = true;
                 list.takeGoods = true;
                 list.auditSuccess = true;
                 list.auditSuccess = true;
-                list.view = `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`;
             } else {
             } else {
                 list.takeGoods = true;
                 list.takeGoods = true;
             }
             }
@@ -661,14 +661,14 @@ const _setExchangeDetailData = (data) => {
                 send: true,
                 send: true,
                 doubt: true,
                 doubt: true,
                 auditSuccess: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`
             });
             });
             break;
             break;
         case 40:
         case 40:
             Object.assign(list, {
             Object.assign(list, {
                 finish: true,
                 finish: true,
                 auditSuccess: true,
                 auditSuccess: true,
-                view: `//www.yohobuy.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`
             });
             });
             break;
             break;
         case 91:
         case 91:

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

@@ -157,6 +157,7 @@
                     <div class="evidence">
                     <div class="evidence">
                         {{# evidenceImages}}
                         {{# evidenceImages}}
                         <img src="{{image . 70 90}}">
                         <img src="{{image . 70 90}}">
+                        <img src="{{image . 70 90}}">
                         {{/ evidenceImages}}
                         {{/ evidenceImages}}
                     </div>
                     </div>
                 </div>
                 </div>

@@ -49,27 +49,25 @@
                 </div>
                 </div>
             </li>
             </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>
         </ul>
 
 

@@ -201,6 +201,10 @@
 
 
         .good-name {
         .good-name {
             margin-bottom: 8px;
             margin-bottom: 8px;
+            display: -webkit-box;
+            overflow: hidden;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
         }
         }
     }
     }
 
 
@@ -235,6 +239,7 @@
             float: left;
             float: left;
             width: 70px;
             width: 70px;
             height: 90px;
             height: 90px;
+            margin-right: 10px;
 
 
         }
         }