Commit 7645a3da authored by 胡's avatar

feat: 接口参数调整,融租方案对未读做修改

parent 27e34010
...@@ -173,6 +173,8 @@ export default { ...@@ -173,6 +173,8 @@ export default {
// 回调成功上传图片 // 回调成功上传图片
vm.uploadImg(filePath) vm.uploadImg(filePath)
vm.signContact() vm.signContact()
} else {
vm.hlsPopup.showLongCenter('认证失败,请将脸部完整露出再重试!');
} }
}, function (reason) { }, function (reason) {
let error = JSON.parse(reason) let error = JSON.parse(reason)
......
...@@ -325,6 +325,7 @@ export default { ...@@ -325,6 +325,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
...@@ -420,6 +421,8 @@ export default { ...@@ -420,6 +421,8 @@ export default {
// 回调成功上传图片 // 回调成功上传图片
vm.uploadImg(filePath) vm.uploadImg(filePath)
vm.goElectronicSign() vm.goElectronicSign()
} else {
vm.hlsPopup.showLongCenter('认证失败,请重试!');
} }
}, function (reason) { }, function (reason) {
let error = JSON.parse(reason) let error = JSON.parse(reason)
......
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
}, },
methods: { methods: {
sign() { sign() {
let list = this.showList.filter(item => item.checked); let list = this.showList.filter(item => item.checked).map(item => {item.checked = true; return item});
if (!list.length) return hlsPopup.showLongCenter('请选择合同'); if (!list.length) return hlsPopup.showLongCenter('请选择合同');
window.localStorage.setItem('handleContact', JSON.stringify(list)); window.localStorage.setItem('handleContact', JSON.stringify(list));
this.$router.push({ path: '/batchSign', query: { name: 'confirmList' } }); this.$router.push({ path: '/batchSign', query: { name: 'confirmList' } });
...@@ -242,6 +242,8 @@ export default { ...@@ -242,6 +242,8 @@ export default {
vm.$refs.scroll.update(false) vm.$refs.scroll.update(false)
} }
vm.selectShowList() vm.selectShowList()
vm.allChoose(false)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
......
...@@ -438,6 +438,7 @@ export default { ...@@ -438,6 +438,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<span>合同号</span> <span>合同号</span>
<span>{{ item.project_number }}</span> <span>{{ item.project_number }}</span>
</p> </p>
<img v-if="item.read_check === 'N'" src="@/assets/constractSigning/unread.png" alt class="unread" />
<img src="@/assets/constractSigning/righticon.png" alt class="arrow" /> <img src="@/assets/constractSigning/righticon.png" alt class="arrow" />
</div> </div>
<div class="box"> <div class="box">
...@@ -186,8 +187,9 @@ export default { ...@@ -186,8 +187,9 @@ export default {
}, },
methods: { methods: {
signContract() { signContract() {
let list = this.showLists.filter(item => item.checked); let list = this.showLists.filter(item => item.checked).map(item => {item.checked = false; return item});
if (!list.length) return hlsPopup.showLongCenter('请选择合同'); if (!list.length) return hlsPopup.showLongCenter('请选择合同');
if(list.findIndex(item => item.read_check === 'N') > -1) return hlsPopup.showLongCenter('选中合同中有文本未读,请先阅读');
window.localStorage.setItem('handleContact', JSON.stringify(list)); window.localStorage.setItem('handleContact', JSON.stringify(list));
this.$router.push({ path: '/batchSign', query: { name: 'contract' } }); this.$router.push({ path: '/batchSign', query: { name: 'contract' } });
}, },
...@@ -308,6 +310,8 @@ export default { ...@@ -308,6 +310,8 @@ export default {
vm.$refs.scroll.update(false) vm.$refs.scroll.update(false)
} }
vm.showLists = vm.submitLists vm.showLists = vm.submitLists
vm.allChoose(false)
} else { } else {
hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
} }
...@@ -436,6 +440,11 @@ export default { ...@@ -436,6 +440,11 @@ export default {
<style lang="less" type="text/less"> <style lang="less" type="text/less">
#contract-signing { #contract-signing {
.unread {
width: 34px;
height: 20px;
margin: 0 20px;
}
.display { .display {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -446,6 +446,7 @@ export default { ...@@ -446,6 +446,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
......
...@@ -141,18 +141,18 @@ export default { ...@@ -141,18 +141,18 @@ export default {
console.log('&&&&&&&&&&&&___ios') console.log('&&&&&&&&&&&&___ios')
// if (!$config.isMobilePlatform) { // if (!$config.isMobilePlatform) {
// } // }
baidumap_location.getCurrentPosition(function (result) { // baidumap_location.getCurrentPosition(function (result) {
if (window.localStorage.getItem('province')) { // if (window.localStorage.getItem('province')) {
vm.city = window.localStorage.getItem('city') // vm.city = window.localStorage.getItem('city')
vm.province = window.localStorage.getItem('province') // vm.province = window.localStorage.getItem('province')
vm.guessingQuery(vm.city) // vm.guessingQuery(vm.city)
} else { // } else {
vm.city = result.city // vm.city = result.city
vm.province = result.province // vm.province = result.province
vm.guessingQuery(result.city) // vm.guessingQuery(result.city)
} // }
}, function (error) { // }, function (error) {
}) // })
// setTimeout(vm.guessingQuery(), 0) // setTimeout(vm.guessingQuery(), 0)
}, },
goFunctionHome (data) { goFunctionHome (data) {
......
...@@ -111,18 +111,18 @@ export default { ...@@ -111,18 +111,18 @@ export default {
// console.log(error) // console.log(error)
// }, {enableHighAccuracy: true}) // }, {enableHighAccuracy: true})
// } else { // ios使用插件定位 // } else { // ios使用插件定位
baidumap_location.getCurrentPosition(function (result) { // baidumap_location.getCurrentPosition(function (result) {
console.log('*********** ' + JSON.stringify(result)) // console.log('*********** ' + JSON.stringify(result))
window.localStorage.setItem('province', result.province) // window.localStorage.setItem('province', result.province)
window.localStorage.setItem('city', result.city) // window.localStorage.setItem('city', result.city)
vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city') // vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
vm.province = '请选择省' // vm.province = '请选择省'
vm.city = '请选择市' // vm.city = '请选择市'
vm.flag = false // vm.flag = false
vm.province_flag = true // vm.province_flag = true
}, function (error) { // }, function (error) {
console.log('errorerrorerrorerror ' + error) // console.log('errorerrorerrorerror ' + error)
}) // })
// } // }
}, },
......
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