|
|
@@ -8,7 +8,7 @@
|
|
|
<view class="o-orderlist-card" v-for="item in orderList" :key="item.orderId"
|
|
|
@click="RouterUtils.to_page(`/pages/index/toBeUsed/index?orderId=${item.orderId}&orderType=${item.orderType}&isPayOrder=1`)">
|
|
|
<view class="o-order-name">
|
|
|
- <view class="order-name">{{ item.orderType == 5 ? '上课地点' : '场地' }}:{{ item.orderProInfoList[0].address || '--'
|
|
|
+ <view class="order-name" v-if="item?.orderProInfoList && item.orderProInfoList.length > 0">{{ item.orderType == 5 ? '上课地点' : '场地' }}:{{ item?.orderProInfoList[0].address || '--'
|
|
|
}}</view>
|
|
|
<!-- 待付款 -->
|
|
|
<view class="order-status" v-if="item.orderStatus == 0">待支付(剩余{{ item.downTime }})</view>
|
|
|
@@ -24,35 +24,35 @@
|
|
|
<view class="item-info">
|
|
|
<!-- 有保险 -->
|
|
|
<scroll-view class="scroll-view_H scroll-order" scroll-x="true"
|
|
|
- v-if="item.orderInsureList.length > 0">
|
|
|
+ v-if="item?.orderInsureList?.length > 0 && item?.orderProInfoList && item.orderProInfoList.length > 0">
|
|
|
<view class="scroll-view-item_H scroll-order-item">
|
|
|
<view class="item-order">
|
|
|
<view class="order-img">
|
|
|
<image :src="item.orderProInfoList[0].productImage" mode="">
|
|
|
</image>
|
|
|
</view>
|
|
|
- <view class="order-name textHidden">{{ item.orderProInfoList[0].productName }}</view>
|
|
|
+ <view class="order-name textHidden">{{ item?.orderProInfoList[0].productName }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="scroll-view-item_H scroll-order-item">
|
|
|
<view class="item-order">
|
|
|
<view class="order-img">
|
|
|
- <image :src="item.orderInsureList[0].productImage.split(',')[0]" mode="">
|
|
|
+ <image :src="item?.orderInsureList[0].productImage.split(',')[0]" mode="">
|
|
|
</image>
|
|
|
</view>
|
|
|
- <view class="order-name textHidden">{{ item.orderInsureList[0].productName }}</view>
|
|
|
+ <view class="order-name textHidden">{{ item?.orderInsureList[0].productName }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
<!-- 没保险 -->
|
|
|
<view class="item-order-single" v-else>
|
|
|
<view class="single-img">
|
|
|
- <image :src="item.orderProInfoList[0].productImage.split(',')[0]" mode=""></image>
|
|
|
+ <image :src="item?.orderProInfoList && item.orderProInfoList.length > 0 ? item?.orderProInfoList[0]?.productImage.split(',')[0] : ''" mode=""></image>
|
|
|
</view>
|
|
|
<view class="single-name">
|
|
|
- <view class="item-single-name textHidden" v-if="item.orderType != 1">{{
|
|
|
- item.orderProInfoList[0].productName }}</view>
|
|
|
- <view class="item-single-name" v-else>
|
|
|
+ <view class="item-single-name textHidden" v-if="item.orderType != 1 && item?.orderProInfoList && item.orderProInfoList.length > 0">{{
|
|
|
+ item?.orderProInfoList[0].productName }}</view>
|
|
|
+ <view class="item-single-name" v-else-if="item.orderType == 1 && item?.orderProInfoList">
|
|
|
<!-- {{ item.orderProInfoList[0].productName }} -->
|
|
|
<view class="textHidden" v-for="name in item.orderProInfoList" :key="name.id">{{
|
|
|
name.productName }}</view>
|
|
|
@@ -62,16 +62,16 @@
|
|
|
</view>
|
|
|
<view class="order-data">
|
|
|
<view class="order-price"><text class="mini-text">¥</text>{{ item.price.toFixed(2) }}</view>
|
|
|
- <view class="order-num">共{{ item.orderProInfoList.length }}件</view>
|
|
|
+ <view class="order-num">共{{ item?.orderProInfoList?.length || 0 }}件</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="line"></view>
|
|
|
<!-- 待付款 -->
|
|
|
<view class="o-order-btn">
|
|
|
- <view class="cancel-btn" v-if="item.orderStatus == 0" @click.stop="cancelOrder(item)">取消订单</view>
|
|
|
- <view class="pay-btn" v-if="item.orderStatus == 0" @click.stop="submitPay(item)">付款</view>
|
|
|
+ <view class="cancel-btn" v-if="item?.orderStatus == 0" @click.stop="cancelOrder(item)">取消订单</view>
|
|
|
+ <view class="pay-btn" v-if="item?.orderStatus == 0" @click.stop="submitPay(item)">付款</view>
|
|
|
<!-- 售后/退款 -->
|
|
|
- <view class="pay-btn" v-if="item.orderStatus == 2&&item.orEvaluate==0&&item.orderType!=3&&item.orderType!=4"
|
|
|
+ <view class="pay-btn" v-if="item?.orderStatus == 2&&item.orEvaluate==0&&item.orderType!=3&&item.orderType!=4 && item?.orderProInfoList && item.orderProInfoList.length > 0"
|
|
|
@click.stop="RouterUtils.to_page(`/pages/index/writeComments/index?siteId=${item.addressSiteId}&orderId=${item.orderId}&siteName=${item.orderProInfoList[0].address}`)">
|
|
|
评价</view>
|
|
|
<!-- 已使用 -->
|
|
|
@@ -79,7 +79,7 @@
|
|
|
<view class="pay-btn" v-if="selected == 4">凭证</view>
|
|
|
</view>
|
|
|
<!-- 待使用 -->
|
|
|
- <view class="o-order-tips" v-if="item.orderStatus == 1&&item.orderType != 3&&item.orderType != 4">
|
|
|
+ <view class="o-order-tips" v-if="item.orderStatus == 1&&item.orderType != 3&&item.orderType != 4 && item?.orderProInfoList && item.orderProInfoList.length > 0">
|
|
|
<text v-if="item.orderProInfoList[0].frameTimeStr&&item.orderProInfoList[0].frameTimeStr!='00:00-00:00'">限{{ item.orderProInfoList[0].frameTimeStr }}使用,过期作废</text>
|
|
|
<text v-if="item.earlyRefundTime">请按时到场,退款需提前{{ item.earlyRefundTime }}分钟</text>
|
|
|
</view>
|
|
|
@@ -230,7 +230,8 @@ const getOrderList = () => {
|
|
|
startCountdown(item);
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
+ console.log(orderList.value, '订单列表');
|
|
|
+
|
|
|
})
|
|
|
}
|
|
|
// 倒计时
|