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

4
BagStation/orderInvoicing/orderInvoicing.vue
View File

@@ -113,7 +113,9 @@
invoicBankNumber: '', //银行账号
remark: '', //发票备注
invoicEmail: '', //电子邮箱,
orderSerialNumber: '' //订单编号
orderSerialNumber: '' ,//订单编号,
"clientBelong":"ZHONGPIN",
}
}
},

12
BagStation/pages/components/price-select-tab.vue
View File

@@ -587,7 +587,8 @@
payType : 'CUSTOMER_ACTIVE',
userType:'0',
xoilAmountGun:e ,
priceId:this.activeSitePrice
priceId:this.activeSitePrice,
clientBelong: "ZHONGPIN"
}
this.xoilAmountGun = e
oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -635,7 +636,8 @@
payType : 'CUSTOMER_ACTIVE',
userType:'0',
xoilAmountGun:e.detail.value,
priceId:this.activeSitePrice
priceId:this.activeSitePrice,
clientBelong: "ZHONGPIN"
}
this.xoilAmountGun = e.detail.value
oilSiteApi.getOrderDiscountInfo(number).then( res=>{
@@ -896,6 +898,7 @@
'version':1,
'xoilAmountGun':this.vol
}
console.log(orderData,'orderDataorderDataorderDataorderDataorderDataorderDataorderDataorderData');
oilOrderApi.createOrder(orderData).then(res => {
if (res.code == 20000) {
clearTimeout(this.timer)
@@ -919,7 +922,10 @@
// 获取渠道下价格等信息
getNewSitePrice(channelId) {
this.oilSitePriceDetailsVo = []
oilSiteApi.getNewSitePrice(channelId).then(res => {
oilSiteApi.getNewSitePriceZp({
channelId:channelId,
clientBelong: "ZHONGPIN"
}).then(res => {
if (res.code == 20000) {
this.plateNumbers = res.data.plateNumbers
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo;

3
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -112,7 +112,8 @@
getSiteInfo(id) {
let data2 = {
...uni.getStorageSync('location'),
siteId: id
siteId: id,
clientBelong: "ZHONGPIN"
}
oilSiteApi.getSiteDetails(data2).then(res => {
if (res.code == 20000) {

20
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -318,7 +318,7 @@
userIp: (this.userIp?this.userIp:"36.57.160.59") ,
merchantNo:'10089027856'
}
console.log(payData,'payDatapayData')
oilPayApi.aggregatePay(payData).then(res => {
if (res.code == 20000) {
uni.requestPayment({
@@ -327,10 +327,6 @@
success: (res1) => {
console.log(res)
if (res.code == 20000) {
// this.getPayStatus(this.outTradeNo)
// this.getLastMoney()
// this.getCards()
// console.log('success:' + JSON.stringify(res));
uni.showToast({
title: res.msg
})
@@ -351,23 +347,9 @@
}
},
fail: function(err) {
console.log(res, err, '************')
// console.log('fail:' + JSON.stringify(err));
}
})
// uni.showToast({
// title: res.msg
// })
// uni.redirectTo({
// url: '/BagStation/pages/makeOrder/payResult?status=success',
// fail: (err) => {
// console.log(err)
// }
// })
} else {
// uni.redirectTo({
// url: '/BagStation/pages/makeOrder/payResult?status=fail'
// })
}
})

3
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -252,7 +252,8 @@
console.log('进入获取油站信息')
let data2 = {
...uni.getStorageSync('location'),
siteId: id
siteId: id,
clientBelong: "ZHONGPIN"
}
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('进入获取油站信息getSiteDetails',res)

2
api/oil-order.js
View File

@@ -4,6 +4,8 @@ const group_name = "oilSiteOrderInfo"
export default {
// 下单
createOrder(data) {
// data = Object.assign(data,{'clientBelong':'ZHONGPIN',});
console.log(data,'datadatadata')
return request({
url: `/${service_name}/${group_name}/createOrder`,
method: 'post',

8
api/oil-site.js
View File

@@ -82,6 +82,14 @@ export default {
method: 'get'
})
},
// 中品 下单 -- 获取最新油站价格、司机、加油员相关信息
getNewSitePriceZp(data) {
return request({
url: `/${service_name}/${group_name}/getSitePriceByBelong `,
method: 'post',
data:data
})
},
//根据地址获取详细地址信息
getGeoByAddress(address) {
return request({

10
components/three-sites.vue
View File

@@ -73,18 +73,22 @@
currentPage: 1,
pageSize: 3,
params: { //类型：Object 必有字段 备注：// 筛选对象
clientBelong:'ZHONGPIN',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
...uni.getStorageSync('location'),
...this.filterData
...this.filterData,
comprehensiveSort:1,
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "" // 备注：// 油号选择 ( 0# 92# 92#)
}
}
oilSiteApi.getSiteList(data1).then(res => {
oilSiteApi.getSiteLists(data1).then(res => {
if (res.code == 20000) {
this.siteList = res.data.list
this.siteList = res.data.list;
(this.siteList.length>3)&&(this.siteList.length = 3)
}
})
},

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>
<!-- 筛选开始 -->

217
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)
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 == '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 == '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'
}
} 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);
}
}
}

2
utils/request.js
View File

@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
const env = 'production'/* */
// const env = 'test'
const testUrl = 'http://192.168.110.99:38080'
const testUrl = 'http://192.168.0.23:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new