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

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-10-18 14:28:05 +08:00
parent 7bd17a3692
commit fbf5daf538
12 changed files with 87 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BagStation/orderDetail/orderDetail.vue
View File

@@ -161,7 +161,7 @@
<script>
import orderApi from '@/api/oil-order.js'
import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import oilSiteApi from '@/api/oil-site.js'
export default {

2
BagStation/orderDetail/orderDetailUrea.vue
View File

@@ -164,7 +164,7 @@
<script>
import orderApi from '@/api/oil-order.js'
import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import oilSiteApi from '@/api/oil-site.js'
import ureaFinanceApi from '../../api/urea_finance.js'
export default {

2
BagStation/pages/SeparateProcess/payResult.vue
View File

@@ -135,7 +135,7 @@
import toilApi from '@/api/toil.js'
import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
import oilSiteApi from '@/api/oil-site.js'
import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
export default {
components: {
ThirdPartyVoucher,

2
BagStation/pages/makeOrder/payResult.vue
View File

@@ -144,7 +144,7 @@
import toilApi from '@/api/toil.js'
import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
import oilSiteApi from '@/api/oil-site.js'
import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
export default {
components: {
ThirdPartyVoucher,

4
BagStation/pages/oilQRcode/index.vue
View File

@@ -22,7 +22,7 @@
<script>
import serve from '@/api/account.js'
import tkiQrcode from '@/BagStation/pages/components/tki-qrcode/tki-qrcode.vue'
import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
export default {
components: {
tkiQrcode
@@ -39,14 +39,12 @@
computed: {
phoneHandle() {
let phone = this.user.userPhone
console.log('user',this.user)
if(!phone) return ''
return `${phone.substr(0,3)}****${phone.substr(-4)}`
}
},
methods: {
getQrStr(reset = 0) {
console.log('this.user', this.user)
if (this.user.id) {
serve.getQrStr(this.user.id, reset).then(res => {
if (!res.data) return

6
BagStation/pages/stationDetail/stieQr.vue
View File

@@ -172,7 +172,7 @@
import accountApi from '@/api/account.js'
import priceTab from '../components/price-tab.vue'
import threeSites from '@/components/three-sites.vue'
import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
export default {
components: {
priceTab,
@@ -215,10 +215,10 @@
if (this.activeChannelCode) {
if (this.secondChannelCode) {
this.posName = '壳牌'
return `../../../static/img/YDJY.png`
return `../../BagStation/static/img/YDJY.png`
} else {
this.posName = '星油云站'
return `../../../static/img/${this.activeChannelCode}.png`
return `../../BagStation/static/img/${this.activeChannelCode}.png`
}
}
},

2
BagStation/ureaOrderDetail/ureaOrderDetail.vue
View File

@@ -127,7 +127,7 @@
<script>
import orderApi from '@/api/oil-order.js'
import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
import oilSiteApi from '@/api/oil-site.js'
import ureaFinanceApi from '../../api/urea_finance.js'
export default {

9
api/oil-site.js
View File

@@ -175,11 +175,18 @@ export default {
}
})
},
//检测在线状态
//检测在线状态
isLoginSuccess() {
return request({
url: `/oil-identity/operationUser/isLoginSuccess`,
method: 'POST',
})
},
getOilDriverQrCode(params) {
return request({
url: '/oil-site/qrCode/getOilDriverQrCode',
method:'post',
data:params
})
},
}

152
components/three-sites.vue
View File

@@ -1,27 +1,19 @@
<template>
<!-- 三个最近的油站弹窗 -->
<view>
<view class="cu-modal" :class="showThreeSites?'show':''">
<view class="cu-modal" :class="showThreeSites?'show':''" @touchmove.stop>
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">选择油站</view>
<view class="action" @tap="hideModal('sites')">
<!-- <view class="content">选择油站</view> -->
<view class="action" @tap="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding-xl bg-white">
<view class="" v-if="siteList.length>0">
<three-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
class="cu-list menu-avatar cu-item " @tap="toDetail(item)">
</three-item>
</view>
<view class="" v-else>
<my-empty></my-empty>
</view>
<view class="btn-box padding-top">
<button @tap="toSitePage" class="cu-tn bg-red round margin-bottom lg" color="#3982F6"
size="large">前往油站列表查找
</button>
<view class="bg-white pb30">
<tki-qrcode ref="qrcode" cid="2" :val="qrcodeText" :size="400" :isHaveBg="true" pdground="#000"
foreground="#000" background="#fff" onval showLoading loadMake />
<view class="text-center padding-top text-sm margin-bottom">
提示：该二维码每隔<text style="color: #ff0000;">3分钟</text>自动刷新一次
</view>
</view>
</view>
@@ -31,11 +23,13 @@
</template>
<script>
import oilSiteApi from '@/api/oil-site.js'
import threeItem from './three-item.vue'
import serve from '@/api/oil-site.js'
import accountApi from '@/api/account.js'
import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
export default {
components: {
threeItem
tkiQrcode
},
props: {
showThreeSites: {
@@ -45,91 +39,63 @@
},
data() {
return {
siteList: [],
imgURL: this.global.baseURL,
qrcodeText: '',
user: uni.getStorageSync('user'),
timerInstance: null
}
},
created() {
this.getSiteList()
watch: {
showThreeSites: {
handler(newval) {
if (newval) {
this.initQRCode()
}
},
watch:{
showThreeSites:{
handler(newval){
if(newval==true){
this.getSiteList()
}
}
immediate: true
}
},
methods: {
toSitePage(){
// uni.setStorageSync('activeCur','station')
uni.switchTab({
url: '/pages/tabbar/station/stationList'
});
},
refreshLocation(){
uni.getLocation({
type: 'wgs84',
success: function (res) {
uni.setStorageSync('location',res)
}
});
},
getSiteList() {
this.refreshLocation()
let data1 = {
currentPage: 1,
pageSize: 3,
params: { //类型：Object 必有字段 备注：// 筛选对象
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
...uni.getStorageSync('location'),
...this.filterData
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "" // 备注：// 油号选择 ( 0# 92# 92#)
async initQRCode() {
if (this.timerInstance) {
clearInterval(this.timerInstance)
this.timerInstance = null
}
let accountResult = await accountApi.getUserAccount()
if (!accountResult.data.length) return
let params = {
companyId: accountResult.data[0].companyId,
orderSource: "WECHAT_MINIAPPS",
customerId: this.user.id,
channelCode: 'XOIL',
oilCardNature: accountResult.data[0].oilCardType, //油卡性质
accountCardCode: accountResult.data[0].accountCardCode //油卡卡号
}
// readOnlySites
oilSiteApi.getSiteList(data1).then(res => {
if (res.code == 20000) {
this.siteList = res.data.list
}
serve.getOilDriverQrCode(params).then(res => {
if (!res.data) return
this.qrcodeText = res.data.codeStr
})
},
toDetail(item) {
let itemS = JSON.stringify(item)
console.log(itemS)
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
fail: (err) => {
// console.log(err)
},
success: () => {
// console.log('err')
}
this.timerInstance = setInterval(() => {
serve.getOilDriverQrCode(params).then(res => {
if (!res.data) return
this.qrcodeText = res.data.codeStr
})
}, 1000 * 60 * 3)
},
callShipper() {
uni.makePhoneCall({
phoneNumber: this.waybillData.shippePhone
})
hideModal() {
clearInterval(this.timerInstance)
this.timerInstance = null
this.$refs.qrcode._clearCode()
this.$emit('hideOneModal')
},
hideModal(name) {
this.$emit('hideOneModal', name)
},
registerContracts() {
this.$emit('registerContracts')
},
toSetLocation() {
this.$emit('toSetLocation')
},
toAuth() {
uni.navigateTo({
url: '认证路径'
})
}
}
}
</script>
@@ -154,4 +120,8 @@
left: 0.2rem;
min-width: 100%;
}
.pb30 {
padding-bottom: 30rpx;
}
</style>

0
BagStation/pages/components/tki-qrcode/qrcode.js → components/tki-qrcode/qrcode.js
View File

1
BagStation/pages/components/tki-qrcode/tki-qrcode.vue → components/tki-qrcode/tki-qrcode.vue
View File

@@ -91,7 +91,6 @@
},
methods: {
_makeCode() {
let that = this
if (!this._empty(this.val)) {
qrcode = new QRCode({

6
utils/request.js
View File

@@ -5,10 +5,10 @@ import utils from '@/utils/encode'
// const env = 'test'
const env = 'production'
// 45
const testUrl = 'http://192.168.1.132:38080'
const productUrl = 'https://www.xingoil.com/adminapi'
const testUrl = 'http://192.168.1.83:38080'
// const productUrl = 'https://www.xingoil.com/adminapi'
// const productUrl = 'http://uat.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://192.168.0.191:38080'
// const productUrl = 'http://121.196.213.68/adminapi'
const service = axios.create({