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

更新

Browse Source
master
xiaozhiyong 2 months ago
parent b01b735ab8
commit 8b948056bf
2 changed files with 88 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 150
      packageOrders/pages/orderList/orderList.vue
  2. 9
      pages/login/posLogin/posLogin.vue

150
packageOrders/pages/orderList/orderList.vue
Unescape View File

@ -4,6 +4,7 @@
<block slot="backText">返回</block>
<block slot="content">加油记录</block>
</cu-custom>
<view class="fixed-t">
<view class="flex bg-main-oil padding solid-bottom">
<!-- <view class="flex-sub">
@ -24,8 +25,12 @@
v-for="(item,index) in tabList" :key="index" @tap="tabSelect" :data-id="index">{{item}}</view>
</view>
</scroll-view>
<view v-if="exportShow" style="margin-top: 16rpx;text-align: right;padding-right: 30rpx;">
<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
</view>
</view>
<!-- <view class="placeholder-hidden">
<view v-if="exportShow" style="padding: 24rpx;"></view>
<!-- <view class="placeholder-hidden">
<view class="flex bg-main-oil padding solid-bottom">
<view class="flex-sub">
订单来源
@ -46,12 +51,12 @@
</view>
</scroll-view>
</view> -->
<view v-if="exportShow">
<view style="padding: 30upx;"></view>
<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:315upx;right: 30upx;">
<button class="cu-btn bg-white" @click="orderExport">订单导出</button>
</view>
</view>
<!-- <view v-if="exportShow">
<view style="padding: 30rpx;"></view>
<view style="position: fixed;width: 750rpx;z-index: 5;text-align: right;top:315rpx;right: 30rpx;">
<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
</view>
</view> -->
<view class="padding　 padding-bottom-0" style="padding-top: 200upx;">
<!-- 0 全部 1 待支付 2 已支付 3退款 -->
@ -120,8 +125,9 @@
<view class="popup_card_from_item">
<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">结束时间：</view>
<view class="uni-list-cell-db">
<uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" />
<!-- <picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
<uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange"
:start="endStartDate" :end="endEndDate" />
<!-- <picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
<view class="uni-input">{{endDate}}</view>
</picker> -->
</view>
@ -152,13 +158,13 @@
data() {
return {
startTime:'',
endTime:"",
startTime: '',
endTime: "",
activeSource: '小程序',
indexSource: 1,
sources: ['网页版', '小程序'],
tabList: [
'全部','待支付', '已支付 ', '退款'
'全部', '待支付', '已支付 ', '退款'
],
TabCur: 0,
pageNumber: 1,
@ -199,15 +205,15 @@
params: {
siteId: uni.getStorageSync('oilSitePriceId'),
siteName: uni.getStorageSync('oilSitePriceName'),
email:'',
startTime:'',
endTime:''
email: '',
startTime: '',
endTime: ''
},
startDate:'',
endDate:'',
endStartDate:'',
endEndDate:'',
exportShow:false
startDate: '',
endDate: '',
endStartDate: '',
endEndDate: '',
exportShow: false
}
},
@ -225,36 +231,37 @@
'1689183774927818752',
'1689184331812888576',
'1689185023261741056',
'1782596400854310912'
]
var exportFields = exportList.filter((item) => {
return item == uni.getStorageSync('oilSitePriceId');
})
if(exportFields.length>0){
this.exportShow = true
}else{
this.exportShow = false
}
'1782596400854310912',
'1661994395596533760'
]
var exportFields = exportList.filter((item) => {
return item == uni.getStorageSync('oilSitePriceId');
})
if (exportFields.length > 0) {
this.exportShow = true
} else {
this.exportShow = false
}
},
onLoad() {
uni.setStorageSync('orderType', 1)
uni.setStorageSync('orderType', 1)
},
onReachBottom() { //上拉触底函数
// console.log('触底函数')
this.loadMoreOrder('onReachBottom')
},
methods: {
getTime(){
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
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时间')
@ -287,7 +294,7 @@
this.loadMoreOrder('tabSelect')
},
pickSource(e) {
this.indexSource = parseInt( e.detail.value)
this.indexSource = parseInt(e.detail.value)
this.activeSource = this.sources[this.indexSource]
uni.setStorageSync('orderType', this.indexSource)
this.pageNumber1 = 0
@ -332,7 +339,7 @@
let that = this
const data2 = {
istate: istate, //类型：Number 必有字段 备注：订单状态 0待支付 1支付成功 查所有传 ''
pageIndex: pageNumber ,//类型：Number 必有字段 备注：查询第几页,默认一页10条
pageIndex: pageNumber, //类型：Number 必有字段 备注：查询第几页,默认一页10条
// startTime: that.startTime,
// endTime: that.endTime
}
@ -437,7 +444,7 @@
this.load.isLoadMore2 = false
}
break
case -3:
case -3:
this.finishedOrder = this.finishedOrder.concat(res.data)
if (res.data.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
@ -448,38 +455,38 @@
this.load.isLoadMore3 = false
}
break
}
}
}
})
}
},
startDateChange:function(e){
startDateChange: function(e) {
this.startDate = e
let data=this.startDate
let data = this.startDate
this.endStartDate = data
this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 31)
this.endEndDate = this.getEndDate(Date.parse(data) + 3600 * 1000 * 24 * 31)
this.params.startTime = this.startDate
},
endDateChange:function(e){
if(this.startDate ==''){
endDateChange: function(e) {
if (this.startDate == '') {
uni.showToast({
title: '请先选择开始时间',
icon: 'none'
});
}else{
} else {
this.endDate = e
this.params.endTime = this.endDate
}
},
getEndDate(val){
getEndDate(val) {
let nowDate = new Date(val)
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();
return year + "-" + month + "-" + day
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();
return year + "-" + month + "-" + day
},
orderExport(){
orderExport() {
this.startDate = ''
this.endDate = ''
this.params.email = ''
@ -491,28 +498,28 @@
report() {
if (this.params.email == '') {
uni.showToast({
title: '电子邮箱不能为空',
icon: 'none'
title: '电子邮箱不能为空',
icon: 'none'
});
return false
return false
} else if (this.params.email != '') {
const emailRegex = /^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g
if (!emailRegex.test(this.params.email)) {
const emailRegex = /^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g
if (!emailRegex.test(this.params.email)) {
uni.showToast({
title: '电子邮箱格式不准确',
icon: 'none'
});
return false
}
}
}
if(this.params.startTime==''){
if (this.params.startTime == '') {
uni.showToast({
title: '请选择开始时间',
icon: 'none'
});
return false
}
if(this.params.endTime==''){
if (this.params.endTime == '') {
uni.showToast({
title: '请选择结束时间',
icon: 'none'
@ -520,8 +527,8 @@
return false
}
uni.showModal({
content: '请确认邮箱 \n'+this.params.email,
success: (res)=> {
content: '请确认邮箱 \n' + this.params.email,
success: (res) => {
if (res.confirm) {
oliFinanceApi.getOrderInfoExport(this.params).then(res => {
if (res.code == 20000) {
@ -559,13 +566,16 @@
width: 750upx;
z-index: 3;
}
.uni-input{
.uni-input {
height: 25rpx;
}
.uni-picker{
.uni-picker {
height: 25rpx;
}
.uni-list-cell-db{
.uni-list-cell-db {
width: 100%;
height: 30rpx;
}
@ -628,4 +638,4 @@
border-radius: 15px;
padding: 64rpx;
}
</style>
</style>

9
pages/login/posLogin/posLogin.vue
Unescape View File

@ -10,7 +10,7 @@
<text class>油站工作人员绑定油站</text>
</view>
</view> -->
<view class="banner text-lg">
<view v-if="!isPad" class="banner text-lg">
欢迎使用星油云站
</view>
<view class="pannel">
@ -140,6 +140,7 @@
export default {
data() {
return {
isPad:false,
titleText: "",
errMsg: '',
checkUser: false,
@ -162,6 +163,12 @@
},
created() {
uni.showShareMenu()
uni.getSystemInfo({
success:(res) => {
// console.log('getSystemInfoSync',res)
this.isPad = res.deviceType === 'pad'
}
})
},
methods: {
checkAgree(val) {

Write Preview
Loading…
Cancel
Save