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

1212

Browse Source
This commit is contained in:
caolc
2023-03-10 13:45:00 +08:00
parent 340cbc59e4
commit 8fd25deedf
13 changed files with 247 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
pages/index/startPage/startPage.vue
View File

@@ -44,81 +44,14 @@
}
},
onLoad(option) {
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid')
let key = ''
if (token && openid) {
key = '在线'
} else {
key = '离线'
}
if (key == '在线') {
// if (!uni.getStorageSync('filterData')) {
// this.getFilterData()
// } else if (uni.getStorageSync('filterData')[0].detailList.length < 2) {
// this.getFilterData()
// }
}
// 在页面中定义插屏广告
let interstitialAd = null
// 在页面onLoad回调事件中创建插屏广告实例
if (wx.createInterstitialAd) {
interstitialAd = wx.createInterstitialAd({
adUnitId: 'adunit-a7faf57adeed211f'
})
}
interstitialAd.onLoad((err) => {
console.log('onLoad event emit', err)
})
interstitialAd.onError((err) => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
console.log('onError event emit', err)
})
// 在适合的场景显示插屏广告
if (interstitialAd) {
interstitialAd.show().catch((err) => {
console.error(err)
})
}
interstitialAd.onClose(res => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
})
},
onReady(option) {
let taht = this
const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) {
// 请求完新版本信息的回调
console.log('请求完新版本信息的回调', res.hasUpdate);
if (!res.hasUpdate) {
taht.initFn(option)
}
});
updateManager.onUpdateReady(function(res) {
@@ -127,20 +60,86 @@
content: '新版本已经准备好，是否重启应用？',
success(res) {
if (res.confirm) {
console.log(res.confirm, 'res.confirm版本信息')
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
} else {
taht.initFn(option)
}
}
},
});
});
updateManager.onUpdateFailed(function(res) {
console.log('新的版本下载失败')
// 新的版本下载失败
});
},
onReady(option) {},
methods: {
initFn(option) {
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid')
let key = ''
if (token && openid) {
key = '在线'
} else {
key = '离线'
}
// 在页面中定义插屏广告
let interstitialAd = null
// 在页面onLoad回调事件中创建插屏广告实例
if (wx.createInterstitialAd) {
interstitialAd = wx.createInterstitialAd({
adUnitId: 'adunit-a7faf57adeed211f'
})
}
interstitialAd.onLoad((err) => {
console.log('onLoad event emit', err)
})
interstitialAd.onError((err) => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
console.log('onError event emit', err)
})
// 在适合的场景显示插屏广告
if (interstitialAd) {
interstitialAd.show().catch((err) => {
console.error(err)
})
}
interstitialAd.onClose(res => {
setTimeout(() => {
if (key == '在线') {
uni.switchTab({
url: '/pages/tabbar/home/home',
fail: (err) => {
console.log(err)
}
// url:'/BagStation/orderDetail/orderDetail'
})
} else {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
})
}
}, 2000)
})
},
getFilterData() {
console.log('在线')
oilSiteApi.getCheckInfo().then(res => {
@@ -172,7 +171,7 @@
this.menuList[1].detailList = this.menuList[1].detailList.concat(productCodes)
this.menuList[2].detailList = this.menuList[2].detailList.concat(siteBrands)
uni.setStorageSync('filterData', this.menuList);
console.log('存入',this.menuList)
console.log('存入', this.menuList)
// this.$refs.slFilter.resetMenuList(this.menuList)
}
})

6
pages/tabbar/home/home.vue
View File

@@ -109,15 +109,15 @@
<!-- 广告图片开始 -->
<view class="my-bg padding">
<view class="" >
<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
<!-- <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
<image :src="item.src" style="width: 100%;" mode="widthFix"></image>
</swiper-item>
<swiper-item>
<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
</swiper-item>
</swiper>
<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
</swiper> -->
<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image>
</view>
</view>
<!-- 筛选开始 -->

225
pages/tabbar/order/orderList/orderList.vue
View File

