This commit is contained in:
caolc
2023-05-06 11:18:15 +08:00
parent 8874f28bd4
commit fea1c29b96
10 changed files with 303 additions and 303 deletions

View File

@@ -20,78 +20,24 @@
</view>
<scroll-view scroll-x class="bg-white nav">
<view class="flex text-center">
<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''"
v-for="(item,index) in tabList" :key="index" @tap="tabSelect" :data-id="index">{{item}}</view>
<view class="cu-item flex-sub" :class="getData.params.istate===tabList[index].value?'text-orange cur':''"
v-for="(item,index) in tabList" :key="index" @tap="tabSelect(item.value)" :data-id="index">{{item.label}}</view>
</view>
</scroll-view>
</view>
<!-- <view class="placeholder-hidden">
<view class="flex bg-main-oil padding solid-bottom">
<view class="flex-sub">
订单来源
</view>
<view class="flex-treble text-right">
<picker @change="pickSource" mode="selector" :value="indexSource" :range="sources">
<view class="picker">
{{sources[indexSource]}}
<text class="cuIcon-right"></text>
</view>
</picker>
</view>
</view>
<scroll-view scroll-x class="bg-white nav">
<view class="flex text-center">
<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''"
v-for="(item,index) in tabList" :key="index" @tap="" :data-id="index">{{item}}</view>
</view>
</scroll-view>
</view> -->
</view>
<view class="padding  padding-bottom-0" style="padding-top: 200upx;">
<!-- 0 全部 1 待支付 2 已支付 3退款 -->
<view v-show="TabCur==2" class="order-list">
<view  v-for="(item,index) in allOrder" v-if="allOrder.length" :key='index'>
<view class="order-list">
<view  v-for="(item,index) in orderList" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="allOrder.length<1">
<view >
<Empty />
</view>
<view v-show="load.isLoadMore1">
<!-- <view v-show="load.isLoadMore1">
<uni-load-more :status="load.loadStatus1"></uni-load-more>
</view>
</view>
<view v-show="TabCur==1" class="order-list">
<view v-for="(item,index) in payingOrder" v-if="payingOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="payingOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore2">
<uni-load-more :status="load.loadStatus2"></uni-load-more>
</view>
</view>
<view v-show="TabCur==0" class="order-list">
<view   v-for="(item,index) in finishedOrder" v-if="finishedOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="finishedOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore3">
<uni-load-more :status="load.loadStatus3"></uni-load-more>
</view>
</view>
<view v-show="TabCur==3" class="order-list">
<view   v-for="(item,index) in refundOrder" v-if="refundOrder.length" :key='index'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="refundOrder.length<1">
<Empty />
</view>
<view v-show="load.isLoadMore4">
<uni-load-more :status="load.loadStatus4"></uni-load-more>
</view>
</view>
</view> -->
</view>
</view>
</view>
</template>
@@ -109,15 +55,34 @@
UniLoadMore
},
data() {
return {
return {
orderList:[],
getData: {
pageSize: 15,
currentPage: 1,
params: {
istate:''
}
},
startTime:'',
endTime:"",
activeSource: '小程序',
indexSource: 1,
sources: ['网页版', '小程序'],
tabList: [
'全部','待支付', '已支付 ', '退款'
{
label:'全部',
value:'',
},{
label:'待支付',
value:'0'
}, {
label:'已支付',
value:'1'
}, {
label:'退款',
value:'3'
}
],
TabCur: 0,
pageNumber: 1,
@@ -159,18 +124,35 @@
},
created() {
this.getTime()
this.loadList(-3, this.pageNumber1, 'created')
this.loadList(0, this.pageNumber2, 'created')
this.loadList(1, this.pageNumber3, 'created')
this.loadList(-2, this.pageNumber4, 'created')
// this.getTime()
// this.loadList(0, this.pageNumber2, 'created')
// this.loadList(1, this.pageNumber3, 'created')
// this.loadList(-2, this.pageNumber4, 'created')
},
onLoad() {
onLoad(e) {
let {type=null} = e;
console.log(type,type=='today','=============')
if( type=='today'){
console.log(type,'today')
this.getTime()
}
this.loadList()
console.log(type,'*******');
uni.setStorageSync('orderType', 1)
},
onReachBottom() { //上拉触底函数
// console.log('触底函数')
this.loadMoreOrder('onReachBottom')
console.log('触底函数');
this.getData.currentPage+=1;
this.loadList()
// this.loadMoreOrder('onReachBottom')
},
watch:{
// getData:{
// handler(){
// this.loadList()
// },
// deep:true
// }
},
methods: {
getTime(){
@@ -181,8 +163,8 @@
let hr = nowDate.getHours()
let mf = nowDate.getMinutes() < 10 ? '0' + nowDate.getMinutes() : nowDate.getMinutes()
let ss =nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() :nowDate.getSeconds()
this.startTime = year + "-" + month + "-" + day+" " + '00:00:00';
this.endTime = year + "-" + month + "-" + day+" " +hr+':'+mf+':'+ss
this.getData.params.startTime = year + "-" + month + "-" + day+" " + '00:00:00';
this.getData.params.endTime = year + "-" + month + "-" + day+" " +hr+':'+mf+':'+ss
},
loadMoreOrder(from) {
// console.log(from,'loadMoreOrder时间')
@@ -214,10 +196,13 @@
}
},
tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
this.getData.currentPage = 1
this.getData.params.istate = e;
this.loadList()
// this.TabCur = e.currentTarget.dataset.id;
// this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
// console.log('tabSelect时间')
this.loadMoreOrder('tabSelect')
// this.loadMoreOrder('tabSelect')
},
pickSource(e) {
console.log(e)
@@ -264,167 +249,173 @@
break
}
},
loadList(istate, pageNumber, from) {
// console.log(istate)
// console.log(pageNumber)
// console.log(from)
console.log( this.startTime)
console.log( this.endTime)
let that = this
const data2 = {
istate: istate, //类型Number 必有字段 备注:订单状态 0待支付 1支付成功 查所有传 ''
pageIndex: pageNumber ,//类型Number 必有字段 备注:查询第几页,默认一页10条
// startTime: that.startTime,
// endTime: that.endTime
}
console.log('这里是this.indexSource',this.indexSource)
if (this.indexSource == 0) {
// 网页版
if (data2.istate == -3) {
data2.istate = ''
} else if (data2.istate == -2) {
data2.istate = 3
}
console.log(data2)
oliSiteApi.getNewItemSiteOrder(data2).then(res => {
console.log(res)
console.log('-----------------------------------------')
// console.log('参数', data2.istate, '页码', data2.pageIndex, '来源', from)
if (res.code === 20000) {
switch (istate) {
case -3:
console.log('获取全部')
console.log(res.data)
console.log(this.allOrder)
this.allOrder = this.allOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore1 = true
this.load.loadStatus1 = 'nomore'
} else if (res.data.length == 10) {
this.pageNumber1++
this.load.isLoadMore1 = false
}
break
case -2:
console.log('退款')
console.log(res.data)
console.log(this.allOrder)
this.refundOrder = this.refundOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore4 = true
this.load.loadStatus4 = 'nomore'
} else {
this.pageNumber4++
this.load.isLoadMore4 = false
}
break
case 0:
console.log('待支付')
console.log(res.data)
console.log(this.allOrder)
this.payingOrder = this.payingOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore2 = true
this.load.loadStatus2 = 'nomore'
} else {
this.pageNumber2++
this.load.isLoadMore2 = false
}
break
case 1:
console.log('已支付')
console.log(res.data)
console.log(this.allOrder)
this.finishedOrder = this.finishedOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore3 = true
this.load.loadStatus3 = 'nomore'
} else {
this.pageNumber3++
this.load.isLoadMore3 = false
}
break
}
loadList() {
oliSiteApi.getNewItemSiteOrder(this.getData ).then(res=>{
if(res.code==20000){
if(this.getData.currentPage==1){
this.orderList = res.data.list
}else{
this.orderList = this.orderList.concat(res.data.list)
}
})
} else if (this.indexSource == 1) {
// 0待支付 1已支付 -1支付失败 2已取消3已退款
// 小程序
if (data2.istate == -3) {
data2.istate = ''
} else if (data2.istate == -2) {
data2.istate = 3
}
console.log(data2)
oliSiteApi.getNewItemSiteOrder(data2).then(res => {
console.log(res)
console.log('+++++++++++++++++++++++++++++++++++++++++')
// console.log(data2.istate, data2.pageIndex)
if (res.code === 20000) {
switch (istate) {
case 1:
console.log('获取全部')
console.log(res.data)
console.log(this.allOrder)
console.log(res,'============')
})
// // console.log(istate)
// // console.log(pageNumber)
// // console.log(from)
// console.log( this.startTime)
// console.log( this.endTime)
// let that = this
// const data2 = {
// istate: istate, //类型Number 必有字段 备注:订单状态 0待支付 1支付成功 查所有传 ''
// pageIndex: pageNumber ,//类型Number 必有字段 备注:查询第几页,默认一页10条
// // startTime: that.startTime,
// // endTime: that.endTime
// }
// console.log('这里是this.indexSource',this.indexSource)
// if (this.indexSource == 0) {
// // 网页版
// if (data2.istate == -3) {
// data2.istate = ''
// } else if (data2.istate == -2) {
// data2.istate = 3
// }
// console.log(data2)
// oliSiteApi.getNewItemSiteOrder(data2).then(res => {
// // console.log('参数', data2.istate, '页码', data2.pageIndex, '来源', from)
// if (res.code === 20000) {
// switch (istate) {
// case -3:
// console.log('获取全部')
// console.log(res.data)
// console.log(this.allOrder)
// this.allOrder = this.allOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore1 = true
// this.load.loadStatus1 = 'nomore'
// } else if (res.data.length == 10) {
// this.pageNumber1++
// this.load.isLoadMore1 = false
// }
// break
// case -2:
// console.log('退款')
// console.log(res.data)
// console.log(this.allOrder)
// this.refundOrder = this.refundOrder.concat(res.data)
this.allOrder = this.allOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore1 = true
this.load.loadStatus1 = 'nomore'
} else {
this.pageNumber1++
this.load.isLoadMore1 = false
}
break
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore4 = true
// this.load.loadStatus4 = 'nomore'
// } else {
// this.pageNumber4++
// this.load.isLoadMore4 = false
// }
// break
// case 0:
// console.log('待支付')
// console.log(res.data)
// console.log(this.allOrder)
// this.payingOrder = this.payingOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore2 = true
// this.load.loadStatus2 = 'nomore'
// } else {
// this.pageNumber2++
// this.load.isLoadMore2 = false
// }
// break
// case 1:
// console.log('已支付')
// console.log(res.data)
// console.log(this.allOrder)
// this.finishedOrder = this.finishedOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore3 = true
// this.load.loadStatus3 = 'nomore'
// } else {
// this.pageNumber3++
// this.load.isLoadMore3 = false
// }
// break
// }
// }
// })
// } else if (this.indexSource == 1) {
// // 0待支付 1已支付 -1支付失败 2已取消3已退款
// // 小程序
// if (data2.istate == -3) {
// data2.istate = ''
// } else if (data2.istate == -2) {
// data2.istate = 3
// }
// console.log(data2)
// oliSiteApi.getNewItemSiteOrder(data2).then(res => {
// console.log(res)
// console.log('+++++++++++++++++++++++++++++++++++++++++')
// // console.log(data2.istate, data2.pageIndex)
// if (res.code === 20000) {
// switch (istate) {
// case 1:
// console.log('获取全部')
// console.log(res.data)
// console.log(this.allOrder)
// this.allOrder = this.allOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore1 = true
// this.load.loadStatus1 = 'nomore'
// } else {
// this.pageNumber1++
// this.load.isLoadMore1 = false
// }
// break
case -2:
console.log('退款')
console.log(res.data)
console.log(this.allOrder)
this.refundOrder = this.refundOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore4 = true
this.load.loadStatus4 = 'nomore'
} else {
this.pageNumber4++
this.load.isLoadMore4 = false
}
break
case 0:
console.log('待支付')
console.log(res.data)
console.log(this.allOrder)
this.payingOrder = this.payingOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore2 = true
this.load.loadStatus2 = 'nomore'
} else {
this.pageNumber2++
this.load.isLoadMore2 = false
}
break
case -3:
console.log('全部')
console.log(res.data)
console.log(this.allOrder)
// case -2:
// console.log('退款')
// console.log(res.data)
// console.log(this.allOrder)
// this.refundOrder = this.refundOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore4 = true
// this.load.loadStatus4 = 'nomore'
// } else {
// this.pageNumber4++
// this.load.isLoadMore4 = false
// }
// break
// case 0:
// console.log('待支付')
// console.log(res.data)
// console.log(this.allOrder)
// this.payingOrder = this.payingOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore2 = true
// this.load.loadStatus2 = 'nomore'
// } else {
// this.pageNumber2++
// this.load.isLoadMore2 = false
// }
// break
// case -3:
// console.log('全部')
// console.log(res.data)
// console.log(this.allOrder)
this.finishedOrder = this.finishedOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
this.load.isLoadMore3 = true
this.load.loadStatus3 = 'nomore'
} else if (res.data.length == 10) {
this.pageNumber3++
this.load.isLoadMore3 = false
}
break
}
}
})
}
// this.finishedOrder = this.finishedOrder.concat(res.data)
// if (res.data.length < 10) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
// this.load.isLoadMore3 = true
// this.load.loadStatus3 = 'nomore'
// } else if (res.data.length == 10) {
// this.pageNumber3++
// this.load.isLoadMore3 = false
// }
// break
// }
// }
// })
// }
}
}
}