qiubinghui
/
zhywpt-sp
Seguir 1
Destacar 0
Fork 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

提交代码

yxb
DESKTOP-2IO5MST\huting hace 1 año
padre
1a97e1fbce
commit
ceeec5c444
Se han modificado 5 ficheros con 146 adiciones y 131 borrados
Dividir vista Mostrar estadísticas de diff
  1. 11
    6
      subpackage/after-sale/ETC-product-status-list-query/ETC-product-status-list-query-details.vue
  2. 14
    5
      subpackage/orders/car-release.vue
  3. 2
    1
      subpackage/orders/opening-account-people.vue
  4. 6
    6
      utils/network/api.js
  5. 113
    113
      utils/utils.ts

+ 11
- 6
subpackage/after-sale/ETC-product-status-list-query/ETC-product-status-list-query-details.vue Ver fichero

@@ -46,10 +46,7 @@
};
//调用方式
request(ETCProductStatusListQueryDetailsApi, options).then((res) => {

const data = (stringToJson(res.bizContent))
state.tableData = stringToJson(res.bizContent)

console.log("res", state.tableData)
})
}
@@ -76,10 +73,18 @@

.list-item>view {
margin-bottom: 20rpx;
display: flex;
align-items: center;
}

.list-item>view>text:first-child {
width: 38%;
display: inline-block;
}

/* .list-item>view>text {
width: 30%;
.list-item>view>text:last-child {
width: 62%;
display: inline-block;
} */
word-break: break-all;
}
</style>

+ 14
- 5
subpackage/orders/car-release.vue Ver fichero