@@ -98,6 +98,7 @@
data() {
return {
getSiteListTimer:null,
TabCur: 0,
search: '',
status: {
@@ -214,118 +215,126 @@
}
},
onRequest() {
if (this.TabCur == 0) {
this.currentPage.currentPage = 1
this.list = []
this.getOrder('全部', this.currentPage.currentPage,'onRequest')
} else if (this.TabCur == 1) {
this.currentPage.currentPage0 = 1
this.list0 = []
this.getOrder('0', this.currentPage.currentPage0,'onRequest')
} else if (this.TabCur == 2) {
this.currentPage.currentPage1 = 1
this.list1 = []
this.getOrder('1', this.currentPage.currentPage1,'onRequest')
} else if (this.TabCur == 3) {
this.currentPage.currentPage2 = 1
this.list2 = []
this.getOrder('2', this.currentPage.currentPage2,'onRequest')
} else if (this.TabCur == 4) {
this.currentPage.currentPage3 = 1
this.list3 = []
this.getOrder('3', this.currentPage.currentPage3,'onRequest')
}
if (this.TabCur == 0) {
this.currentPage.currentPage = 1
this.list = []
this.getOrder('全部', this.currentPage.currentPage,'onRequest')
} else if (this.TabCur == 1) {
this.currentPage.currentPage0 = 1
this.list0 = []
this.getOrder('0', this.currentPage.currentPage0,'onRequest')
} else if (this.TabCur == 2) {
this.currentPage.currentPage1 = 1
this.list1 = []
this.getOrder('1', this.currentPage.currentPage1,'onRequest')
} else if (this.TabCur == 3) {
this.currentPage.currentPage2 = 1
this.list2 = []
this.getOrder('2', this.currentPage.currentPage2,'onRequest')
} else if (this.TabCur == 4) {
this.currentPage.currentPage3 = 1
this.list3 = []
this.getOrder('3', this.currentPage.currentPage3,'onRequest')
}
},
getOrder(id, page, tip) {
let postData = {
currentPage: page, //类型：Number 必有字段 备注：无
pageSize: 10, //类型：Number 必有字段 备注：无
index: (page - 1) * 10,
params: { //类型：Object 必有字段 备注：无
clientBelong:'ZHONGPIN',
orderStatus: id == '全部' ? '' : (id +''), //类型：String 必有字段 备注：订单状态 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
search: this.search //类型：String 必有字段 备注：搜索 ( 油站名称/ 订单编号/ 油品)
},
}
console.log('tip',id,tip)
orderApi.getOrderInfoByPage(postData).then(res => {
if (res.code == 20000) {
// console.log('订单列表厂房发', page, res.data.list.length)
// 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
if (id == '0') {
// 0：待支付 list0
this.list0 = this.list0.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus0 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage0++
this.status.loadOrderStatus0 = 'load'
}
} else if (id == '1') {
// 1：已支付 list1
this.list1 = this.list1.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus1 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage1++
this.status.loadOrderStatus1 = 'load'
this.$emit('changeOrderLoadStatus', id, 'load', false)
}
} else if (id == '2') {
//2：已取消 list2
this.list2 = this.list2.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus2 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage2++
this.status.loadOrderStatus2 = 'load'
this.$emit('changeOrderLoadStatus', id, 'load', false)
}
} else if (id == '3') {
// 3：已退款 list3
this.list3 = this.list3.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus3 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage3++
this.status.loadOrderStatus3 = 'load'
}
} else if (id == '全部') {
// 全部 list
this.list = this.list.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage++
this.status.loadOrderStatus = 'load'
clearTimeout(this.getSiteListTimer);
this.getSiteListTimer = setTimeout(()=>{
let postData = {
currentPage: page, //类型：Number 必有字段 备注：无
pageSize: 10, //类型：Number 必有字段 备注：无
index: (page - 1) * 10,
params: { //类型：Object 必有字段 备注：无
clientBelong:'ZHONGPIN',
orderStatus: id == '全部' ? '' : (id +''), //类型：String 必有字段 备注：订单状态 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
search: this.search //类型：String 必有字段 备注：搜索 ( 油站名称/ 订单编号/ 油品)
},
}
console.log('tip',id,tip)
orderApi.getOrderInfoByPage(postData).then(res => {
if (res.code == 20000) {
// console.log('订单列表厂房发', page, res.data.list.length)
// 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
if (id == '0') {
// 0：待支付 list0
this.list0 = this.list0.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus0 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage0++
this.status.loadOrderStatus0 = 'load'
}
} else if (id == '1') {
// 1：已支付 list1
this.list1 = this.list1.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus1 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage1++
this.status.loadOrderStatus1 = 'load'
this.$emit('changeOrderLoadStatus', id, 'load', false)
}
} else if (id == '2') {
//2：已取消 list2
this.list2 = this.list2.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus2 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage2++
this.status.loadOrderStatus2 = 'load'
this.$emit('changeOrderLoadStatus', id, 'load', false)
}
} else if (id == '3') {
// 3：已退款 list3
this.list3 = this.list3.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus3 = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage3++
this.status.loadOrderStatus3 = 'load'
}
} else if (id == '全部') {
// 全部 list
this.list = this.list.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.status.loadOrderStatus = 'nomore'
uni.showToast({
title: '就这么多啦',
icon: 'none'
})
} else {
this.currentPage.currentPage++
this.status.loadOrderStatus = 'load'
}
}
}
}
})
})
},500)
}
}
}

24
pages/tabbar/station/stationList.vue
View File

@@ -69,6 +69,7 @@
data() {
return {
getSiteListTimer:null,
filterData: {
// oilProductCode: '0#'
},
@@ -374,7 +375,6 @@
getSiteList() {
this.refreshLocation()
let data1 = {
currentPage: this.currentPage,
pageSize: 10,
@@ -482,16 +482,28 @@
},
onInput() {
setTimeout(() => {
// setTimeout(() => {
// this.currentPage = 1
// this.siteList = []
// this.getSiteList()
// }, 100)
clearTimeout(this.getSiteListTimer);
this.getSiteListTimer = setTimeout(()=>{
this.currentPage = 1
this.siteList = []
this.getSiteList()
}, 100)
},500);
},
onSearch() {
this.currentPage = 1
this.siteList = []
this.getSiteList()
// this.currentPage = 1
// this.siteList = []
// this.getSiteList()
clearTimeout(this.getSiteListTimer);
this.getSiteListTimer = setTimeout(()=>{
this.currentPage = 1
this.siteList = []
this.getSiteList()
},500);
}
}
}