|
|
@ -62,18 +62,18 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view> |
|
|
|
<view> |
|
|
|
<!-- 配送地址 --> |
|
|
|
<!-- 配送地址 --> |
|
|
|
<view class='address' v-if="orderInfo.order_type == 0 && orderInfo.is_virtual != 1"> |
|
|
|
<view class='address' v-if="orderInfo.type!=2&&orderInfo.order_type == 0 && orderInfo.is_virtual != 1"> |
|
|
|
<view class='name'>{{orderInfo.real_name}}<view class='phone'>{{orderInfo.user_phone}}</view></view> |
|
|
|
<view class='name'>{{orderInfo.real_name}}<view class='phone'>{{orderInfo.user_phone}}</view></view> |
|
|
|
<view>{{orderInfo.user_address}}</view> |
|
|
|
<view>{{orderInfo.user_address}}</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- 地图 --> |
|
|
|
<!-- 地图 --> |
|
|
|
<view class="map acea-row row-between-wrapper" v-if="orderInfo.order_type == 1"> |
|
|
|
<view class="map acea-row row-between-wrapper" v-if="orderInfo.type!=2&&orderInfo.order_type == 1"> |
|
|
|
<view>自提地址信息</view> |
|
|
|
<view>自提地址信息</view> |
|
|
|
<view class="place t-color acea-row row-center-wrapper" @tap="showMaoLocation"> |
|
|
|
<view class="place t-color acea-row row-center-wrapper" @tap="showMaoLocation"> |
|
|
|
<text class="iconfont icon-weizhi"></text>查看位置 |
|
|
|
<text class="iconfont icon-weizhi"></text>查看位置 |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class='address' v-if="orderInfo.order_type == 1" style="margin-top: 0;"> |
|
|
|
<view class='address' v-if="orderInfo.type!=2&&orderInfo.order_type == 1" style="margin-top: 0;"> |
|
|
|
<view class='name'> |
|
|
|
<view class='name'> |
|
|
|
{{orderInfo.take.mer_take_name}} |
|
|
|
{{orderInfo.take.mer_take_name}} |
|
|
|
<text class='phone' @click="makePhone">{{orderInfo.take.mer_take_phone}}</text> |
|
|
|
<text class='phone' @click="makePhone">{{orderInfo.take.mer_take_phone}}</text> |
|
|
@ -81,7 +81,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="line2">{{orderInfo.take.mer_take_address}}</view> |
|
|
|
<view class="line2">{{orderInfo.take.mer_take_address}}</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-if="orderInfo.take" class="take-info"> |
|
|
|
<view v-if="orderInfo.type!=2&&orderInfo.take" class="take-info"> |
|
|
|
<view class="take-msg"> |
|
|
|
<view class="take-msg"> |
|
|
|
<view class="left"> |
|
|
|
<view class="left"> |
|
|
|
<view class="title"> |
|
|
|
<view class="title"> |
|
|
|