pull/14/head
zhangyouji 1 year ago
parent 16bbe24e5b
commit d7746faca3
  1. 141
      BagStation/pages/components/price-select-tab.vue
  2. 9
      api/user.js

@ -189,11 +189,17 @@
</view> </view>
</view> </view>
<view> <view class=" menu cu-list " v-if="plateNumberOcrShow==true">
<view>车牌识别</view> <view class="cu-item nowrap">
<view> <view class="text-bold ">
<view class="cu-tn btn-box" @tap="srcPhoto"> 车牌识别
拍照 </view>
<view @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
<input v-model="plateNumberOcr" type="digit" class="block"
placeholder="请点击拍照识别车牌" value="" style="border-bottom: 1px solid #efefef;" />
</view>
<view @tap="srcPhoto">
<uni-icons type="camera-filled" size="30"></uni-icons>
</view> </view>
</view> </view>
</view> </view>
@ -517,13 +523,16 @@
activeChannelCode: '', activeChannelCode: '',
checkBar: [], checkBar: [],
realMoney: '', realMoney: '',
xoilAmountGun: '' xoilAmountGun: '',
plateNumberOcr:'',
plateNumberOcrShow:false
} }
}, },
created() { created() {
let oilItem = uni.getStorageSync('oilItem'), let oilItem = uni.getStorageSync('oilItem'),
oilSite = uni.getStorageSync(''), oilSite = uni.getStorageSync(''),
otherUser = uni.getStorageSync('otherUserInfo') otherUser = uni.getStorageSync('otherUserInfo'),
companyId = JSON.parse(uni.getStorageSync('companyCard')).companyId
if (otherUser) { if (otherUser) {
// console.log('') // console.log('')
this.isOtherUser = true this.isOtherUser = true
@ -533,6 +542,8 @@
console.log('oilItem', oilItem) console.log('oilItem', oilItem)
this.showtitles = oilItem.listTag; this.showtitles = oilItem.listTag;
this.init() this.init()
console.log(companyId)
this.getCompanyConfig(companyId)
}, },
watch: { watch: {
activeChannelCode: { activeChannelCode: {
@ -611,6 +622,18 @@
} }
}, },
methods: { methods: {
getCompanyConfig(companyId){
if(companyId){
user.getCompanyConfigByCompanyId(companyId).then(res=>{
if(res.data.plateNumberOcr==1){
this.plateNumberOcrShow = true
}else{
this.plateNumberOcrShow = false
}
})
}
},
srcPhoto(){ srcPhoto(){
let _that = this let _that = this
uni.chooseImage({ uni.chooseImage({
@ -618,55 +641,33 @@
sizeType: ['original', 'compressed'], // sizeType: ['original', 'compressed'], //
sourceType: ['camera'], // sourceType: ['camera'], //
success: function(res) { success: function(res) {
console.log(res) uni.showLoading({
// uni.showLoading({ title: '识别中',
// title: '', mask: true
// mask: true });
// });
uni.saveImageToPhotosAlbum({
filePath: res.tempFilePaths[0],
success: function (file) {
console.log('save success',res,file);
const JSESSIONID = utils.uuid()
uni.uploadFile({
url: 'http://uat.xingoil.com/oil-oss/obejct/uploadFile',
filePath: res.tempFilePaths[0],
formData: {
ossKey: 'xingyou',
pathKey: 'certificate',
encrypt: 'PUBLIC',
},
name: 'file',
header: {
"Content-Type": "multipart/form-data",
"Authorization": uni.getStorageSync('Authorization'),
'dataSources': 'MP',
"imei": uni.getStorageSync('unionid'),
"openId": uni.getStorageSync('openid'),
'JSESSIONID': JSESSIONID,
'token': utils.md5Salt(JSESSIONID)
},
success(e) {
uni.hideLoading()
console.log('进入2')
console.log(e)
// let obj = JSON.parse(e.data),
// url = obj.data.publicUrl
// user.carNoIdentify(data).then((res) => {
// console.log(res)
// let obj = JSON.parse(res.data)
// console.log(obj)
// })
},fail(res){
uni.hideLoading()
console.log(res,'fail')
}
})
}
});
const JSESSIONID = utils.uuid()
uni.uploadFile({
url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify',
filePath: res.tempFilePaths[0],
name: 'file',
header: {
"Content-Type": "multipart/form-data",
"Authorization": uni.getStorageSync('Authorization'),
'dataSources': 'MP',
"imei": uni.getStorageSync('unionid'),
"openId": uni.getStorageSync('openid'),
'JSESSIONID': JSESSIONID,
'token': utils.md5Salt(JSESSIONID)
},
success(e) {
uni.hideLoading()
let obj = JSON.parse(e.data)
_that.plateNumberOcr = obj.data.carNo
},fail(res){
uni.hideLoading()
}
})
} }
@ -1211,14 +1212,15 @@
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
} else { } else {
var orderData = { if(this.plateNumberOcrShow == true){
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.plateNumber ? this.plateNumber : this plateNumber: this.plateNumberOcrShow == true ? this.plateNumberOcr : this
.plateNumberSel, //String .plateNumber, //String
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
@ -1231,6 +1233,29 @@
'version': 1, 'version': 1,
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
}else{
var orderData = {
amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
shareCompanyQuota: 0, //
priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //String
orderType: "REAL_ORDER", //String REAL_ORDER VIRTUAL_ORDER
orderSource: "WECHAT_MINIAPPS", //String WECHAT_MINIAPPS
plateNumber: this.plateNumber ? this.plateNumber : this
.plateNumberSel, //String
siteUserName: this.jober, //String
oilsBar: this.oilBar, //Number
volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
.vol, //Number
realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //Number
suppleMark: 0, //Number 0 1
createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //String XOIL_DRIVER_COMPANY_WECHAT_APPLET
// "deviceImei": "mock", //String
// "networkIp": "mock" //String ip
'version': 1,
'xoilAmountGun': this.vol
}
}
} }
// console.log(orderData) // console.log(orderData)
let location = uni.getStorageSync('location') || { let location = uni.getStorageSync('location') || {

@ -1,5 +1,5 @@
import request from '@/utils/request' import request from '@/utils/request'
const service_name = "user" const service_name = "oil-user"
const group_name = "oilCustomerInfo" const group_name = "oilCustomerInfo"
export default{ export default{
carNoIdentify(data) { //图片上传-ORC识别 carNoIdentify(data) { //图片上传-ORC识别
@ -9,4 +9,11 @@ export default{
data: data data: data
}) })
}, },
// 查询企业配置
getCompanyConfigByCompanyId(id) {
return request({
url: `/${service_name}/oil-user/getCompanyConfigByCompanyId?companyId=${id}`,
method: 'GET'
})
},
} }
Loading…
Cancel
Save