Merge branch 'test' into dev

pages/recordDetail/index.vue

@@ -62,14 +62,17 @@
               <span v-if="detailInfo.address">{{ detailInfo.address }}</span>
             </li>
             <li>
-              <label>运单号：</label>
-              <span v-if="detailInfo.trackingNo">
-                {{ detailInfo.trackingNo }}
-                <span class="record-detail__copy-btn" @click="onCopy(detailInfo.trackingNo)"
-                  ><i class="iconfont icon-fuzhi"></i>复制
+              <label>运单信息：</label>
+              <div class="record-detail__tracking-info">
+                <p>{{ detailInfo.trackingCompany }}</p>
+                <span v-if="detailInfo.trackingNo">
+                  {{ detailInfo.trackingNo }}
+                  <span class="record-detail__copy-btn" @click="onCopy(detailInfo.trackingNo)"
+                    ><i class="iconfont icon-fuzhi"></i>复制
+                  </span>
                 </span>
-              </span>
-              <span v-else class="record-detail__tracking-msg">您的收货信息已提交，稍后可查看运单号</span>
+                <span v-else class="record-detail__tracking-msg">您的收货信息已提交，稍后可查看运单号</span>
+              </div>
             </li>
           </ul>
         </template>
@@ -199,8 +202,9 @@ export default {
 .record-detail {
   height: 100%;
   width: 100%;
-  padding: 16px 28px;
+  padding: 16px 28px 36px;
   background-color: #fff;
+  overflow: auto;
   label {
     font-size: 13px;
     font-weight: 500;
@@ -235,6 +239,13 @@ export default {
       }
     }
   }
+  &__tracking-info {
+    display: flex;
+    flex-direction: column;
+    p{
+      margin-bottom: 15px;
+    }
+  }
   &__info-img {
     width: 84px;
     height: 84px;
@@ -260,6 +271,7 @@ export default {
     display: flex;
     flex-direction: column;
   }
+  &
   &__code-text {
     height: 18px;
     font-size: 12px;