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

更新

Browse Source
This commit is contained in:
xiaozhiyong
2024-06-17 16:29:56 +08:00
parent da0f4e6589
commit 0c0aac6fac
2 changed files with 150 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.refreshLocation() // this.refreshLocation()
setTimeout(function() { setTimeout(function() {
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, 800); }, 800);
@@ -249,17 +249,11 @@
const openid = uni.getStorageSync('openid') const openid = uni.getStorageSync('openid')
if (token && openid) { if (token && openid) {
this.getAuthInfo() this.getAuthInfo()
} else {
uni.showToast({
title: '您还没有登录哦',
icon: "none"
})
} }
this.refreshLocation(); this.refreshLocation();
}, },
methods: { methods: {
toManagement() { toManagement() {
const user = uni.getStorageSync('user'); const user = uni.getStorageSync('user');
if (user) { if (user) {
@@ -328,7 +322,7 @@
if (resThird if (resThird
.authSetting[ .authSetting[
'scope.userLocation' 'scope.userLocation'
]) { ]) {
this.refreshLocation() this.refreshLocation()
} }
} }
@@ -379,25 +373,39 @@
showQr() { showQr() {
const user = uni.getStorageSync('user'); let user = uni.getStorageSync("user");
if (!user) { if (!user) {
uni.showToast({ uni.showModal({
title: '请先登录！', content: "登录后才能出示付款码哦",
icon: 'none' confirmText: "去登录",
}) success: function(res) {
return if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
} }
this.showThreeSites = true this.showThreeSites = true
}, },
toCards() { toCards() {
const user = uni.getStorageSync('user'); let user = uni.getStorageSync("user");
if (!user) { if (!user) {
uni.showToast({ uni.showModal({
title: '请先登录！', content: "登录后才能查看哦",
icon: 'none' confirmText: "去登录",
}) success: function(res) {
return if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
} }
uni.navigateTo({ uni.navigateTo({
url: '/BagMoney/pages/oilCards/oilCards' url: '/BagMoney/pages/oilCards/oilCards'
@@ -405,6 +413,21 @@
}, },
toOrders() { toOrders() {
let user = uni.getStorageSync("user");
if (!user) {
uni.showModal({
content: "登录后才能查看哦",
confirmText: "去登录",
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
}
uni.switchTab({ uni.switchTab({
url: '/pages/tabbar/order/orderList/orderList' url: '/pages/tabbar/order/orderList/orderList'
}) })
@@ -419,42 +442,19 @@
let params = { let params = {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象 params: {
longitude: 117.157817, // 必有字段 备注：// 当前位置经度 longitude: 117.157817,
latitude: 31.802472, // 必有字段 备注：// 当前位置维度 latitude: 31.802472,
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "0#" // 备注：// 油号选择 ( 0# 92# 92#)
clientBelong: 'ZHONGPIN', clientBelong: 'ZHONGPIN',
comprehensiveSort: 1, comprehensiveSort: 1,
zpDisable: 'ENABLE', zpDisable: 'ENABLE',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序 sort: "juli",
...uni.getStorageSync('location'), ...uni.getStorageSync('location'),
...this.filterData, ...this.filterData,
} }
}; };
if (!uni.getStorageSync('user')) { oilSiteApi.getSiteLists(params).then(res => {
oilSiteApi.readOnlySites(params).then(res => {
this.getCount++
if (res.code == 20000) {
this.siteList = res.data.list
} else {
if (this.getCount == 1) {
setTimeout(() => {
this.getSiteList()
}, 1000)
}
}
})
} else {
oilSiteApi.getSiteLists(params).then(res => {
if (res.code == 20000) {
this.siteList = res.data.list
}
})
}
oilSiteApi[uni.getStorageSync('user') ? 'getSiteLists' : 'getSiteLists'](params).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.siteList = res.data.list this.siteList = res.data.list
} }
@@ -462,6 +462,21 @@
}, },
toDetail(item) { toDetail(item) {
let user = uni.getStorageSync("user");
if (!user) {
uni.showModal({
content: "登录后才能查看哦",
confirmText: "去登录",
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
}
let itemS = encodeURIComponent(JSON.stringify(item)); let itemS = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({ uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}` url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`
@@ -513,13 +528,20 @@
}, },
openScan() { openScan() {
const user = uni.getStorageSync('user'); let user = uni.getStorageSync("user");
if (!user) { if (!user) {
uni.showToast({ uni.showModal({
title: '请先登录！', content: "登录后才能使用扫一扫哦",
icon: 'none' confirmText: "去登录",
}) success: function(res) {
return if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
} }
uni.scanCode({ uni.scanCode({
scanType: 'qrCode', scanType: 'qrCode',

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

@@ -33,13 +33,13 @@
<!-- 筛选开始 --> <!-- 筛选开始 -->
<scroll-view class="screentop bg-white" style="flex: 1;"> <scroll-view class="screentop bg-white" style="flex: 1;">
<view class=""> <view class="">
<sl-filter v-if="isFilterData" reflexTitle ref="slFilter" :productCodeList="productCodeList" :areaCodeList="areaCodeList" <sl-filter v-if="isFilterData" reflexTitle ref="slFilter" :productCodeList="productCodeList"
@result="filterRes" :menuList="menuList"></sl-filter> :areaCodeList="areaCodeList" @result="filterRes" :menuList="menuList"></sl-filter>
<!-- <sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="menuList"></sl-filter> --> <!-- <sl-filter reflexTitle ref="slFilter" @result="filterRes" :menuList="menuList"></sl-filter> -->
</view> </view>
<view class="bg-white min-height-50 padding-top" v-if="siteList.length>0"> <view class="bg-white min-height-50 padding-top" v-if="siteList.length>0">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0" <site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)"> :listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
</site-item> </site-item>
<view class="placeholder-hidden"> <view class="placeholder-hidden">
@@ -69,11 +69,11 @@
data() { data() {
return { return {
getSiteListTimer:null, getSiteListTimer: null,
filterData: { filterData: {
// oilProductCode: '0#' // oilProductCode: '0#'
}, },
isFilterData:false, isFilterData: false,
contentTitle: '您当前位置附近没有油站，可以点击左上角-距离-选择其他省市进行查看。', contentTitle: '您当前位置附近没有油站，可以点击左上角-距离-选择其他省市进行查看。',
loadStatus: 'load', loadStatus: 'load',
listHeight: 160, listHeight: 160,
@@ -256,18 +256,18 @@
} }
}, },
}, },
onShow() { onShow() {
this.tools.userLocationChenk().then(res => { this.tools.userLocationChenk().then(res => {
this.refreshLocation(); this.refreshLocation();
}).catch(err => {}); }).catch(err => {});
this.getSiteList() this.getSiteList()
}, },
onLoad() { onLoad() {
// this.refreshLocation() // this.refreshLocation()
if (!uni.getStorageSync('filterData')) { if (!uni.getStorageSync('filterData')) {
this.getFilterData() this.getFilterData()
} else { } else {
this.isFilterData=true this.isFilterData = true
} }
}, },
@@ -331,31 +331,31 @@
uni.setStorageSync('productCodeList', res.data.productCodeList) uni.setStorageSync('productCodeList', res.data.productCodeList)
uni.setStorageSync('areaCodeList', res.data.areaCodeList) uni.setStorageSync('areaCodeList', res.data.areaCodeList)
this.areaCodeList = uni.getStorageSync('areaCodeList') this.areaCodeList = uni.getStorageSync('areaCodeList')
let channelCodes = [] let channelCodes = []
res.data.channelCodes.map(item => { res.data.channelCodes.map(item => {
channelCodes.push({ channelCodes.push({
title: item.name, title: item.name,
value: item.id value: item.id
})
}) })
let productCodes = [] })
res.data.productCodes.map(item => { let productCodes = []
productCodes.push({ res.data.productCodes.map(item => {
title: item.name, productCodes.push({
value: item.id title: item.name,
}) value: item.id
}) })
let siteBrands = [] })
res.data.siteBrands.map(item => { let siteBrands = []
siteBrands.push({ res.data.siteBrands.map(item => {
title: item.name, siteBrands.push({
value: item.id title: item.name,
}) value: item.id
}) })
menuList[0].detailList = menuList[0].detailList.concat(channelCodes) })
menuList[1].detailList = menuList[1].detailList.concat(productCodes) menuList[0].detailList = menuList[0].detailList.concat(channelCodes)
menuList[2].detailList = menuList[2].detailList.concat(siteBrands) menuList[1].detailList = menuList[1].detailList.concat(productCodes)
uni.setStorageSync('filterData', this.menuList); menuList[2].detailList = menuList[2].detailList.concat(siteBrands)
uni.setStorageSync('filterData', this.menuList);
if (uni.getStorageSync('areaCodeList')) { if (uni.getStorageSync('areaCodeList')) {
this.areaCodeList = uni.getStorageSync('areaCodeList') this.areaCodeList = uni.getStorageSync('areaCodeList')
} else { } else {
@@ -378,88 +378,68 @@
}); });
}, },
getSiteList() { getSiteList() {
let data1 = { let parameter = {
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: 10, pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象 params: { //类型：Object 必有字段 备注：// 筛选对象
clientBelong:'ZHONGPIN', clientBelong: 'ZHONGPIN',
longitude: 117.157817, // 必有字段 备注：// 当前位置经度 longitude: 117.157817, // 必有字段 备注：// 当前位置经度
latitude: 31.802472, // 必有字段 备注：// 当前位置维度 latitude: 31.802472, // 必有字段 备注：// 当前位置维度
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序 sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
siteName: this.siteName, siteName: this.siteName,
...uni.getStorageSync('location'), ...uni.getStorageSync('location'),
// ...this.filterData // ...this.filterData
siteBrand: this.siteName ? '' : this.filterData.siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 ) siteBrand: this.siteName ? '' : this.filterData
channelCode: this.siteName ? '' : this.filterData.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) .siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#) channelCode: this.siteName ? '' : this.filterData
.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
oilProductCode: this.siteName ? '' : this.filterData
.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#)
provinceCode: this.filterData.provinceCode, provinceCode: this.filterData.provinceCode,
cityCode: this.filterData.cityCode, cityCode: this.filterData.cityCode,
areaCode: this.filterData.areaCode, areaCode: this.filterData.areaCode,
distance: this.filterData.distance, distance: this.filterData.distance,
zpDisable:'ENABLE', zpDisable: 'ENABLE',
comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1 comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1
} }
} }
if (!uni.getStorageSync('Authorization')) {
oilSiteApi.readOnlySites(data1).then(res => { oilSiteApi.getSiteLists(parameter).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.siteList = this.siteList.concat(res.data.list) this.siteList = this.siteList.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页 if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.loadStatus = 'nomore' this.loadStatus = 'nomore'
} else { } else {
this.currentPage++ this.currentPage++
this.loadStatus = 'load' this.loadStatus = 'load'
}
} }
}) }
} else { })
oilSiteApi.getSiteLists(data1).then(res => {
if (res.code == 20000) {
this.siteList = this.siteList.concat(res.data.list)
if (res.data.list.length < 10) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
this.loadStatus = 'nomore'
} else {
this.currentPage++
this.loadStatus = 'load'
}
}
})
}
}, },
toDetail(item) { toDetail(item) {
let user = uni.getStorageSync("user");
if (!user) {
uni.showModal({
content: "登录后才能查看哦",
confirmText: "去登录",
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: "/BagAuth/pages/login/login",
});
}
},
});
return;
}
let itemS = encodeURIComponent(JSON.stringify(item)); let itemS = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({ uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {}, fail: (err) => {},
success: () => {} success: () => {}
}) })
// if (uni.getStorageSync('user')) {
// uni.navigateTo({
// url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
// fail: (err) => {
// // console.log(err)
// },
// success: () => {
// // console.log('err')
// }
// })
// } else {
// uni.showModal({
// title: '请您登录',
// content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
// confirmText: '去登陆',
// success: (res) => {
// if (res.confirm) {
// uni.reLaunch({
// url: '../../../BagAuth/pages/login/login'
// })
// }
// }
// })
// }
}, },
nameSelect(value, item) { nameSelect(value, item) {
this.title2 = item.text this.title2 = item.text
@@ -497,22 +477,22 @@
// this.getSiteList() // this.getSiteList()
// }, 100) // }, 100)
clearTimeout(this.getSiteListTimer); clearTimeout(this.getSiteListTimer);
this.getSiteListTimer = setTimeout(()=>{ this.getSiteListTimer = setTimeout(() => {
this.currentPage = 1 this.currentPage = 1
this.siteList = [] this.siteList = []
this.getSiteList() this.getSiteList()
},500); }, 500);
}, },
onSearch() { onSearch() {
// this.currentPage = 1 // this.currentPage = 1
// this.siteList = [] // this.siteList = []
// this.getSiteList() // this.getSiteList()
clearTimeout(this.getSiteListTimer); clearTimeout(this.getSiteListTimer);
this.getSiteListTimer = setTimeout(()=>{ this.getSiteListTimer = setTimeout(() => {
this.currentPage = 1 this.currentPage = 1
this.siteList = [] this.siteList = []
this.getSiteList() this.getSiteList()
},500); }, 500);
} }
} }
} }
@@ -539,4 +519,4 @@
.min-height-50 { .min-height-50 {
min-height: 50vh; min-height: 50vh;
} }
</style> </style>