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
2024-12-31 14:45:51 +08:00
parent 5803d8a222
commit 949707d0ec
12 changed files with 264 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BagAuth/pages/login/login.vue
View File

@@ -100,7 +100,7 @@
this.otherUser = true this.otherUser = true
uni.clearStorageSync() uni.clearStorageSync()
this.weChatLogin(option) this.weChatLogin(option)
console.log('当前为卡力用户') // console.log('当前为卡力用户')
return return
} }
} }
@@ -170,17 +170,17 @@
} }
uni.setStorageSync('isOther',_that.otherUser) uni.setStorageSync('isOther',_that.otherUser)
uni.setStorageSync('otherUserInfo',sysCustomerInfos) uni.setStorageSync('otherUserInfo',sysCustomerInfos)
console.log('此处为data参数：',data) // console.log('此处为data参数：',data)
console.log('当前为卡利用户：companyId 为',sysCustomerInfos.companyId) // console.log('当前为卡利用户：companyId 为',sysCustomerInfos.companyId)
oilIdentityApi.wechatLogin(data).then(res=>{ oilIdentityApi.wechatLogin(data).then(res=>{
console.log('这里是wechatLogin',res) // console.log('这里是wechatLogin',res)
this.OtherloginSuccess(res) this.OtherloginSuccess(res)
console.log(res) // console.log(res)
}) })
return return
} }
}else{ }else{
console.log('这里是213','----') // console.log('这里是213','----')
this.autoLogin() this.autoLogin()
} }
// uni.setStorageSync('isOther',_that.otherUser) // uni.setStorageSync('isOther',_that.otherUser)

61
BagStation/orderDetail/orderDetail.vue
View File

@@ -13,9 +13,13 @@
<view class="qr-container "> <view class="qr-container ">
<view class="qrimg"> <view class="qrimg">
<view class="qrimg" @tap="newQrString"> <view class="qrimg" @tap="newQrString">
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff" <view v-if="baseImage" class="base-image">
:foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval <image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/qr-bg.png" />
:usingComponents="usingComponents" showLoading /> <image mode="heightFix" :src="baseImage"></image>
</view>
<tki-qrcode v-else ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx"
background="#fff" :foreground="foreground" :pdground="foreground" :icon="iconUrl"
iconSize="40" onval :usingComponents="usingComponents" showLoading />
</view> </view>
</view> </view>
</view> </view>
@@ -73,6 +77,12 @@
<text <text
class="fr">{{order.sitePrice?order.sitePrice+'￥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text> class="fr">{{order.sitePrice?order.sitePrice+'￥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text>
</view> </view>
<view class="padding-tb-xs text-left">
油机价格
<text
class="fr">{{order.sitePriceAmount?order.sitePriceAmount+'￥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text>
</view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠价格 优惠价格
<text <text
@@ -167,6 +177,7 @@
export default { export default {
data() { data() {
return { return {
baseImage: '',
foreground: '#000', foreground: '#000',
showQr: false, showQr: false,
val: '', val: '',
@@ -211,14 +222,26 @@
}, },
getOrderQrCode() { getOrderQrCode() {
oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => { oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => {
console.log(res) // console.log(res)
this.val = res.data this.val = res.data
if (res.code == 40000) { if (res.code == 40000) {
this.showQr = false this.showQr = false
} else if (res.code == 20000) { } else if (res.code == 20000) {
this.showQr = true if (res.data.writeOffType === 'url') {
uni.navigateTo({
url: `/BagStation/pages/makeOrder/G7Supplier?url=${encodeURIComponent(res.data.codeStr)}`
})
return
}
if (res.data.writeOffType === 'image') {
this.baseImage = res.data.codeStr
this.showQr = true
return
}
this.val = res.data.codeStr; this.val = res.data.codeStr;
this.foreground = this.val.indexOf('SHLFC/V1') == -1 ? '#000' : '#1A487E'; this.foreground = this.val.indexOf('SHLFC/V1') == -1 ? '#000' : '#1A487E';
this.showQr = true
} }
}) })
}, },
@@ -402,6 +425,31 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.base-image {
position: relative;
padding: 50rpx 0;
image {
&:nth-of-type(1) {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
max-width: 100%;
z-index: 0;
background-color: #ffffff;
padding: 2%;
}
&:nth-of-type(2) {
// width: 250rpx;
height: 250rpx;
}
}
}
.customer-service { .customer-service {
position: fixed; position: fixed;
@@ -426,6 +474,7 @@
margin-right: 7rpx; margin-right: 7rpx;
} }
} }
.move-tops { .move-tops {
transform: translateY(-17px); transform: translateY(-17px);
} }
@@ -445,4 +494,4 @@
.move-top { .move-top {
margin-top: -2rem; margin-top: -2rem;
} }
</style> </style>

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

@@ -135,7 +135,7 @@
</view> </view>
<view class="text-center" style="width: 60%;margin: 0 2%;"> <view class="text-center" style="width: 60%;margin: 0 2%;">
<input v-model="vol" @input="checkeNumber" @blur="getMoneyVol" type="digit" class="block" <input v-model="vol" @input="checkeNumber" @blur="getMoneyVol" type="digit" class="block"
placeholder="请输入油机金额" value="" style="border-bottom: 1px solid #efefef;" /> placeholder="请输入油机金额" value="" style="border-bottom: 1px solid #efefef;" :disabled="readonlyRealMoney" />
</view> </view>
<view class=""> <view class="">
<text class=" padding-right-sm"> <text class=" padding-right-sm">
@@ -166,7 +166,7 @@
</view> </view>
<view class="text-center"> <view class="text-center">
<input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block" <input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block"
placeholder="加油金额" value="" /> placeholder="加油金额" value="" />
</view> </view>
<view class=""> <view class="">
<text class="text-bold padding-right-sm"> <text class="text-bold padding-right-sm">
@@ -188,24 +188,24 @@
</view> </view>
</view> </view>
</view> </view>
<view class=" menu cu-list " v-if="plateNumberOcrShow==true"> <view class=" menu cu-list " v-if="plateNumberOcrShow==true">
<view class="cu-item nowrap"> <view class="cu-item nowrap">
<view class="text-bold "> <view class="text-bold ">
车牌识别 车牌识别
</view> </view>
<view @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;"> <view @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
<input v-model="plateNumberOcr" type="digit" class="block" <input v-model="plateNumberOcr" type="digit" class="block" placeholder="请点击拍照识别车牌" value=""
placeholder="请点击拍照识别车牌" value="" style="border-bottom: 1px solid #efefef;" /> style="border-bottom: 1px solid #efefef;" />
</view> </view>
<view @tap="srcPhoto"> <view @tap="srcPhoto">
<uni-icons type="camera-filled" size="30"></uni-icons> <uni-icons type="camera-filled" size="30"></uni-icons>
</view> </view>
</view> </view>
</view> </view>
<view class="bg-white padding"> <view class="bg-white padding">
<view class=""> <view class="">
<text class="text-bold">优惠</text> <text class="text-bold">优惠</text>
@@ -385,9 +385,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="cu-modal bottom-modal " :class="showPlicePhoto"> <view class="cu-modal bottom-modal " :class="showPlicePhoto">
<view class="cu-dialog bg-white"> <view class="cu-dialog bg-white">
<view class="cu-bar bg-white justify-end"> <view class="cu-bar bg-white justify-end">
<view class="content"></view> <view class="content"></view>
@@ -395,29 +395,31 @@
<text class="cuIcon-close text-red"></text> <text class="cuIcon-close text-red"></text>
</view> </view>
</view> </view>
<view style="height: 1000rpx;"> <view style="height: 1000rpx;">
<view style="margin: 100rpx 0;"> <view style="margin: 100rpx 0;">
<uni-icons type="clear" size="80" color="#f56c6c"></uni-icons> <uni-icons type="clear" size="80" color="#f56c6c"></uni-icons>
<view> <view>
<text style="color: #d9001b;font-size: 30rpx;font-weight: bold;">识别失败!</text> <text style="color: #d9001b;font-size: 30rpx;font-weight: bold;">识别失败!</text>
</view>
</view>
<view style="margin: 60rpx 0;">
<button @tap="srcPhoto"
style="width: 60%;background-color: #409EFF;color: #ffffff;">重新拍照</button>
</view>
<view style="margin: 60rpx 0;">
<button style="width: 60%;background-color: #F59A23;color: #ffffff;"
@click="manualInput">手动输入车牌号</button>
</view> </view>
</view> </view>
<view style="margin: 60rpx 0;">
<button @tap="srcPhoto" style="width: 60%;background-color: #409EFF;color: #ffffff;">重新拍照</button>
</view>
<view style="margin: 60rpx 0;">
<button style="width: 60%;background-color: #F59A23;color: #ffffff;" @click="manualInput">手动输入车牌号</button>
</view>
</view>
</view> </view>
</view> </view>
<uni-popup ref="inputDialog" type="dialog"> <uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog mode="input" title="请输入车牌号" value="" :before-close="true" <uni-popup-dialog mode="input" title="请输入车牌号" value="" :before-close="true" placeholder="请输入"
placeholder="请输入" @close="inputClose" @confirm="inputConfirm"></uni-popup-dialog> @close="inputClose" @confirm="inputConfirm"></uni-popup-dialog>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@@ -459,6 +461,7 @@
}, },
data() { data() {
return { return {
readonlyRealMoney: false,
thirdPartyDynamicData: ['LAIYOU'], thirdPartyDynamicData: ['LAIYOU'],
vlom: '', vlom: '',
discount: '', discount: '',
@@ -557,10 +560,10 @@
checkBar: [], checkBar: [],
realMoney: '', realMoney: '',
xoilAmountGun: '', xoilAmountGun: '',
plateNumberOcr:'', plateNumberOcr: '',
plateNumberOcrShow:false, plateNumberOcrShow: false,
showPlicePhoto:'', showPlicePhoto: '',
plateNumberImages:'' plateNumberImages: ''
} }
}, },
created() { created() {
@@ -570,8 +573,7 @@
companyId = JSON.parse(uni.getStorageSync('companyCard')).companyId companyId = JSON.parse(uni.getStorageSync('companyCard')).companyId
if (otherUser) { if (otherUser) {
this.isOtherUser = true this.isOtherUser = true
} else { } else {}
}
this.showtitles = oilItem.listTag; this.showtitles = oilItem.listTag;
this.init() this.init()
this.getCompanyConfig(companyId) this.getCompanyConfig(companyId)
@@ -645,39 +647,39 @@
} }
}, },
methods: { methods: {
manualInput(){ manualInput() {
this.showPlicePhoto='' this.showPlicePhoto = ''
this.$refs.inputDialog.open() this.$refs.inputDialog.open()
}, },
inputClose(){ inputClose() {
this.$refs.inputDialog.close() this.$refs.inputDialog.close()
}, },
inputConfirm(val){ inputConfirm(val) {
if(val){ if (val) {
this.plateNumberOcr = val this.plateNumberOcr = val
this.$refs.inputDialog.close() this.$refs.inputDialog.close()
}else{ } else {
uni.showToast({ uni.showToast({
title: '请输入车牌号', title: '请输入车牌号',
icon: 'none' icon: 'none'
}) })
} }
}, },
getCompanyConfig(companyId){ getCompanyConfig(companyId) {
if(companyId){ if (companyId) {
user.getCompanyConfigByCompanyId(companyId).then(res=>{ user.getCompanyConfigByCompanyId(companyId).then(res => {
if(res.data.plateNumberOcr==1){ if (res.data.plateNumberOcr == 1) {
this.plateNumberOcrShow = true this.plateNumberOcrShow = true
}else{ } else {
this.plateNumberOcrShow = false this.plateNumberOcrShow = false
} }
}) })
} }
}, },
srcPhoto(){ srcPhoto() {
this.showPlicePhoto='' this.showPlicePhoto = ''
let _that = this let _that = this
uni.chooseImage({ uni.chooseImage({
count: 1, //默认9 count: 1, //默认9
@@ -688,7 +690,7 @@
title: '识别中', title: '识别中',
mask: true mask: true
}); });
const JSESSIONID = utils.uuid() const JSESSIONID = utils.uuid()
uni.uploadFile({ uni.uploadFile({
url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify', url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify',
@@ -706,20 +708,21 @@
success(e) { success(e) {
uni.hideLoading() uni.hideLoading()
let obj = JSON.parse(e.data) let obj = JSON.parse(e.data)
if(obj.data&&obj.data.carNo){ if (obj.data && obj.data.carNo) {
_that.plateNumberOcr = obj.data.carNo _that.plateNumberOcr = obj.data.carNo
_that.plateNumberImages = obj.data.imgUrl _that.plateNumberImages = obj.data.imgUrl
}else{ } else {
_that.plateNumberOcr = '' _that.plateNumberOcr = ''
_that.showPlicePhoto = 'show' _that.showPlicePhoto = 'show'
} }
},fail(res){ },
fail(res) {
uni.hideLoading() uni.hideLoading()
_that.showPlicePhoto = 'show' _that.showPlicePhoto = 'show'
} }
}) })
} }
}) })
@@ -1247,8 +1250,8 @@
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
} else { } else {
if(this.plateNumberOcrShow == true){ if (this.plateNumberOcrShow == true) {
if(!this.plateNumberOcr){ if (!this.plateNumberOcr) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请上传车牌照片' title: '请上传车牌照片'
@@ -1256,27 +1259,27 @@
return return
} }
var orderData = { var orderData = {
amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '', amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
shareCompanyQuota: 0, // 共享标识 shareCompanyQuota: 0, // 共享标识
priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键 priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键
orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单） orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS） orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS）
plateNumber: this.plateNumberOcrShow == true ? this.plateNumberOcr : this plateNumber: this.plateNumberOcrShow == true ? this.plateNumberOcr : this
.plateNumber, //类型：String 必有字段 备注：车牌号 .plateNumber, //类型：String 必有字段 备注：车牌号
plateNumberImages: this.plateNumberImages, // 车牌照片地址 plateNumberImages: this.plateNumberImages, // 车牌照片地址
siteUserName: this.jober, //类型：String 必有字段 备注：加油员 siteUserName: this.jober, //类型：String 必有字段 备注：加油员
oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪 oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪
volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
.vol, //类型：Number 必有字段 备注：加油升数 .vol, //类型：Number 必有字段 备注：加油升数
realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格 realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格
suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单） suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单）
createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET） createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
// "deviceImei": "mock", //类型：String 可有字段 备注：设备唯一码 // "deviceImei": "mock", //类型：String 可有字段 备注：设备唯一码
// "networkIp": "mock" //类型：String 可有字段 备注：ip地址 // "networkIp": "mock" //类型：String 可有字段 备注：ip地址
'version': 1, 'version': 1,
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
}else{ } else {
var orderData = { var orderData = {
amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '', amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
shareCompanyQuota: 0, // 共享标识 shareCompanyQuota: 0, // 共享标识
@@ -1298,7 +1301,7 @@
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
} }
} }
let location = uni.getStorageSync('location') || { let location = uni.getStorageSync('location') || {
longitude: '', longitude: '',
@@ -1344,11 +1347,31 @@
this.radio = 0 this.radio = 0
this.plateNumbers = res.data.plateNumbers this.plateNumbers = res.data.plateNumbers
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo
this.couponFaceValueListHandle(this.radio)
this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId
this.siteUserNames = res.data.siteUserNames this.siteUserNames = res.data.siteUserNames
} }
}) })
}, },
couponFaceValueListHandle(index) {
if (this.oilSitePriceDetailsVo[index].couponFaceValueList) {
this.readonlyRealMoney = true
this.checkMoney = this.oilSitePriceDetailsVo[index].couponFaceValueList.reduce((prev, item) => {
prev.push({
value: +item,
name: (+item).toFixed(0),
checked: false,
hot: false,
})
return prev
}, [])
console.log('this.checkMoney', this.checkMoney)
}
},
pickJober(e) { pickJober(e) {
this.joberIndex = e.detail.value this.joberIndex = e.detail.value
}, },
@@ -1391,6 +1414,8 @@
this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
this.realMoney = '--' this.realMoney = '--'
this.xoilAmountGun = '' this.xoilAmountGun = ''
this.couponFaceValueListHandle(this.radio)
}, },
tabSelect(e) { tabSelect(e) {
this.activeChannelCode = e.currentTarget.dataset.channelCode; this.activeChannelCode = e.currentTarget.dataset.channelCode;
@@ -1795,4 +1820,4 @@
.padding-bottom-40 { .padding-bottom-40 {
padding-bottom: 20%; padding-bottom: 20%;
} }
</style> </style>

22
BagStation/pages/makeOrder/G7Supplier.vue Normal file
View File

@@ -0,0 +1,22 @@
<template>
<view>
<web-view :src="url"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
url:''
}
},
onLoad(options) {
this.url = decodeURIComponent(options.url)
}
}
</script>
<style>
</style>

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

@@ -20,10 +20,15 @@
<view class="qr-container "> <view class="qr-container ">
<view class="qrimg"> <view class="qrimg">
<view class="qrimg" @tap="newQrString"> <view class="qrimg" @tap="newQrString">
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff" <view v-if="baseImage" class="base-image">
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/qr-bg.png" />
<image mode="heightFix" :src="baseImage"></image>
</view>
<tki-qrcode v-else ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
:foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading /> :usingComponents="usingComponents" showLoading />
</view> </view>
</view> </view>
</view> </view>
<view class="text-center text-sm justify-center align-center flex"> <view class="text-center text-sm justify-center align-center flex">
@@ -36,7 +41,7 @@
<span style="font-size: 38upx;margin-left: 10upx;;">{{ seconds }}s</span> <span style="font-size: 38upx;margin-left: 10upx;;">{{ seconds }}s</span>
</div> </div>
<view class="text-center padding-top text-sm margin-bottom"> <view class="text-center padding-top text-sm margin-bottom">
提示：该二维码每隔3分钟自动刷新一次 提示：该二维码每隔3分钟自动刷新一次
<view>如核销失败，可点击二维码进行立即刷新，再次进行核销。</view> <view>如核销失败，可点击二维码进行立即刷新，再次进行核销。</view>
</view> </view>
</view> </view>
@@ -86,6 +91,11 @@
@onShowThirdResult="onShowThirdResult"></third-party-voucher> @onShowThirdResult="onShowThirdResult"></third-party-voucher>
</view> </view>
</view> --> </view> -->
<view class="padding-tb-xs text-left">
油机价格
<text
class="fr">{{order.sitePriceAmount?order.sitePriceAmount+'￥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text>
</view>
<view class="dashed-top margin-top-xs padding-top-sm"> <view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油金额 加油金额
@@ -153,6 +163,7 @@
data() { data() {
const now = new Date() const now = new Date()
return { return {
baseImage:'',
foreground: '#000', foreground: '#000',
oilItem: {}, oilItem: {},
status: "", status: "",
@@ -258,10 +269,22 @@
this.showQr = false this.showQr = false
this.showtext = true this.showtext = true
} else if (res.code == 20000) { } else if (res.code == 20000) {
this.showQr = true
this.showtext = false this.showtext = false
if (res.data.writeOffType === 'url') {
uni.navigateTo({
url: `./G7Supplier?url=${encodeURIComponent(res.data.codeStr)}`
})
return
}
if (res.data.writeOffType === 'image') {
this.baseImage = res.data.codeStr
this.showQr = true
return
}
this.val = res.data.codeStr this.val = res.data.codeStr
this.foreground = this.val.indexOf('SHLFC/V1') == -1 ? '#000' : '#1A487E'; this.foreground = this.val.indexOf('SHLFC/V1') == -1 ? '#000' : '#1A487E';
this.showQr = true
} }
}) })
}, },
@@ -413,7 +436,30 @@
} }
</script> </script>
<style> <style lang="scss">
.base-image {
position: relative;
padding: 50rpx 0;
image {
&:nth-of-type(1) {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
max-width: 100%;
z-index: 0;
background-color: #ffffff;
padding: 2%;
}
&:nth-of-type(2) {
// width: 250rpx;
height: 250rpx;
}
}
}
.move-tops { .move-tops {
transform: translateY(-17px); transform: translateY(-17px);
} }
@@ -436,4 +482,4 @@
padding-top: 60upx; padding-top: 60upx;
font-weight: bold; font-weight: bold;
} }
</style> </style>

2
BagStation/pages/newRoutePlanning/chooseLocation.vue
View File

@@ -88,7 +88,7 @@
}, },
created() { created() {
this.TXSDK = new amapFile({ this.TXSDK = new amapFile({
key: 'UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN' key: 'YR3BZ-EWX3M-JFW6U-6TREG-FXFJH-CMFWY'
}); });
}, },
methods: { methods: {

4
BagStation/pages/newRoutePlanning/newRoutePlanning.vue
View File

@@ -9,7 +9,7 @@
<view class="map_body"> <view class="map_body">
<map @tap='poitap' @updated='mapUpdated' :scale='mapScale' @callouttap='callouttap' <map @tap='poitap' @updated='mapUpdated' :scale='mapScale' @callouttap='callouttap'
:enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline" :enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline"
subkey="UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN" layer-style='2' id="map_Id" :show-location="true" subkey="YR3BZ-EWX3M-JFW6U-6TREG-FXFJH-CMFWY" layer-style='2' id="map_Id" :show-location="true"
:markers="markers" class="map_xx" :latitude="coordinate.latitude" :longitude="coordinate.longitude"> :markers="markers" class="map_xx" :latitude="coordinate.latitude" :longitude="coordinate.longitude">
<cover-view slot="callout"> <cover-view slot="callout">
<cover-view v-for="(item,index) in markers" :key='index' class="customCallout" :marker-id="item.id"> <cover-view v-for="(item,index) in markers" :key='index' class="customCallout" :marker-id="item.id">
@@ -82,7 +82,7 @@
}, },
created() { created() {
this.TXSDK = new amapFile({ this.TXSDK = new amapFile({
key: 'UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN' key: 'YR3BZ-EWX3M-JFW6U-6TREG-FXFJH-CMFWY'
}); });
}, },
watch: { watch: {

5
BagStation/pages/overviewMap/overviewMap.vue
View File

@@ -7,7 +7,7 @@
<view @touchmove='touchmove' class="map_body"> <view @touchmove='touchmove' class="map_body">
<map :circles='circles' @regionchange='regionchange' @tap='poitap' @updated='mapUpdated' :scale='mapScale' <map :circles='circles' @regionchange='regionchange' @tap='poitap' @updated='mapUpdated' :scale='mapScale'
@callouttap='callouttap' :enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline" @callouttap='callouttap' :enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline"
subkey="UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN" layer-style='2' id="map_Id" :show-location="true" subkey="YR3BZ-EWX3M-JFW6U-6TREG-FXFJH-CMFWY" layer-style='2' id="map_Id" :show-location="true"
:markers="markers" class="map_xx" :latitude="coordinate.latitude" :longitude="coordinate.longitude"> :markers="markers" class="map_xx" :latitude="coordinate.latitude" :longitude="coordinate.longitude">
<cover-view v-if="circles[0].radius!==0" class="coverimage" <cover-view v-if="circles[0].radius!==0" class="coverimage"
:style="{width:`${img.width}rpx`,height:`${img.height}rpx`}"> :style="{width:`${img.width}rpx`,height:`${img.height}rpx`}">
@@ -111,8 +111,9 @@
// this.newMapMoveToLocation(this.circles[0].longitude,this.circles[0].latitude) // this.newMapMoveToLocation(this.circles[0].longitude,this.circles[0].latitude)
}, },
created() { created() {
// UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN
this.TXSDK = new amapFile({ this.TXSDK = new amapFile({
key: 'UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN' key: 'YR3BZ-EWX3M-JFW6U-6TREG-FXFJH-CMFWY'
}); });
}, },
watch: { watch: {

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

@@ -238,12 +238,14 @@
uni.setStorageSync('siteId', option.siteId) uni.setStorageSync('siteId', option.siteId)
return return
} }
let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse( let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(
option.item) : { option.item) : {
siteId: option.siteId siteId: option.siteId
} }
// console.log('oilItemoilItem',oilItem)
uni.setStorageSync('oilItem', oilItem) uni.setStorageSync('oilItem', oilItem)
this.getSiteInfo(oilItem.siteId) this.getSiteInfo(oilItem.siteId)
this.siteId = oilItem.siteId this.siteId = oilItem.siteId
@@ -264,7 +266,7 @@
methods: { methods: {
arousePhone() { arousePhone() {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber:'4008-56-5355' phoneNumber: '4008-56-5355'
}) })
}, },
areaJump() { areaJump() {
@@ -787,4 +789,4 @@
line-height: 30px; line-height: 30px;
font-size: 16px; font-size: 16px;
} }
</style> </style>

7
pages.json
View File

@@ -255,6 +255,13 @@
} }
}, { }, {
"path": "pages/makeOrder/G7Supplier",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},{
"path": "pages/makeOrder/JXPayResult", "path": "pages/makeOrder/JXPayResult",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",

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

@@ -562,6 +562,8 @@
}, },
toDetail(item) { toDetail(item) {
item.siteImages = item.siteImages && item.siteImages.split('?')[0]
let itemS = JSON.stringify(item) let itemS = JSON.stringify(item)
if (item.channelCode === 'TY') { if (item.channelCode === 'TY') {
uni.setStorageSync('OtherSiteInfo', item) uni.setStorageSync('OtherSiteInfo', item)

2
utils/request.js
View File

@@ -3,7 +3,7 @@ import utils from '@/utils/encode'
// const env = 'test' // const env = 'test'
const env = 'production' const env = 'production'
//
const testUrl = 'http://192.168.110.77:38080' const testUrl = 'http://192.168.110.77:38080'
// const productUrl = 'http://uat.xingoil.com/adminapi' // const productUrl = 'http://uat.xingoil.com/adminapi'
const productUrl = 'https://www.xingoil.com/adminapi' const productUrl = 'https://www.xingoil.com/adminapi'