Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

This commit is contained in:
邓晓坤
2019-10-16 15:04:28 +08:00
2 changed files with 7 additions and 9 deletions

View File

@@ -600,7 +600,7 @@ export default {
// console.log(type) // console.log(type)
// 此时可以自行将文件上传至服务器 // 此时可以自行将文件上传至服务器
that.file = file.content that.file = file.content
that.imgName = new Date().getTime() + file.file.name that.imgName = Math.floor(Math.random() * 100).toString() + new Date().getTime() + file.file.name //为图片名加随机数 与时间戳
that.uploadImg() that.uploadImg()
}, },
@@ -720,7 +720,7 @@ export default {
//银行卡正面 //银行卡正面
imageInfoType = '3' imageInfoType = '3'
} else if (that.type == 'fileListBankBack') { } else if (that.type == 'fileListBankBack') {
//银行卡 //银行卡
imageInfoType = '19' imageInfoType = '19'
} }
let obj = { let obj = {
@@ -1043,7 +1043,6 @@ export default {
val.radio !== '') || val.radio !== '') ||
(val.fileListIdFront.length != '0' && (val.fileListIdFront.length != '0' &&
val.fileListIdBack.length != '0' && val.fileListIdBack.length != '0' &&
val.fileListBankBack.length != '0' &&
val.fileListIdFrontInsured.length != '0' && val.fileListIdFrontInsured.length != '0' &&
val.fileListIdBackInsured.length != '0' && val.fileListIdBackInsured.length != '0' &&
val.fileListBankInsured.length != '0' && val.fileListBankInsured.length != '0' &&
@@ -1055,7 +1054,6 @@ export default {
val.radio !== '') || val.radio !== '') ||
(val.fileListIdFront.length != '0' && (val.fileListIdFront.length != '0' &&
val.fileListIdBack.length != '0' && val.fileListIdBack.length != '0' &&
val.fileListBankBack.length != '0' &&
val.fileListBankInsured.length != '0' && val.fileListBankInsured.length != '0' &&
val.fileLIstImgInsured.length != '0' && val.fileLIstImgInsured.length != '0' &&
val.radio !== '') || val.radio !== '') ||

View File

@@ -126,7 +126,7 @@ export default {
let that = this let that = this
let data = { let data = {
orderNo: window.localStorage.getItem('orderNo') orderNo: window.localStorage.getItem('orderNo')
// orderNo: '19091111335500682455' // orderNo: '8186270000000806'
} }
getDetail(data).then(res => { getDetail(data).then(res => {
console.log(res) console.log(res)
@@ -230,10 +230,10 @@ export default {
// item.idType = '其他' // item.idType = '其他'
// break // break
case '8': case '8':
res.orderDTO.appntDTO.idType = '外国人永久居留身份证' item.idType = '外国人永久居留身份证'
break break
case '9': case '9':
res.orderDTO.appntDTO.idType = '港澳台居民居住证' item.idType = '港澳台居民居住证'
break break
} }
switch (item.relationToAppnt) { switch (item.relationToAppnt) {
@@ -285,10 +285,10 @@ export default {
// it.idType = '其他' // it.idType = '其他'
// break // break
case '8': case '8':
res.orderDTO.appntDTO.idType = '外国人永久居留身份证' it.idType = '外国人永久居留身份证'
break break
case '9': case '9':
res.orderDTO.appntDTO.idType = '港澳台居民居住证' it.idType = '港澳台居民居住证'
break break
} }
switch (it.relationToInsured) { switch (it.relationToInsured) {