@@ -570,8 +570,8 @@
state.changeColor = true;
state.phoneType = 0
state.isTakePhotoModeShow = false
// uploadFile(val.tempImagePath, imageType, etcCarOcrCard).then((data) => {
uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
uploadFile(val.tempImagePath, imageType, etcCarOcrCard).then((data) => {
// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
console.log('输出内容=====================', state.choiceIndex)
if (state.choiceIndex === "3") {
if (data.plate_a.length > 8) {
@@ -594,14 +594,23 @@
state.form.approvedCountShow = data.apc;
state.form.maintenaceMass = data.unladen;
state.form.maintenaceMassShow = data.unladen;
// 91接口差
// // #ifdef MP-WEIXIN
// state.form.vehicleDimensions = data.overall.replaceAll("×", "X");
// // #endif
// // #ifdef MP-ALIPAY
// state.form.vehicleDimensions = data.overall.replace(/×/g, "X");
// // #endif

// let arr = data.overall.split("×");
// #ifdef MP-WEIXIN
state.form.vehicleDimensions = data.overall.replaceAll("×", "X");
state.form.vehicleDimensions = data.overall.replaceAll("x", "X");
// #endif
// #ifdef MP-ALIPAY
state.form.vehicleDimensions = data.overall.replace(/×/g, "X");
state.form.vehicleDimensions = data.overall.replace(/x/g, "X");
// #endif

let arr = data.overall.split("×");
let arr = data.overall.split("x");
state.outlineL = arr[0]; //外廓 长
state.outlineW = arr[1]; //外廓 宽
state.outlineH = arr[2].substring(0, arr[2].length - 2); //外廓 高

+ 2
- 1
subpackage/orders/opening-account-people.vue Ver fichero

@@ -602,7 +602,8 @@
state.isTakePhotoModeShow = false
var imageType = state.choiceIndex;
console.log("图片地址val", val.tempImagePath)
uploadFile(val.tempImagePath, imageType, ocrAllQuery).then((data) => {
// uploadFile(val.tempImagePath, imageType, ocrAllQuery).then((data) => {
uploadFile(val.tempImagePath, imageType, etcOcrCard).then((data) => {
console.log("身份证上传", data)
if (state.isMy == "my") {
if (state.choiceIndex == "1") {

+ 6
- 6
utils/network/api.js Ver fichero

@@ -1,7 +1,7 @@
/* 接口中常量 */
// export const URL = "192.168.100.63";
export const URL = "trial.etcjz.cn";
// export const URL = "qtzl.etcjz.cn";
// export const URL = "trial.etcjz.cn";
export const URL = "qtzl.etcjz.cn";
// export const URL = "qtzl.etcjz.cn/test";
// http://192.168.100.63:50001
/**
@@ -10,8 +10,8 @@ export const URL = "trial.etcjz.cn";
export const envs = {
//开发环境配置
development: {
baseUrl: "https://trial.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "https://trial.etcjz.cn",
baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn/test",
// baseUrl: "http://192.168.100.158:8085",
// baseUrl: "http://192.168.100.63:50001",
@@ -20,8 +20,8 @@ export const envs = {
production: {
// baseUrl: "http://192.168.124.6:8087",
// baseUrl: "http://222.85.144.89:19002",
// baseUrl: "https://qtzl.etcjz.cn",
baseUrl: "https://trial.etcjz.cn",
baseUrl: "https://qtzl.etcjz.cn",
// baseUrl: "https://trial.etcjz.cn",
// baseUrl: "https://qtzl.etcjz.cn/test",
// baseUrl: "http://192.168.100.158:8085",
// baseUrl: "http://192.168.100.63:50001",

+ 113
- 113
utils/utils.ts Ver fichero

@@ -432,66 +432,6 @@ function formatNumber(n : any) {
n = n.toString()
return n[1] ? n : `0${n}`
}
// export const uploadFile = (tempImagePath, imageType, code) => {
// return new Promise((resolve, reject) => {
// uni.uploadFile({
// url: 'https://qtzl.etcjz.cn/minIo/upload', //仅为示例，非真实的接口地址
// filePath: tempImagePath,
// name: 'file',
// formData: {
// 'user': 'test',
// "bucket": 'default-bucket'
// },
// success: (uploadFileRes) => {
// let uploadFileImage = 'http://100.64.2.113:9000' + '/default-bucket/' + JSON.parse(uploadFileRes.data).data.ossFilePath
// console.log("111", JSON.parse(uploadFileRes.data).data.ossFilePath);
// if (code == 15) { //身份证
// var data = {
// source: "1",
// agencyId: "52010106004",
// imageType: imageType,
// fileName: tempImagePath,
// url: uploadFileImage
// };
// } else if (code == 16) { //行驶证
// var data = {
// source: "1",
// agencyId: "52010106004",
// imageType: imageType,
// fileName: tempImagePath,
// imageUrl: uploadFileImage
// };
// } else if (code == "") { //委托书 车头照 17
// let uploadFileImage = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/' + JSON.parse(uploadFileRes.data).data.ossFilePath

// console.log("17", uploadFileImage)
// resolve(uploadFileImage)
// return;
// } else if (code == '91') { //营业执照
// var data = {
// type: 'business_license',
// url: uploadFileImage
// };
// console.log("91", uploadFileImage)
// }


// const options = {
// type: 2,
// data: data,
// method: "POST",
// showLoading: true,
// };
// request(code, options).then((res) => {
// const data = stringToJson(res.bizContent);
// console.log('输出内容=====123', data)
// resolve(data)

// });
// }
// });
// })
// }
export const uploadFile = (tempImagePath, imageType, code) => {
return new Promise((resolve, reject) => {
uni.uploadFile({
@@ -528,18 +468,8 @@ export const uploadFile = (tempImagePath, imageType, code) => {
resolve(uploadFileImage)
return;
} else if (code == '91') { //营业执照
var type = ""
if (imageType == 1) {
type = "id_front"
} else if (imageType == 2) {
type = "id_back"
} else if (imageType == 3) {
type = "dl_homepage"
} else if (imageType == 4) {
type = "dl_subpage"
}
var data = {
type: type,
type: 'business_license',
url: uploadFileImage
};
console.log("91", uploadFileImage)
@@ -554,54 +484,124 @@ export const uploadFile = (tempImagePath, imageType, code) => {
};
request(code, options).then((res) => {
const data = stringToJson(res.bizContent);
let dataNew = ''
if (imageType == 1) {
dataNew = JSON.parse(data.result.idFront)
dataNew['name'] = JSON.parse(data.result.idFront)['姓名']
dataNew['gender'] = JSON.parse(data.result.idFront)['姓别']
dataNew['idno'] = JSON.parse(data.result.idFront)['公民身份号码']
dataNew['imageUrl'] = uploadFileImage
dataNew['address'] = JSON.parse(data.result.idFront)['住址']
} else if (imageType == 2) {
dataNew = JSON.parse(data.result.idBack)
dataNew['enddate'] = JSON.parse(data.result.idBack)['有效期限']
dataNew['imageUrl'] = uploadFileImage
} else if (imageType == 3) {
dataNew = JSON.parse(data.result.dlHomepage)
dataNew['plate_a'] = JSON.parse(data.result.dlHomepage)['号牌号码']
dataNew['man'] = JSON.parse(data.result.dlHomepage)['所有人']
dataNew['vehicle'] = JSON.parse(data.result.dlHomepage)['车辆类型']
dataNew['character'] = JSON.parse(data.result.dlHomepage)['使用性质']
dataNew['vin'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
dataNew['engine'] = JSON.parse(data.result.dlHomepage)['发动机号码']
// 注册日期识别有问题 所有人偶尔能识别出来
// dataNew['register'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
// dataNew['issue'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
dataNew['imageUrl'] = uploadFileImage
dataNew['model'] = JSON.parse(data.result.dlHomepage)['品牌型号']
console.log("data3", dataNew)
} else if (imageType == 4) {
dataNew = JSON.parse(data.result.dlSubpage)
dataNew['apc'] = JSON.parse(data.result.dlSubpage)['核定载人数']
dataNew['unladen'] = JSON.parse(data.result.dlSubpage)['整备质量']
dataNew['overall'] = JSON.parse(data.result.dlSubpage)['外廓尺寸']
// 总质量识别有问题，但是能识别出来
dataNew['gross'] = JSON.parse(data.result.dlSubpage)['总质量']
dataNew['imageUrl'] = uploadFileImage
dataNew['alc'] = JSON.parse(data.result.dlSubpage)['核定载质量']
dataNew['towing'] = JSON.parse(data.result.dlSubpage)['准牵引总质量']
console.log("data4", dataNew)
}


console.log('输出内容=====123', dataNew)
resolve(dataNew)
console.log('输出内容=====123', data)
resolve(data)

});
}
});
})
}
// export const uploadFile = (tempImagePath, imageType, code) => {
// return new Promise((resolve, reject) => {
// uni.uploadFile({
// url: 'https://qtzl.etcjz.cn/minIo/upload', //仅为示例，非真实的接口地址
// filePath: tempImagePath,
// name: 'file',
// formData: {
// 'user': 'test',
// "bucket": 'default-bucket'
// },
// success: (uploadFileRes) => {
// let uploadFileImage = 'http://100.64.2.113:9000' + '/default-bucket/' + JSON.parse(uploadFileRes.data).data.ossFilePath
// console.log("111", JSON.parse(uploadFileRes.data).data.ossFilePath);
// if (code == 15) { //身份证
// var data = {
// source: "1",
// agencyId: "52010106004",
// imageType: imageType,
// fileName: tempImagePath,
// url: uploadFileImage
// };
// } else if (code == 16) { //行驶证
// var data = {
// source: "1",
// agencyId: "52010106004",
// imageType: imageType,
// fileName: tempImagePath,
// imageUrl: uploadFileImage
// };
// } else if (code == "") { //委托书 车头照 17
// let uploadFileImage = envs[process.env.NODE_ENV].baseUrl + '/default-bucket/' + JSON.parse(uploadFileRes.data).data.ossFilePath

// console.log("17", uploadFileImage)
// resolve(uploadFileImage)
// return;
// } else if (code == '91') { //营业执照
// // id_back: 身份证背页 id_front: 身份证前页 bank_card：银行卡 business_license: 营业执照 dl_subpage副页 dl_homepage主页
// var type = ""
// if (imageType == 1) {
// type = "id_front"
// } else if (imageType == 2) {
// type = "id_back"
// } else if (imageType == 3) {
// type = "dl_homepage"
// } else if (imageType == 4) {
// type = "dl_subpage"
// } else {
// type = "business_license"
// }
// var data = {
// type: type,
// url: uploadFileImage
// };
// console.log("91", uploadFileImage)
// }


// const options = {
// type: 2,
// data: data,
// method: "POST",
// showLoading: true,
// };
// request(code, options).then((res) => {
// const data = stringToJson(res.bizContent);
// let dataNew = ''
// if (imageType == 1) {
// dataNew = JSON.parse(data.result.idFront)
// dataNew['name'] = JSON.parse(data.result.idFront)['姓名']
// dataNew['gender'] = JSON.parse(data.result.idFront)['姓别']
// dataNew['idno'] = JSON.parse(data.result.idFront)['公民身份号码']
// dataNew['imageUrl'] = uploadFileImage
// dataNew['address'] = JSON.parse(data.result.idFront)['住址']
// } else if (imageType == 2) {
// dataNew = JSON.parse(data.result.idBack)
// dataNew['enddate'] = JSON.parse(data.result.idBack)['有效期限']
// dataNew['imageUrl'] = uploadFileImage
// } else if (imageType == 3) {
// dataNew = JSON.parse(data.result.dlHomepage)
// dataNew['plate_a'] = JSON.parse(data.result.dlHomepage)['号牌号码']
// dataNew['man'] = JSON.parse(data.result.dlHomepage)['所有人']
// dataNew['vehicle'] = JSON.parse(data.result.dlHomepage)['车辆类型']
// dataNew['character'] = JSON.parse(data.result.dlHomepage)['使用性质']
// dataNew['vin'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
// dataNew['engine'] = JSON.parse(data.result.dlHomepage)['发动机号码']
// // 注册日期识别有问题 所有人偶尔能识别出来
// // dataNew['register'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
// // dataNew['issue'] = JSON.parse(data.result.dlHomepage)['车辆识别代号']
// dataNew['imageUrl'] = uploadFileImage
// dataNew['model'] = JSON.parse(data.result.dlHomepage)['品牌型号']
// console.log("data3", dataNew)
// } else if (imageType == 4) {
// dataNew = JSON.parse(data.result.dlSubpage)
// dataNew['apc'] = JSON.parse(data.result.dlSubpage)['核定载人数']
// dataNew['unladen'] = JSON.parse(data.result.dlSubpage)['整备质量']
// dataNew['overall'] = JSON.parse(data.result.dlSubpage)['外廓尺寸']
// // 总质量识别有问题，但是能识别出来
// dataNew['gross'] = JSON.parse(data.result.dlSubpage)['总质量']
// dataNew['imageUrl'] = uploadFileImage
// dataNew['alc'] = JSON.parse(data.result.dlSubpage)['核定载质量']
// dataNew['towing'] = JSON.parse(data.result.dlSubpage)['准牵引总质量']
// console.log("data4", dataNew)
// }
// console.log('输出内容=====123', dataNew)
// resolve(dataNew)
// });
// }
// });
// })
// }
/**
* 获取距离当前时间的 (天数/小时数/分钟数)
* @param {*} timesData '2018-05-17 16:58:00'

Escribir Vista previa
Cargando…
Cancelar
Guardar