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

@@ -26,7 +26,13 @@ const getMeThumb = () => {
         cache: true,
         cache: true,
         code: 200
         code: 200
     }).then(result => {
     }).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;
     });
     });
 };
 };
 
 

@@ -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.yohoblk.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${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.yohoblk.com/me/order/detail?code=${data.orderCode}`;
+                list.view = `//www.yohoblk.com/me/order/detail/?orderCode=${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.yohoblk.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             });
             break;
             break;
         case 40:
         case 40:
             Object.assign(list, {
             Object.assign(list, {
                 finish: true,
                 finish: true,
                 auditSuccess: true,
                 auditSuccess: true,
-                view: `//www.yohoblk.com/me/order/detail?code=${data.orderCode}`
+                view: `//www.yohoblk.com/me/order/detail/?orderCode=${data.orderCode}`
             });
             });
             break;
             break;
         case 91:
         case 91:

@@ -14,9 +14,11 @@
                         </li>
                         </li>
                     {{/each}}
                     {{/each}}
                 </ul>
                 </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>
             </div>
 
 
             {{!-- 右侧页面内容 --}}
             {{!-- 右侧页面内容 --}}

@@ -157,7 +157,6 @@
                     <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>

@@ -76,6 +76,7 @@
             .iconfont {
             .iconfont {
                 font-size: 12px;
                 font-size: 12px;
                 margin-right: 5px;
                 margin-right: 5px;
+                color: #219dd6;
             }
             }
         }
         }
     }
     }
@@ -203,7 +204,7 @@
             margin-bottom: 8px;
             margin-bottom: 8px;
             display: -webkit-box;
             display: -webkit-box;
             overflow: hidden;
             overflow: hidden;
-            -webkit-line-clamp: 2;
+            -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             -webkit-box-orient: vertical;
         }
         }
     }
     }