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

63
packageOrders/components/order-item.vue
View File

@@ -1,58 +1,56 @@
// 可供选择的订单
// 开票列表
<template>
<view class="cu-item radius shadow margin-bottom ">
<view class="cu-item showboxisngs radius shadow margin-bottom ">
<view class="cu-avatar text-sl" :style="'background-image:url('+baseURL+'static/img/qr-icon.png)'"></view>
<!-- <image class="pay-status" :src="baseURL+'static/img/oil-unfinished.png'" alt /> -->
<view class="cu-avatar text-sl" v-if="item.sourceType==='3'" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='4'||item.sourceType==='6'" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='5'" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<!-- <view class="cu-avatar text-sl" v-if="item.createSource==='3'" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.createSource==='4'||item.createSource==='6'" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.createSource==='5'" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view> -->
<view class="content">
<view class=" solid-bottom padding-bottom-sm">
<view class="flex-treble" @tap="copyId(item.orderID)">
{{item.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text>
<view class="flex-treble" @tap="copyId(item.orderSerialNumber)">
{{item.orderSerialNumber}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text>
</view>
<view class="flex-sub text-right cuIcon-right" @tap="toDetails(item.orderID)">
<view class="flex-sub text-right cuIcon-right" @tap="toDetails(item.id)">
</view>
</view>
<view class=" text-content text-df">
<text class="lin-h-2">
{{item.oilSiteName}}
{{item.siteName}}
</text>
</view>
<view class="text-sm " @tap="toDetails(item.orderID)">
<view class="text-sm " @tap="toDetails(item.id)">
<view class="flex">
<view class="details">
<view class="top1 text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/oil-lf.png'" alt />
<text class="padding-left-xs padding-right-sm">
{{item.oilName}}
{{item.oilsCode}}
</text>
<text class=" text-lg text-bold text-red " v-if="item.vol">
{{item.vol|numberFilter}} L</text>
<text class=" text-lg text-bold text-red " v-if="item.volume">
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text>
</view>
<view class="bottom text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/oil-time.png'" alt />
<text class="padding-left-xs">
{{item.createDatetime.substring(0, 10)}}
{{item.createTime}}
</text>
</view>
<view class="bottom text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/mini-car.png'" alt />
<text class="padding-left-xs">
加油车牌： {{item.carNo|plateFilter}}
加油车牌： {{item.plateNumber|plateFilter}}
</text>
</view>
</view>
</view>
</view>
<view class="margin-top-sm flex justify-between" @tap="toDetails(item.orderID)">
<view class="margin-top-sm flex justify-between" @tap="toDetails(item.id)">
<view class="text-gray text-df">
{{item.createDatetime.substring(0,19)}}
{{item.createTime}}
</view>
<view>
<text class="text-red text-lg text-bold total-money">￥{{amount|numberFilter}}</text>
@@ -103,10 +101,12 @@
},
computed: {
istate() {
// console.log()
// console.log(this.item)
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
console.log(this.item.istate)
switch (parseInt(this.item.istate)) {
// console.log(this.item.orderStatus)
switch (parseInt(this.item.orderStatus)) {
// 网页版 0：待支付， 1：已支付 ，-1：支付失败 ，-2：退款，
//小程序 1：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
case 1:
@@ -121,15 +121,17 @@
return -2
}
} else {
return this.item.istate
return this.item.orderStatus
}
},
amount(){
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
return this.item.sitePrice*this.item.vol
let pyMoney = this.item.sitePriceAmount,
realMoney = (Math.round(pyMoney * 100) / 100).toFixed(2)
return realMoney
}else{
return this.item.realamount
return this.item.sitePriceAmount
}
}
},
@@ -181,11 +183,15 @@
}
},
numberFilter(value) {
value = value - 1 + 1
return value.toFixed(2)
// let number = (Math.round(value * 100) / 100).toFixed(2)
if(value){
let number = (Math.round(value * 100) / 100).toFixed(2)
return number
}
},
formatStr(value) {
let orderType = uni.getStorageSync('orderType')
console.log(value)
switch (parseInt(value)) {
// 0：待支付， 1：已支付 ，-1：支付失败 ，-2：退款，
case 1:
@@ -206,6 +212,9 @@
</script>
<style scoped>
.showboxisngs{
padding-left: 30rpx !important;
}
.lin-h-2 {
line-height: 2.6rem;
}

194
packageOrders/pages/orderList/OrderDetail/OrderDetail.vue
View File

@@ -5,13 +5,13 @@
<block slot="content">订单详情</block>
</cu-custom>
<view class="padding margin">
</view>
<view class="text-center margin-top icon-container">
<view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl headImg"></view>
<!-- <view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===4||orderItem.sourceType===6" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===5" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view> -->
</view>
<view class="radius margin margin-top bg-white padding-top padding">
<!-- sourceType 万金油3 老吕5 星油4/6 -->
@@ -19,20 +19,20 @@
<image size="20" v-else-if="orderItem.sourceType===3" :src="baseURL+'static/img/order-wjy.png'"></image>
<image size="20" v-else-if="orderItem.sourceType===5" :src="baseURL+'static/img/order-lv.png'"></image> -->
<view class="margin padding">
<view class="text-lg text-center" v-if="orderSource=='zy'">{{orderItem.istate|formatZyStr}}</view>
<view class="text-lg text-center orderText" style="font-weight:700;margin-top: 10rpx;" >{{orderItem.orderStatus|formatZyStr}}</view>
<view class="text-lg text-center" v-if="orderSource=='zy'">{{orderItem.orderStatus|formatZyStr}}</view>
<view class="text-lg text-center" v-else>{{istate|formatStr}}</view>
<view class="number text-xl text-center oil-main-color">￥{{displayMoney|numberFormat}}
</view>
<view class="number text-xl text-center oil-main-color">￥{{displayMoney|numberFormat}}</view>
</view>
<view class="margin-bottom-sm" @tap="copyId(orderItem.driverID,'司机编号')">
<view class="margin-bottom-sm" @tap="copyId(orderItem.customerId,'司机编号')">
司机编号
<text class="fr">{{orderItem.driverID}}<text :class="orderItem.driverID?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
<text class="fr">{{orderItem.customerId}}<text :class="orderItem.customerId?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
</text></text>
</view>
<view class="margin-bottom-sm">
加油司机
<view class="fr">
<text>{{orderItem.userName|nameFilter}}</text> <text class="padding-left-sm">{{orderItem.carNo|plateFilter}}
<text>{{orderItem.customerName|nameFilter}}</text> <text class="padding-left-sm">{{orderItem.plateNumber|plateFilter}}
</text>
</view>
@@ -46,7 +46,7 @@
<view class="margin-bottom-sm">
油枪油号
<text class="fr">{{orderItem.bar}}号枪{{orderItem.oilName||orderItem.oilCode}}</text>
<text class="fr">{{orderItem.oilsBar}}号枪{{orderItem.oilName||orderItem.oilsCode}}</text>
</view>
<!-- <view class="margin-bottom-sm">
加油总金额
@@ -55,11 +55,11 @@
</view> -->
<view class="margin-bottom-sm">
油机单价
<text class="fr">￥{{orderItem.sitePrice||orderItem.price}} / 升</text>
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
</view>
<view class="margin-bottom-sm">
加油升数
<text class="fr">{{orderItem.vol|numberFormat}} 升</text>
{{ orderItem.oilProductType=='GAS'?'加气重量':'加油升数' }}
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
</view>
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
油机总价
@@ -90,7 +90,7 @@
<view class="basis-sm">
加油站名称
</view>
<view class="basis-lg text-right text-cut">{{orderItem.oilSiteName}}</view>
<view class="basis-lg text-right text-cut">{{orderItem.siteName}}</view>
</view>
<view class="flex padding-bottom-sm">
@@ -101,34 +101,45 @@
</view>
</view>
<view class="radius bg-white margin margin-bottom-0 padding">
<view class="margin-bottom-sm" @tap="copyId(orderItem.orderID,'订单号')">
<view class="margin-bottom-sm" @tap="copyId(orderItem.orderSerialNumber,'订单号')">
订单号
<text class=" fr">{{orderItem.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<text class=" fr">{{orderItem.orderSerialNumber}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text></text>
</view>
<view class="margin-bottom-sm">
下单时间
<text class="fr">{{orderItem.createDatetime}}</text>
<text class="fr">{{orderItem.createTime}}</text>
</view>
<!-- <view class="margin-bottom-sm">
扣款时间
<text class="fr">{{orderItem.paydatetime}}</text>
</view> -->
<view class="padding-bottom-sm">
<!-- <view class="padding-bottom-sm">
开票状态
<text class="fr" v-if="formQr">未开票</text>
<text class="fr" v-else>{{orderItem.invoiceState|invoiceStateFormat}}</text>
</view>
</view> -->
<!-- <view class="margin-bottom-sm" v-if="orderItem.paydatetime">
支付时间
<text class="fr">{{orderItem.paydatetime}}</text>
</view>-->
</view>
<view class="padding">
<view class="radius bg-white margin margin-bottom-0 padding" v-if='orderItem.plateNumberImages'>
<view class="flex padding-bottom-sm">
<view class="basis-sm">
车辆照片
</view>
<view class="basis-lg text-right text-cut" @tap="showImg('car')">点击查看</view>
</view>
<view class="flex padding-bottom-sm">
<view class="basis-xs">
油机照片
</view>
<view class="basis-xl text-right text-cut" @tap="showImg('oli')">点击查看</view>
</view>
</view>
<view class="padding-lg padding-top-0 padding-bottom-xl">
<view class="padding-lg padding-top-40 padding-bottom-xl">
<button v-show="formQr" @tap="scanQr" class="bg-main-oil margin-bottom">
<text class="cuIcon-scan padding-right-xs"></text>
继续加油</button>
@@ -137,41 +148,63 @@
返回首页</button>
</view>
<u-popup v-model="show" mode="center" @close="close" >
<view style="width: 100%;height: 100%;">
<image :src="showUrl" style=" max-width: 100%;max-height:100%;display: block;object-fit: cove;" mode=""></image>
</view>
</u-popup>
</view>
</template>
<script>
import cloudSiteApi from '@/api/cloud-site.js'
import oilFnanceApi from '@/api/oil-finance.js'
export default {
data() {
return {
orderStatue:'下单成功',
show:false,
// orderId:'',
showUrl:'',
plateNumberImages:'',
refuellerImages:'',
orderId: uni.getStorageSync('orderId'),
formQr: uni.getStorageSync('formQr') ? true : false,
tempOrderInfo: uni.getStorageSync('tempOrderInfo'),
orderSource: uni.getStorageSync('orderSource'),
orderType: uni.getStorageSync('orderType'),
orderItem: {},
baseURL: this.global.baseURL
baseURL: this.global.baseURL,
zeyiType:0,
}
},
onUnload() {
uni.setStorageSync('orderSource', null)
this.clearStatus()
},
filters:{
company(e){
if(e) return e=='GAS'?'KG':'L';
},
},
computed: {
displayMoney(){
if(this.orderSource=='mpxoil'){
return this.orderItem.sitePrice*this.orderItem.vol
console.log('mpxoil')
return this.orderItem.sitePriceAmount
}else{
console.log('zeyi')
// return this.orderItem.price*this.orderItem.vol
return this.orderItem.realamount
console.log('这里是则一++++')
return this.orderItem.sitePriceAmount
}
},
istate() {
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
console.log(this.orderItem.istate)
switch (parseInt(this.orderItem.istate)) {
console.log(this.orderItem.OrderStatus)
switch (parseInt(this.orderItem.OrderStatus)) {
// 网页版 0：待支付， 1：已支付 ，-1：支付失败 ，-2：退款，
//小程序 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
case 1:
@@ -186,7 +219,7 @@
return -2
}
} else {
return this.orderItem.istate
return this.orderItem.OrderStatus
}
}
},
@@ -196,9 +229,28 @@
// this.getMPorder()
// return false
// }
console.log(this.tempOrderInfo)
if (this.orderSource === 'zy') {
// 则一
this.orderItem = this.tempOrderInfo
// let obj = {
// addres : this.tempOrderInfo.address ,
// oilsBar : this.tempOrderInfo.bar ,
// plateNumber :this.tempOrderInfo.carNo ,
// // coupon: 0
// createTime : this.tempOrderInfo.createDatetime,
// orderStatus : this.tempOrderInfo.istate,
// oilName : this.tempOrderInfo.oilName,
// siteName : this.tempOrderInfo.oilSiteName,
// Id : this.tempOrderInfo.orderID,
// // orderStatus: 1,
// payRealAmount : this.tempOrderInfo.realamount,
// customerName : this.tempOrderInfo.userName,
// volume :this.tempOrderInfo.vol,
// xoilDiscountAmount : this.tempOrderInfo.xoilDiscountAmount
// }
this.getZyPorder()
// this.orderItem = obj
} else if (this.orderSource === 'mpxoil') {
// 则一
this.getMPorder()
@@ -218,24 +270,56 @@
vol: this.tempOrderInfo.volume,
}
}
} else {
// G7
let _that = this
_that.zeyiType = 1
this.getOrderDetail()
}
},
onHide() {
this.clearStatus()
},
methods: {
close(){
console.log('关闭')
},
showImg(type){
if(type === 'car'){
console.log('1111111',type,this.plateNumberImages,this.showUrl)
this.showUrl =this.plateNumberImages
}else{
console.log('2222222',type,this.plateNumberImages,this.showUrl)
this.showUrl =this.refuellerImages
}
this.show = true
},
getMPorder() {
cloudSiteApi.getNewItemSiteOrderInfo({
console.log('这里是星油')
oilFnanceApi.getOrderInfo({
id: this.orderId
}).then(res => {
// 小程序点动感详情
console.log('这里是星油',res)
if (res.code === 20000) {
this.orderItem = res.data
this.plateNumberImages = res.data.plateNumberImages
this.refuellerImages = res.data.refuellerImages
console.log(this.orderItem)
}
})
},
getZyPorder(){
console.log('这里是则一')
console.log(this.tempOrderInfo.orderId)
oilFnanceApi.getOrderInfo({
id:this.tempOrderInfo.orderId
}).then(res => {
console.log('这里是则一',res)
// 小程序点动感详情
if (res.code === 20000) {
this.orderItem = res.data
console.log(this.orderItem)
}
})
},
@@ -274,8 +358,11 @@
},
getOrderDetail() {
cloudSiteApi.getSiteOrderById(this.orderId).then(res => {
console.log('这里是g7')
oilFnanceApi.getOrderInfo({id:this.orderId}).then(res => {
// G7
console.log('这里是g7',res)
console.log(res.data)
if (res.code === 20000) {
this.orderItem = res.data
}
@@ -283,6 +370,14 @@
}
},
filters: {
UnitPriceFormat(value){
console.log('++++++++++++++++++++',value)
if(value){
return value
} else{
return '--'
}
},
nameFilter(value) {
if (value) {
var arr = value.split('')
@@ -337,9 +432,30 @@
return '未使用'
}
},
numberFormats(value) {
if (value) {
console.log(value)
// let _thast = this.zeyiType
// console.log(_thast)
// if( _that.zeyiType == 1){
// return value
// }
let number = (Math.round(value * 100) / 100).toFixed(2)
return number
} else {
return '0.00'
}
},
numberFormat(value) {
if (value) {
return value.toFixed(2)
console.log(value)
// let _thast = this.zeyiType
// console.log(_thast)
// if( _that.zeyiType == 1){
// return value
// }
let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
return number
} else {
return '0.00'
}
@@ -381,4 +497,14 @@
margin-top: -64rpx;
z-index: 2;
}
.headImg{
background-image: url(../../../../packageQr/static/img/new_logo.png);
background-size: cover;
background-color: #fff;
}
.orderText{
font-weight: 700;
margin-bottom: 10rpx;
font-size: 36rpx;
}
</style>

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
}
}
}
})
}

167
packageOrders/pages/orderList/orderList.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,7 +36,6 @@
{{sources[indexSource]}}
<text class="cuIcon-right"></text>
</view>
</picker>
</view>
</view>
@@ -47,14 +45,11 @@
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">
</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">
@@ -65,7 +60,7 @@
</view>
</view>
<view v-show="TabCur==1" class="order-list">
<view v-for="item in payingOrder" v-if="payingOrder.length" :key="item.orderID">
<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">
@@ -75,8 +70,8 @@
<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">
<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">
@@ -87,7 +82,7 @@
</view>
</view>
<view v-show="TabCur==3" class="order-list">
<view 　 v-for="item in refundOrder" v-if="refundOrder.length" :key="item.orderID">
<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">
@@ -103,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'
@@ -114,11 +110,14 @@
},
data() {
return {
activeSource: '网页版',
indexSource: 0,
startTime:'',
endTime:"",
activeSource: '小程序',
indexSource: 1,
sources: ['网页版', '小程序'],
tabList: [
'全部', '待支付', '已支付', '退款'
'全部','待支付', '已支付 ', '退款'
],
TabCur: 0,
pageNumber: 1,
@@ -142,10 +141,10 @@
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',
@@ -160,35 +159,54 @@
},
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')
},
onLoad() {
uni.setStorageSync('orderType', 1)
},
onReachBottom() { //上拉触底函数
// console.log('触底函数')
this.loadMoreOrder('onReachBottom')
},
methods: {
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)
@@ -202,13 +220,16 @@
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
@@ -227,7 +248,7 @@
switch (id) {
case 0:
this.istate = -3
this.loadList(this.istate, this.pageNumber1, 'calcIstate全部')
this.loadList(this.istate, this.pageNumber3, 'calcIstate全部')
break
case 1:
this.istate = 0
@@ -235,7 +256,7 @@
break
case 2:
this.istate = 1
this.loadList(this.istate, this.pageNumber3, 'calcIstate已支付')
this.loadList(this.istate, this.pageNumber1, 'calcIstate已支付')
break
case 3:
this.istate = -2
@@ -244,17 +265,37 @@
}
},
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.getAllSiteOrder(data2).then(res => {
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
@@ -265,7 +306,11 @@
}
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'
@@ -275,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'
@@ -285,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'
@@ -305,13 +357,20 @@
if (data2.istate == -3) {
data2.istate = ''
} else if (data2.istate == -2) {
data2.istate = 2
data2.istate = 3
}
cloudSiteApi.getNewItemSiteOrder(data2).then(res => {
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
@@ -321,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
@@ -332,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
@@ -341,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
}
}
}
})
}