|
@@ -45,14 +45,18 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="msg-list">
|
|
<view class="msg-list">
|
|
|
<view class="label">地址信息</view>
|
|
<view class="label">地址信息</view>
|
|
|
- <view class="value">{{ data.fullAddress }}<block v-if="!$util.isEmpty(data.showAddress)">（{{data.showAddress}}）</block></view>
|
|
|
|
|
|
|
+ <view class="value">
|
|
|
|
|
+ <view style="text-align:right;">{{ data.address+data.floor }}</view>
|
|
|
|
|
+ <view v-if="data.fullAddress!=data.showAddress && data.showAddress!=''" style="color:#a7a0a0;text-align:right;">{{data.showAddress}}</view>
|
|
|
|
|
+ </view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="order-msg-blo">
|
|
<view class="order-msg-blo">
|
|
|
<view class="msg-list">
|
|
<view class="msg-list">
|
|
|
- <view class="label">送达时间</view>
|
|
|
|
|
- <view v-if="data.reachDate == '0000-00-00'" class="value"></view>
|
|
|
|
|
- <view v-else class="value">{{ data.reachDate ? data.reachDate+' '+reachPeriodInfo : '' }}</view>
|
|
|
|
|
|
|
+ <view class="label">配送时间</view>
|
|
|
|
|
+ <view class="value">
|
|
|
|
|
+ {{ data.reachDate ? data.reachDate : '' }} {{data.reachPeriod?data.reachPeriod:''}}
|
|
|
|
|
+ </view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="msg-list">
|
|
<view class="msg-list">
|
|
|
<view class="label">贺卡内容</view>
|
|
<view class="label">贺卡内容</view>
|
