This commit is contained in:
@fawn-nine
2024-09-27 17:04:35 +08:00
parent eedeb5c37f
commit 806c08174f
10 changed files with 107 additions and 54 deletions

View File

@@ -3,7 +3,7 @@
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<z-nav-bar title="订单详情"></z-nav-bar>
<view class="adDefault" v-if="consigneeShow && orderContet.orderType == 'order'">
<view class="adDefault" v-if="consigneeShow && orderContet.orderType == 'order' && (orderContet.addressId != 0 && orderContet.addressId != null )">
<view class="defalTop">
<text class="userName">
{{orderContet.consignee.consigneeName}}
@@ -31,9 +31,10 @@
<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text>
<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
</view>
</view>
<template v-if="orderContet.orderType == 'order' && orderContet.goodsList.length > 0">
<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
@click="goDetail(item.productId)" v-if="orderContet.goodsList.length > 0">
@click="goDetail(item.productId)" >
<image :src="item.productImage" mode=""></image>
<view class="itemJian">
<view class="orderTitle">
@@ -51,21 +52,36 @@
<view class="orderOper" v-if="item.orderStatus == 3">
<view style="width: 100%; text-align: right;">
<view v-if="userRecordid == null" @click.stop="pingji(item.productId)" class="opCan" >评价</view>
<view v-else @click.stop="showZhuiping(item.productId)" class="opCan" >追评</view>
<!-- <view v-else @click.stop="showZhuiping(item.productId)" class="opCan" >追评</view> -->
</view>
</view>
</view>
<br clear="both">
</view>
<view class="orderContent" v-if="orderContet.products==''">
</view>
</template>
<template v-if="orderContet.orderType =='vip'">
<view class="orderContent" >
<image :src="'../../static/icon/oder_vip.png'" style="height: 150rpx;"></image>
<view class="itemJian">
<view class="orderTitle">
<text>VIP开通</text>
</view>
<!-- <view class="orderPrice" >
<text style="font-weight: bold;">{{orderContet.realMoney}}</text>
</view> -->
<br clear="both">
</view>
<br clear="both">
</view>
</template>
<view class="orderContent" v-if="orderContet.orderType == 'point'">
<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
<view class="itemJian">
<view class="orderTitle">
<text>充值</text>
</view>
<view class="orderPrice">
<!-- <view class="orderPrice" >
<text style="font-weight: bold;">{{orderContet.realMoney}}</text>
</view>
</view> -->
<br clear="both">
</view>
<br clear="both">
@@ -78,11 +94,11 @@
<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
<span></span>{{orderContet.shippingPrice}}
</view>
<view class="orderReal">
<!-- <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-</span>{{orderContet.coupon.couponAmount}}</b>
<b v-else style="color: #dd3c0c;"><span>-</span>0</b>
</view>
</view> -->
<view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span>
<b style="color: #dd3c0c;"><span></span>{{orderContet.realPrice}}</b>
@@ -602,7 +618,7 @@
} else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成'
}
if(this.orderContet.orderStatus >= 2 && this.orderContet.orderType == 'order'){
if(this.orderContet.orderStatus >= 2 && this.orderContet.orderType == 'order' && this.orderContet.expressOrders != null){
this.sheetList = this.orderContet.expressOrders
}else{
this.sheetList = []