caoliancun/LSM_OIL_SITE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

星油云站更新

Browse Source
This commit is contained in:
caoliancun
2022-03-02 16:22:09 +08:00
parent d5eea27607
commit bb229d2eb3
71 changed files with 6188 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
packageOrders/pages/orderList/dailyOrder/dailyOrder.vue
View File

@@ -6,18 +6,17 @@
</cu-custom>
<view class="fixed-t">
<view class="flex bg-main-oil padding solid-bottom">
<view class="flex-sub">
<!-- <view class="flex-sub">
订单来源
</view>
<view class="flex-treble text-right">
</view> -->
<!-- <view class="flex-treble text-right">
<picker @change="pickSource" mode="selector" :value="indexSource" :range="sources">
<view class="picker">
{{activeSource}}
<text class="cuIcon-right"></text>
</view>
</picker>
</view>
</view> -->
</view>
<scroll-view scroll-x class="bg-white nav">
<view class="flex text-center">
@@ -26,7 +25,7 @@
</view>
</scroll-view>
</view>
<view class="placeholder-hidden">
<!-- <view class="placeholder-hidden">
<view class="flex bg-main-oil padding solid-bottom">
<view class="flex-sub">
订单来源
@@ -37,21 +36,21 @@
{{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="tabSelect" :data-id="index">{{item}}</view>
v-for="(item,index) in tabList" :key="index" @tap="" :data-id="index">{{item}}</view>
</view>
</scroll-view>
</view>
<view class="padding　 padding-bottom-0">
<view v-show="TabCur==0" class="order-list">
<view 　v-for="item in allOrder" v-if="allOrder.length" :key="item.orderID">
<OrderItem class="cu-list order-item menu-avatar comment" :item="item" />
</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'>
<OrderItem :indexSource="indexSource" class="cu-list order-item menu-avatar comment" :item="item" />
</view>
<view v-if="allOrder.length<1">
<Empty />
@@ -61,8 +60,8 @@
</view>
</view>
<view v-show="TabCur==1" class="order-list">
<view v-for="item in payingOrder" v-if="payingOrder.length" :key="item.orderID">
<OrderItem class="cu-list order-item menu-avatar comment" :item="item" />
<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 />
@@ -71,9 +70,9 @@
<uni-load-more :status="load.loadStatus2"></uni-load-more>
</view>
</view>
<view v-show="TabCur==2" class="order-list">
<view 　 v-for="item in finishedOrder" v-if="finishedOrder.length" :key="item.orderID">
<OrderItem class="cu-list order-item menu-avatar comment" :item="item" />
<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 />
@@ -83,8 +82,8 @@
</view>
</view>
<view v-show="TabCur==3" class="order-list">
<view 　 v-for="item in refundOrder" v-if="refundOrder.length" :key="item.orderID">
<OrderItem class="cu-list order-item menu-avatar comment" :item="item" />
<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 />
@@ -99,6 +98,7 @@
<script>
import cloudSiteApi from '@/api/cloud-site.js'
import oliSiteApi from '@/api/oli-site.js'
import OrderItem from '@/packageOrders/components/order-item.vue'
import UniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
@@ -110,11 +110,14 @@
},
data() {
return {
// activeSource: '网页版',
indexSource: uni.getStorageSync('orderType') != null ? uni.getStorageSync('orderType') : 0,
startTime:'',
endTime:"",
activeSource: '小程序',
indexSource: 1,
sources: ['网页版', '小程序'],
tabList: [
'全部', '待支付', '已支付', '退款'
'全部','待支付', '已支付 ', '退款'
],
TabCur: 0,
pageNumber: 1,
@@ -134,14 +137,14 @@
},
allOrder: [],
finishedOrder: [],
payingOrder: [],
refundOrder: [],
payingOrder: [],
loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
isLoadMore: false, //是否加载中
pageNumber1: 1,
pageNumber2: 1,
pageNumber3: 1,
pageNumber4: 1,
pageNumber1: 0,
pageNumber2: 0,
pageNumber3: 0,
pageNumber4: 0,
load: {
isLoadMore1: false,
loadStatus1: 'loading',
@@ -156,59 +159,77 @@
},
created() {
this.loadList(-3, this.pageNumber1)
this.loadList(0, this.pageNumber2)
this.loadList(1, this.pageNumber3)
this.loadList(-2, this.pageNumber4)
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')
},
computed: {
createTime() {
let today = new Date()
let time = today.toISOString().slice(0, 10) + ' 00:00:00'
return time
},
activeSource() {
console.log(this.indexSource)
return this.sources[this.indexSource]
}
onLoad() {
uni.setStorageSync('orderType', 1)
},
onReachBottom() { //上拉触底函数
// console.log('触底函数')
this.loadMoreOrder('onReachBottom')
},
methods: {
loadMoreOrder() {
getTime(){
let nowDate = new Date();
let year = nowDate.getFullYear();
let month = nowDate.getMonth() + 1 < 10 ? "0" + (nowDate.getMonth() + 1) : nowDate.getMonth() + 1;
let day = nowDate.getDate() < 10 ? "0" + nowDate.getDate() : nowDate.getDate();
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
},
loadMoreOrder(from) {
// console.log(from,'loadMoreOrder时间')
// <!-- 0 全部 1 待支付 2 已支付 3退款 -->
if (this.TabCur === 0) {
if (this.load.loadStatus1 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore1 = true
console.log('这里是0')
if (this.load.loadStatus3 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore3 = true
this.calcIstate(this.TabCur)
}
} else if (this.TabCur === 1) {
console.log('这里是1')
if (this.load.loadStatus2 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore2 = true
this.calcIstate(this.TabCur)
}
} else if (this.TabCur === 2) {
if (this.load.loadStatus3 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore3 = true
console.log('这里是2')
if (this.load.loadStatus1 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore1 = true
this.calcIstate(this.TabCur)
}
} else if (this.TabCur === 3) {
console.log('这里是3')
if (this.load.loadStatus4 != 'nomore') { //此处判断，上锁，防止重复请求
this.load.isLoadMore4 = true
this.calcIstate(this.TabCur)
}
}
},
tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
// console.log('tabSelect时间')
this.loadMoreOrder('tabSelect')
},
pickSource(e) {
this.indexSource = e.detail.value
console.log(e)
this.indexSource = parseInt( e.detail.value)
console.log(this.indexSource)
this.activeSource = this.sources[this.indexSource]
console.log(this.activeSource )
uni.setStorageSync('orderType', this.indexSource)
this.pageNumber1 = 1
this.pageNumber2 = 1
this.pageNumber3 = 1
this.pageNumber4 = 1
this.pageNumber1 = 0
this.pageNumber2 = 0
this.pageNumber3 = 0
this.pageNumber4 = 0
this.load.isLoadMore1 = false
this.load.loadStatus1 = 'load'
this.load.isLoadMore1 = false
@@ -223,57 +244,73 @@
this.payingOrder = []
this.calcIstate(this.TabCur)
},
tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
this.loadMoreOrder()
},
calcIstate(id) {
switch (id) {
case 0:
this.istate = -3
this.loadList(this.istate, this.pageNumber1)
this.loadList(this.istate, this.pageNumber3, 'calcIstate全部')
break
case 1:
this.istate = 0
this.loadList(this.istate, this.pageNumber2)
this.loadList(this.istate, this.pageNumber2, 'calcIstate待支付')
break
case 2:
this.istate = 1
this.loadList(this.istate, this.pageNumber3)
this.loadList(this.istate, this.pageNumber1, 'calcIstate已支付')
break
case 3:
this.istate = 1
this.loadList(this.istate, this.pageNumber4)
this.istate = -2
this.loadList(this.istate, this.pageNumber4, 'calcIstate退款')
break
}
},
loadList(istate, pageNumber) {
uni.setStorageSync('orderType', this.indexSource)
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支付成功 -3 查所有
pageIndex: pageNumber //类型：Number 必有字段 备注：查询第几页,默认一页10条
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) {
// 网页版
cloudSiteApi.getSiteOrder(data2).then(res => {
console.log(data2.istate, data2.pageIndex)
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 {
} 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'
@@ -283,7 +320,11 @@
}
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'
@@ -293,7 +334,10 @@
}
break
case 1:
this.finishedOrder = this.finishedOrder.concat(res.data)
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'
@@ -306,21 +350,27 @@
}
}
})
} else if (this.indexSource == 1) {
// 0待支付 1支付成功 -3 查所有
// 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
// 小程序
if (data2.istate == -3) {
data2.istate = ''
} else if (data2.istate == -2) {
data2.istate = 2
data2.istate = 3
}
data2.create_time = this.createTime
cloudSiteApi.getNewItemSiteOrder(data2).then(res => {
console.log(data2.istate, data2.pageIndex)
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 -3:
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
@@ -330,7 +380,11 @@
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
@@ -341,6 +395,9 @@
}
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
@@ -350,18 +407,21 @@
this.load.isLoadMore2 = false
}
break
case 1:
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 {
} else if (res.data.length == 10) {
this.pageNumber3++
this.load.isLoadMore3 = false
}
break
}
}
}
})
}