exchange

@@ -2,6 +2,7 @@
 {{> returns/returns-status}}
 
 <div class="exchange-detail-page" data-id="{{id}}">
+    <a href="/help?id=43" class="notice" target="_blank">换货须知</a>
     <div class="exchange-detail">
         {{#if audit}}
         <p class="state"><span class="iconfont">&#xe618;</span>换货申请审核中</p>
@@ -28,13 +29,8 @@
         {{/if}}
 
         <div class="way">
-
             {{#if takeGoods}}
-<<<<<<< HEAD
             <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"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
->>>>>>> 2673aeb43896d8f475f9e5d722a39214d6b8f888
             {{/if}}
 
             {{#if reminder}}

@@ -116,18 +116,6 @@
             margin-right: 5px;
         }
 
-        .modify-btn {
-            font-size: 12px;
-            float: right;
-            display: block;
-            height: 20px;
-            width: 40px;
-            line-height: 20px;
-            text-align: center;
-            margin-top: 10px;
-            border: 1px solid #eee;
-        }
-
         .address-detail {
             margin-bottom: 15px;
 
@@ -393,4 +381,18 @@
     .dist-item {
         padding: 5px;
     }
+
+    .notice {
+        width: 70px;
+        height: 24px;
+        line-height: 26px;
+        text-align: center;
+        font-size: 12px;
+        border: 1px solid #eee;
+        display: block;
+        cursor: pointer;
+        position: absolute;
+        top: 265px;
+        right: 55px;
+    }
 }