Skip to content

H
hls-xcmg-vue-app
Commit 95428dd6 authored by 786817560's avatar 786817560
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 2708c33b e6ceaa42
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 445 additions and 76 deletions
config/dev.env.js
View file @ 95428dd6
......@@ -9,7 +9,7 @@ module.exports = merge(prodEnv, {
isMobilePlatform: false,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=admin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api/interface"',
rootPath: '"http://180.104.121.66:8088/r/api"',
ocrPath:'"http://180.104.121.66:8088/r/api"',
file_url: '"http://hlsapp.hand-china.com/file/"',
appId: '"com.hls.easy.car"',
......
config/uat.env.js
View file @ 95428dd6
......@@ -6,7 +6,7 @@ module.exports = {
isMobilePlatform: true,
loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=admin&password=" ',
basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
rootPath: '"http://180.104.121.66:8088/r/api/interface"',
rootPath: '"http://180.104.121.66:8088/r/api"',
ocrPath:'"http://180.104.121.66:8088/r/api"',
file_url: '"http://hlsapp.hand-china.com/file/"',
appId: '"com.hls.easy.car"',
......
src/pages/myInfo/my-info.vue
View file @ 95428dd6
This diff is collapsed.
src/pages/pwd-forgotten.vue
View file @ 95428dd6
......@@ -98,7 +98,7 @@ export default {
},
created () {
let vm = this
let url = process.env.loginPath + 'appadmin'
let url = process.env.loginPath + 'admin'
let param = {}
vm.$post(url, param).then(function (res) {
window.localStorage.setItem('access_token', res.access_token)
......
src/pages/regiester.vue
View file @ 95428dd6
......@@ -95,7 +95,7 @@ export default {
},
created () {
let vm = this
let url = process.env.loginPath + 'appadmin'
let url = process.env.loginPath + 'admin'
let param = {}
vm.$post(url, param).then(function (res) {
window.localStorage.setItem('access_token', res.access_token)
......
src/pages/userBind/np/naturePerson.vue
View file @ 95428dd6
......@@ -193,28 +193,22 @@
</item>
</list-item>
</div>
<div class="userInfo">资产信息</div>
<div class="card">
<span>房产证件</span>
<div v-if="cddItemList.length" class="userInfo">资产信息</div>
<div v-for="(list, index) in cddItemList" :key="index" class="card">
<span>{{ list.description }}</span>
<div class="img-content">
<div class="card-upload">
<img src="@/assets/userBind/camera.png" >
<!--待上传图片列表-->
<div v-for="(list, index) in upload_list" :key="index">
<img :src="list.picture" >
</div>
</div>
</div>
<div class="card">
<span>车辆证件</span>
<div class="img-content">
<div class="card-upload">
<img src="@/assets/userBind/camera.png" >
<!--从服务器上下载的图片-->
<div v-for="item in dowload_list" class="card-upload">
<div v-for="(pic, index) in item" :key="index">
<img :src="item.url" >
</div>
</div>
</div>
</div>
<div class="card">
<span>其他资产证件</span>
<div class="img-content">
<div class="card-upload">
<img src="@/assets/userBind/camera.png" >
<div class="card-upload" @click="imgUploadShow(list.check_id)">
<img src="@/assets/userBind/camera.png" class="upload-btn">
</div>
</div>
</div>
......@@ -307,7 +301,8 @@ export default {
from: false,
cityList: [],
provinceList: [],
upload_list: [],
upload_list: [], // 上传图片列表
dowload_list: [], // 下载图片列表
typeList: [],
backList: [],
bankList: [],
......@@ -355,6 +350,7 @@ export default {
idCardFront: '', // 身份证正面图片
idCardBack: '', // 身份证反面图片
bankImg: '', // 银行卡图片
cddItemList: [], // 资料清单列表
}
},
watch: {
......@@ -406,7 +402,7 @@ export default {
}
},
beforeRouteEnter (to, from, next) {
if (from.fullPath === '/tab/my-info') { // 绑定查询入口
if (from.fullPath === '/tab/my-info') { // 绑定查询入口
next(vm => {
vm.basicInfoQuery()
vm.from = true
......@@ -435,9 +431,28 @@ export default {
})
},
async verified () {
let bpId = await this.saveWord()
this.getBankInfo()
// let bpId = await this.saveWord()
// this.getBankInfo()
// 查询资料清单
this.loadItemList()
},
loadItemList () {
let vm = this
let url = process.env.basePath + 'prj_cdd_check_list'
let param = {
master: {
'document_id': 7928,
'document_table': 'HLS_BP_MASTER',
'tab_group': 'HLS_NP',
},
}
// vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.cddItemList = [...res.lists]
}
})
},
async saveProtocol () {
let vm = this
......@@ -501,7 +516,119 @@ export default {
return bpId
}
},
/* uploadIdCardFront () {
// 图片上传入口
imgUploadShow(check_id){
let vm = this
hlsPopup.showActionSheet({
titleText: '请选择照片',
buttonArray: ['拍照', '从相册取'],
callback: index => {
if (index === 0) {
vm.imgUploadOpenCamera(check_id)
} else {
vm.imgUploadTakePicture(check_id)
}
},
})
},
imgUploadOpenCamera(check_id){
let vm = this
let obj = {
'pkvalue': 7928,
'source_type': 'HLS_BP_MASTER',
'check_id': check_id,
'picture': '',
'filePath': '',
'attachment_id': '',
'user_id':1
}
let cameraoptions = {
quality: 100,
}
obj.picture = 'http://img1.gtimg.com/auto/pics/hv1/148/233/2219/144350038.jpg'
obj.filePath = 'http://img1.gtimg.com/auto/pics/hv1/148/233/2219/144350038.jpg'
let list = []
list.push(obj)
vm.save_picture(list)
/*let success = function (imgdata) {
obj.picture = imgdata
obj.filePath = imgdata
let list = []
list.push(obj)
// vm.upload_list.push(obj)
// 拍完一张立马执行保存图片逻辑
}
let error = function () {
}
hlsUtil.openCamera(cameraoptions, success, error)*/
},
imgUploadTakePicture(){
let vm = this
let cameraoptions = {
quality: 100,
}
let success = function (imgUrl) {
for (let i = 0; i < imgUrl.length; i++) {
let obj = {
'pkvalue': 7928,
'source_type': 'HLS_BP_MASTER',
'check_id': check_id,
'picture': '',
'filePath': '',
'attachment_id': '',
'user_id':1
}
obj.picture = imgUrl[i]
obj.file_path = imgUrl[i]
// push到上传列表中 通知前台数据发生改变
vm.upload_list.push(obj)
}
}
let error = function () {
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
// 图片保存
save_picture (list) {
debugger
let vm = this
if (list.length) {
// hlsPopup.showLoading('图片上传请稍候')
var alreadyUploadNum = 0
var attLength = 0
var recordUploadInterval = setInterval(function () {
if (alreadyUploadNum === attLength) {
clearInterval(recordUploadInterval)
hlsPopup.hideLoading()
hlsPopup.showLongCenter('图片上传成功')
}
}, 500)
for (var i = 0; i < list.length; i++) {
let uploadSuccess = function (res) {
if (res.result === 'S') {
alreadyUploadNum++
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
list[j].attachment_id = res.response.attachment_id
vm.upload_list.push(list[j])
break
}
}
} else {
hlsPopup.hideLoading()
}
}
if (!list[i].attachment_id) {
attLength++
hlsUtil.fileUploadSvc(list[i], uploadSuccess)
}
}
} else {
hlsPopup.hideLoading()
}
},
/* uploadIdCardFront () {
let vm = this
let url = process.env.basePath + 'attachment_upload'
let param = {
......@@ -516,7 +643,7 @@ export default {
console.log(res.response.attachment_id)
}
})
},*/
}, */
ocrShow (ocrType, type) {
let vm = this
hlsPopup.showActionSheet({
......@@ -594,7 +721,7 @@ export default {
hlsUtil.baiduOcr(fileUrl, url, function (res) {
hlsPopup.hideLoading()
let result = res.result.result
vm.bank.bank_account_num = result.bank_card_number
vm.bank.bank_account_num = result.bank_card_number.replace(/\s*/g, '')
vm.bank.bank_full_name = result.bank_name
vm.bank.bank_card_type = result.bank_card_type
})
......@@ -943,7 +1070,7 @@ export default {
},
}
</script>
<style lang="less">
<style lang="less">
#base-info1 {
font-family: PingFangSC-Regular;
input::placeholder {
......@@ -1072,6 +1199,10 @@ export default {
margin-left: 12px;
// float: left;
img {
width: 88px;
height: 88px;
}
.upload-btn{
width: 24px;
height: 24px;
}
......
src/scripts/hlsUtil.js
View file @ 95428dd6
......@@ -370,22 +370,22 @@ export default {
* @param success
*/
fileUploadSvc: function (file, success) {
let path = file.filePath
debugger
let path = file.file_path
let name = path.substr(path.lastIndexOf('/') + 1)
let url = encodeURI(process.env.rootPath + '/app/fileUploadSvc?sysName=HLS_APP&apiName=attachment_upload')
let url = encodeURI(process.env.rootPath + '/app/fileUploadSvc?sysName=XCMG_DEV&apiName=attachment_upload')
let options = new FileUploadOptions() // eslint-disable-line
options.fileKey = 'file'
options.headers = {
'Authorization': 'Bearer ' + window.localStorage.access_token,
}
options.params = {
'source_type': file.table_name,
'pkvalue': file.table_pk_value,
'user_id': window.localStorage.user_id,
'source_type': file.source_type,
'pkvalue': file.pkvalue,
'user_id': file.user_id,
'check_id': file.check_id,
'access_token': window.localStorage.access_token,
'filePath': path,
'timestamp': file.timestamp,
'sequence': file.sequence,
}
options.fileName = name
options.mimeType = 'multipart/form-date'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment