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

Merge branch 'caolc' of http://192.168.0.140:3000/xkhl/LSM_OIL_SITE into lixuan

Browse Source
This commit is contained in:
lixuan
2022-06-10 10:14:47 +08:00
parent 4ffb634e97 e684eab82f
commit d03ffc4850
8 changed files with 326 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
package-lock.json generated
View File

@@ -1,8 +1,109 @@
{
"name": "lsm_oil_site",
"version": "1.0.0",
"lockfileVersion": 1,
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "lsm_oil_site",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"axios": "^0.19.2",
"crypto-js": "4.0.0",
"js-cookie": "2.2.1",
"js-md5": "0.7.3",
"jsencrypt": "^3.0.0-rc.1",
"tki-qrcode": "^0.1.6",
"tsc": "^2.0.3",
"typescript": "^4.3.5",
"uview-ui": "^1.8.4"
}
},
"node_modules/axios": {
"version": "0.19.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
"deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
"dependencies": {
"follow-redirects": "1.5.10"
}
},
"node_modules/crypto-js": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
},
"node_modules/debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"dependencies": {
"debug": "=3.1.0"
},
"engines": {
"node": ">=4.0"
}
},
"node_modules/js-cookie": {
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
"integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
},
"node_modules/js-md5": {
"version": "0.7.3",
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
},
"node_modules/jsencrypt": {
"version": "3.0.0-rc.1",
"resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz",
"integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw="
},
"node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/tki-qrcode": {
"version": "0.1.6",
"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
},
"node_modules/tsc": {
"version": "2.0.3",
"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=",
"bin": {
"tsc": "bin/tsc"
}
},
"node_modules/typescript": {
"version": "4.3.5",
"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=4.2.0"
}
},
"node_modules/uview-ui": {
"version": "1.8.4",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
}
},
"dependencies": {
"axios": {
"version": "0.19.2",

2
packageOrders/components/order-item.vue
View File

@@ -30,7 +30,7 @@
{{item.oilsCode}}
</text>
<text class=" text-lg text-bold text-red " v-if="item.volume">
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text>
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
</view>
<view class="bottom text-left">

11
packageOrders/pages/orderList/OrderDetail/OrderDetail.vue
View File

@@ -55,11 +55,11 @@
</view> -->
<view class="margin-bottom-sm">
油机单价
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
</view>
<view class="margin-bottom-sm">
{{ orderItem.oilProductType=='GAS'?'加气重量':'加油升数' }}
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
{{ orderItem.oilProductType=='GAS'?'加气升数':'加油升数' }}
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
</view>
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
油机总价
@@ -183,7 +183,7 @@
},
filters:{
company(e){
if(e) return e=='GAS'?'KG':'L';
if(e) return e=='GAS'?'L':'L';
},
},
computed: {
@@ -454,7 +454,8 @@
// if( _that.zeyiType == 1){
// return value
// }
let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
// let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
let number = Number(value).toFixed(2)
return number
} else {
return '0.00'

2
pages/TransactionStatistics/TransactionStatistics.vue
View File

@@ -92,7 +92,7 @@
</view>
<view class="bottom text-left margin-top-xs margin-bottom-xs">
<text class="padding-left-xs text-lg">
<text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text>
<text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
<!-- {{item.createTime}} -->
</text>
</view>

2
pages/home/home.vue
View File

@@ -312,7 +312,7 @@
markerPhone(){
if (this.sitInfo.phone) {
uni.makePhoneCall({
phoneNumber:this.sitInfo.phone
phoneNumber:'4008-56-5355'
})
} else {
uni.showToast({

13
pages/index/index.vue
View File

@@ -129,8 +129,21 @@
this.longiCheck()
// //console.log('++++++++')
//console.log('这里是传值处menus',this.menusList)
this.getPosition()
},
methods: {
getPosition(){
let that = this
uni.getLocation({
type: 'gcj02',
success: function(res) {
uni.setStorage({
key:'location',
data:res
})
}
});
},
changMenus(data){
//console.log('这里是获取子级数据的地方+++++',data)
this.menusList =data

149
pages/stationDetail/ZYSite.vue
View File

@@ -105,11 +105,11 @@
name="input" /> -->
<view style="flex-grow: 1; display: flex;" @tap="showModel='show'">
<view v-if="hz(carNumber.charAt(0))" class="sign">
{{carNumber.charAt(0)||''}}
<view v-if="hz( String(carNumber).charAt(0))" class="sign">
<text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text>
<uni-icons color="#ffffff" type="forward" size="15"></uni-icons>
</view>
<view class="flexcenter">{{carNumber.substr(1,6)||'请输入车牌号'}}</view>
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view>
</view>
<!-- <text class="cuIcon-roundclosefill text-gray"></text> -->
@@ -168,7 +168,10 @@
v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
<text class="text-blod oil-main-color" v-else>无价格</text>
</text>
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥{{insertResult.oilSitePrice }}/{{siteData.siteType|company }}</text>
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
<text class="text-blod oil-main-color" v-else>无价格</text>
</text>
</view>
@@ -203,13 +206,15 @@
<text>约￥{{insertResult.vMoney|numberFilter}}</text>
</view>
<view class="cu-form-group" v-else>
<view class="title newtitle"> {{siteData.siteType=='2'?'加气金额':'加油金额'}}</view>
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气金额':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view>
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
v-model="insertResult.vol" name="input" />
<view style="width: 170rpx;text-align: end;" class="textEllipsis">
<text class="">
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 -->
{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'KG':'L'):''}}
<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
<text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
<!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
</text>
</view>
</view>
@@ -226,7 +231,7 @@
</view>
</view>
</view>
<button class="margin round bg-main-oil" @tap="charge">立即下单</button>
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button>
</view>
</view>
<view class v-show="!beforePay&&isG7">
@@ -501,10 +506,10 @@
getMoney(e) {
console.log(e)
if (e.detail.value == '') {
uni.showToast({
title: '请输入金额',
icon: 'none'
})
// uni.showToast({
// title: '请输入金额',
// icon: 'none'
// })
return
}
let isNumber = this.isNumber(e.detail.value)
@@ -537,7 +542,8 @@
userType: uerTyps,
xoilAmountGun: e.detail.value,
priceId: this.activeSitePrice,
companyId: this.siteData.companyId
companyId: this.siteData.companyId,
createSource:this.siteData.siteType=='2'?'XOIL':''
}
}
this.xoilAmountGun = e.detail.value
@@ -627,6 +633,7 @@
this.changTypes = 0
},
charge() {
//防抖
clearTimeout(this.shake)
this.shake = setTimeout(()=>{
this.tsetPlate()
@@ -662,12 +669,14 @@
title: '车牌号校验不通过',
icon: 'none'
});
this.shake=null
}
} else {
uni.showToast({
title: '您选择的油品没有油价，不能加油',
icon: 'none'
});
this.shake=null
}
},500)
@@ -691,6 +700,7 @@
title: 'qrCode为空',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.siteId) {
@@ -698,6 +708,7 @@
title: '请选择油站id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.companyId) {
@@ -705,6 +716,7 @@
title: '请选择企业id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.customerId) {
@@ -712,6 +724,7 @@
title: '请选择司机id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.volume) {
@@ -719,6 +732,7 @@
title: '请输入加油体积',
icon: 'none'
});
this.shake=null
return false
}
oliSiteApi.FYPay(data6).then(res => {
@@ -745,7 +759,9 @@
this.getPayStatus(this.orderId)
}, 400)
}
// setTimeout(()=>{
// this.shake=null
// },1000)
}
})
},//安能
@@ -845,6 +861,7 @@
title: 'qrCode为空',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.siteId) {
@@ -852,6 +869,7 @@
title: '请选择油站id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.companyId) {
@@ -859,6 +877,7 @@
title: '请选择企业id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.customerId) {
@@ -866,6 +885,7 @@
title: '请选择司机id',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.volume) {
@@ -873,6 +893,7 @@
title: '请输入加油体积',
icon: 'none'
});
this.shake=null
return false
}
oliSiteApi.sfPay(data6).then(res => {
@@ -899,7 +920,9 @@
// this.getPayStatus(this.orderId)
// }, 400)
// }
// setTimeout(()=>{
// this.shake=null
// },1000)
}
})
},
@@ -938,6 +961,7 @@
title: '请选择油品',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.volume) {
@@ -945,6 +969,7 @@
title: '请输入加油体积',
icon: 'none'
});
this.shake=null
return false
}
oliSiteApi.RrsPay(data6).then(res => {
@@ -984,7 +1009,9 @@
this.getPayStatus(this.orderId)
}, 400)
}
// setTimeout(()=>{
// this.shake=null
// },1000)
}
})
},
@@ -994,6 +1021,7 @@
let PlateNumberImages = this.PlateNumberImages,
refuellerImages = this.refuellerImages
if (PlateNumberImages == '') {
this.shake=null
uni.showToast({
icon: 'none',
title: '请上传车辆照片'
@@ -1005,6 +1033,7 @@
icon: 'none',
title: '请上传油机照片'
})
this.shake=null
return
}
var data6 = {
@@ -1031,7 +1060,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: 1, //类型：Number 必有字段 备注：版本号
version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
}
} else {
@@ -1056,7 +1085,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: 1, //类型：Number 必有字段 备注：版本号
version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
}
}
@@ -1066,17 +1095,80 @@
title: '请选择油品',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.volume) {
if (!Number(data6.volume)) {
if(this.siteData.siteType=='2'){
uni.showToast({
title: '请输入加油体积',
title: '请输入加油升数',
icon: 'none'
});
}else{
uni.showToast({
title: '请输入加油金额',
icon: 'none'
});
}
this.shake=null
return false
}
let location = uni.getStorageSync('location')||{longitude:'',latitude:''};
// if(!location){
// let locationChenk = true
// let that = this
// uni.getLocation({
// type: 'gcj02',
// success: function(res) {
// uni.setStorage({
// key:'location',
// data:res
// })
// },
// fail(e) {
// locationChenk = false
// },
// });
// if(!locationChenk){
// uni.showToast({
// title:'请授权位置',
// icon:'error'
// })
// }
// console.log(location,'**************************************************')
// return
// }
// uni.getLocation({
// type: 'gcj02',
// success: function(res) {
// uni.setStorage({
// key:'location',
// data:res
// })
// },
// fail(e) {
// uni.showModal({
// title:'获取定位',
// content:'是否重新获取定位?',
// success:function(e){
// wx.openSetting({
// success:function(e){
// if (res.authSetting['scope.userLocation']){
// console.log('******')
// }
// },
// fail:function(e){
// console.log(e,'//////')
// }
// })
// }
// })
// },
// });
// return
//
console.log(data6, 'data6+++++')
oliSiteApi.xoilPay(data6).then(res => {
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => {
console.log(res)
if (res.code === 20000) {
uni.showToast({
@@ -1098,7 +1190,6 @@
// createDatetime: res.data.orderTime,
// realamount: res.data.payRealAmount,
// istate: res.data.orderStatus
// }
// uni.setStorageSync('tempOrderInfo', data8)
uni.setStorageSync('orderSource', 'mpxoil')
@@ -1114,8 +1205,10 @@
this.getPayStatus(this.orderId)
}, 400)
}
}
setTimeout(()=>{
this.shake=null
},1000)
})
},
// 收费则yi
@@ -1142,6 +1235,7 @@
title: '请选择油品',
icon: 'none'
});
this.shake=null
return false
}
if (!data6.volume) {
@@ -1149,6 +1243,7 @@
title: '请输入加油体积',
icon: 'none'
});
this.shake=null
return false
}
oliSiteApi.zeyiPay(data6).then(res => {
@@ -1189,7 +1284,9 @@
this.getPayStatus(this.orderId)
}, 400)
}
setTimeout(()=>{
this.shake=null
},1000)
}
})
},
@@ -1253,7 +1350,7 @@
oilsStationId: uni.getStorageSync('oilSiteId') //类型：String 必有字段 备注：加油站id
}
// }
console.log(obj)
console.log(obj,'**************');
oliSiteApi.verifyQrCode(obj).then(res => {
if (res.code === 20000) {
this.siteData = res.data
@@ -1397,7 +1494,7 @@
if(e){
return e=='2' ?'KG':'L';
} else {
return 'L'
return ''
}
},
moneyVolm(value) {

2
utils/request.js
View File

@@ -7,7 +7,7 @@ import utils from '@/utils/encode'
//42 洛超 /29 孙志华 /40 阿浩
// 测试日日顺时需要连阿浩
const testUrl = 'http://192.168.0.150:38080'
const testUrl = 'http://192.168.0.31:38080'
// const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
const productionUrl = 'http://192.168.0.191:38080' //测试