Commit 30907f37 by 赖慧粮

Merge branch 'test' into dev

parents c8a5ce07 1cd201b0
...@@ -62,14 +62,17 @@ ...@@ -62,14 +62,17 @@
<span v-if="detailInfo.address">{{ detailInfo.address }}</span> <span v-if="detailInfo.address">{{ detailInfo.address }}</span>
</li> </li>
<li> <li>
<label>运单号:</label> <label>运单信息:</label>
<span v-if="detailInfo.trackingNo"> <div class="record-detail__tracking-info">
{{ detailInfo.trackingNo }} <p>{{ detailInfo.trackingCompany }}</p>
<span class="record-detail__copy-btn" @click="onCopy(detailInfo.trackingNo)" <span v-if="detailInfo.trackingNo">
><i class="iconfont icon-fuzhi"></i>复 {{ detailInfo.trackingNo }}
<span class="record-detail__copy-btn" @click="onCopy(detailInfo.trackingNo)"
><i class="iconfont icon-fuzhi"></i>复
</span>
</span> </span>
</span> <span v-else class="record-detail__tracking-msg">您的收货信息已提交,稍后可查看运单号</span>
<span v-else class="record-detail__tracking-msg">您的收货信息已提交,稍后可查看运单号</span> </div>
</li> </li>
</ul> </ul>
</template> </template>
...@@ -199,8 +202,9 @@ export default { ...@@ -199,8 +202,9 @@ export default {
.record-detail { .record-detail {
height: 100%; height: 100%;
width: 100%; width: 100%;
padding: 16px 28px; padding: 16px 28px 36px;
background-color: #fff; background-color: #fff;
overflow: auto;
label { label {
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
...@@ -235,6 +239,13 @@ export default { ...@@ -235,6 +239,13 @@ export default {
} }
} }
} }
&__tracking-info {
display: flex;
flex-direction: column;
p{
margin-bottom: 15px;
}
}
&__info-img { &__info-img {
width: 84px; width: 84px;
height: 84px; height: 84px;
...@@ -260,6 +271,7 @@ export default { ...@@ -260,6 +271,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
&
&__code-text { &__code-text {
height: 18px; height: 18px;
font-size: 12px; font-size: 12px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment