|
|
@@ -24,7 +24,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<template v-if="merchantType==10">
|
|
|
- <view class="li" v-for="(item,index) in info.pageData.list" :key="index" @click="detail(item)">
|
|
|
+ <view class="li" v-for="(item,index) in pageDataList" :key="index" @click="detail(item)">
|
|
|
<view class="left">
|
|
|
<text>{{item.playDate}}
|
|
|
{{item.playTime}}出发/{{item.orderType==2?'包船':'拼船'}}/{{item.boatNo||'拼团中'}}</text>
|
|
|
@@ -37,7 +37,7 @@
|
|
|
</view>
|
|
|
</template>
|
|
|
<template v-if="merchantType==4">
|
|
|
- <view class="li" v-for="(item,index) in info.merchantOrderDTOS" :key="index" @click="detail(item)">
|
|
|
+ <view class="li" v-for="(item,index) in merchantOrderDTOSList" :key="index" @click="detail(item)">
|
|
|
<view class="left">
|
|
|
<text>{{item.productName}}</text>
|
|
|
<text>{{item.orderTime}}</text>
|
|
|
@@ -75,7 +75,9 @@
|
|
|
|
|
|
},
|
|
|
merchantId: uni.getStorageSync('merchantId'),
|
|
|
- merchantType: uni.getStorageSync('merchantType'),
|
|
|
+ merchantType: uni.getStorageSync('merchantType'),
|
|
|
+ pageDataList:[],
|
|
|
+ merchantOrderDTOSList:[],
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
|
@@ -114,7 +116,9 @@
|
|
|
}).then(res => {
|
|
|
console.log(res.data)
|
|
|
if (res.data.code === 0) {
|
|
|
- this.info = res.data.data;
|
|
|
+ this.info = res.data.data;
|
|
|
+ this.pageDataList = this.info.pageData.list;
|
|
|
+ this.merchantOrderDTOSList = this.info.merchantOrderDTOS;
|
|
|
} else {
|
|
|
this.info = {
|
|
|
pageData: {
|
|
|
@@ -124,7 +128,9 @@
|
|
|
paymentCount: 0,
|
|
|
refundAmount: 0,
|
|
|
refundCount: 0,
|
|
|
- }
|
|
|
+ };
|
|
|
+ this.pageDataList = [];
|
|
|
+ this.merchantOrderDTOSList = [];
|
|
|
}
|
|
|
})
|
|
|
},
|
