Commit cd32a376 authored by 李晓兵's avatar 李晓兵

'问题修复'

parent 9a7b239c
Pipeline #4301 canceled with stages
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</h-content> </h-content>
<h-content v-if="num === 2"> <h-content v-if="num === 2">
<list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);"> <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
<item :proportion="[4,1]"> <item :proportion="[7,1]">
<div slot="name" class="aguremrnt-list"> <div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/npack.png" alt class="pics" > <img src="@/assets/constractSigning/npack.png" alt class="pics" >
<p class="second first">承租人确认意见</p> <p class="second first">承租人确认意见</p>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</item> </item>
<!-- 农行代扣授权书 --> <!-- 农行代扣授权书 -->
<item v-if="abc_deduction_flag === 'Y'" :proportion="[4,1]" :class="{'border-red':isshow}"> <item v-if="abc_deduction_flag === 'Y'" :proportion="[7,1]" :class="{'border-red':isshow}">
<div slot="name" class="aguremrnt-list"> <div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt class="pics" > <img src="@/assets/constractSigning/pack.png" alt class="pics" >
<p class="second">农行代扣授权书</p> <p class="second">农行代扣授权书</p>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
</div> </div>
</div> </div>
</item> </item>
<item :proportion="[4,1]"> <item :proportion="[7,1]">
<div slot="name" class="aguremrnt-list"> <div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt class="pics" > <img src="@/assets/constractSigning/pack.png" alt class="pics" >
<p class="second">融资租赁合同</p> <p class="second">融资租赁合同</p>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<img src="@/assets/constractSigning/detail.png" alt > <img src="@/assets/constractSigning/detail.png" alt >
</div> </div>
</item> </item>
<item :proportion="[4,1]"> <item :proportion="[7,1]">
<div slot="name" class="aguremrnt-list"> <div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt class="pics" > <img src="@/assets/constractSigning/pack.png" alt class="pics" >
<p class="second">租赁物所有权转移及接收确认书</p> <p class="second">租赁物所有权转移及接收确认书</p>
...@@ -305,6 +305,7 @@ ...@@ -305,6 +305,7 @@
</template> </template>
<script> <script>
import Check1 from '@/assets/constractSigning/business.png' import Check1 from '@/assets/constractSigning/business.png'
import Check2 from '@/assets/constractSigning/constract.png' import Check2 from '@/assets/constractSigning/constract.png'
import Check3 from '@/assets/constractSigning/lease.png' import Check3 from '@/assets/constractSigning/lease.png'
...@@ -362,6 +363,9 @@ export default { ...@@ -362,6 +363,9 @@ export default {
}, },
computed: {}, computed: {},
watch: { watch: {
$route (to, from) {
hlsPopup.hideConfirm()
},
ischecked: function (newVal, oldVal) { ischecked: function (newVal, oldVal) {
let appro = document.querySelector('.appro') // 同意按钮 let appro = document.querySelector('.appro') // 同意按钮
if (newVal) { if (newVal) {
...@@ -424,6 +428,16 @@ export default { ...@@ -424,6 +428,16 @@ export default {
// this.popProtocol() // this.popProtocol()
} }
}, },
/* beforeRoutrLeave (to, from, next) {
next(vm => {
consoloe.log('&&&&&&&&&&&&&&')
hlsPopup.hideConfirm()
})
},
destroyed () {
consoloe.log('&&&&&&&&&&&&&&')
hlsPopup.hideConfirm()
}, */
methods: { methods: {
// 签约校验 // 签约校验
signCheck () { signCheck () {
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
</h-content> </h-content>
<h-content v-if="tabNum === 2"> <h-content v-if="tabNum === 2">
<list-item :item-height="56"> <list-item :item-height="56">
<item :proportion="[4,1]"> <item :proportion="[7,1]">
<div slot="name" class="aguremrnt-list"> <div slot="name" class="aguremrnt-list">
<img src="@/assets/distributorSign/gray.png" alt="" class="pics"> <img src="@/assets/distributorSign/gray.png" alt="" class="pics">
<p class="second">经销商担保协议</p> <p class="second">经销商担保协议</p>
...@@ -211,6 +211,9 @@ export default { ...@@ -211,6 +211,9 @@ export default {
}, },
computed: {}, computed: {},
watch: { watch: {
$route (to, from) {
hlsPopup.hideConfirm()
},
bp_class () { bp_class () {
if (this.bp_class === 'NP') { if (this.bp_class === 'NP') {
this.bp_flag = false this.bp_flag = false
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<scroll <scroll
v-if="list.length !== 0" v-if="list.length !== 0"
ref="scroll" :updateData="[list]" :pullUp="true" class="has-header" ref="scroll" :updateData="[list]" :pullUp="true" class="has-footer"
@pullingUp="getInfo"> @pullingUp="getInfo">
<section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap"> <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
<item-option ref="itemOption"> <item-option ref="itemOption">
...@@ -365,10 +365,10 @@ export default { ...@@ -365,10 +365,10 @@ export default {
} }
} }
} }
/* .content { .content {
position: absolute; position: absolute;
top: 0; top: 0;
}*/ }
.scrollContent { .scrollContent {
padding-top: 1rem; padding-top: 1rem;
padding-bottom: 20px; padding-bottom: 20px;
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
*/ */
showLongCenter: function (content) { showLongCenter: function (content) {
let vm = this let vm = this
//let text = content || '操作失败' // let text = content || '操作失败'
let imgUrl = require('../assets/image/waring.png') let imgUrl = require('../assets/image/waring.png')
let text = '<div><img src=' + imgUrl + '></div>' + content let text = '<div><img src=' + imgUrl + '></div>' + content
Vue.$vux.toast.show({ Vue.$vux.toast.show({
...@@ -185,6 +185,9 @@ export default { ...@@ -185,6 +185,9 @@ export default {
} }
Vue.$vux.confirm.show(def) Vue.$vux.confirm.show(def)
}, },
hideConfirm: function () {
Vue.$vux.confirm.hide()
},
/** /**
* @param actionObject.titleText 弹出框的标题可空 * @param actionObject.titleText 弹出框的标题可空
* @param actionObject.callback 点击按钮的回调函数 回传buttonArray数组下标 * @param actionObject.callback 点击按钮的回调函数 回传buttonArray数组下标
...@@ -272,7 +275,6 @@ export default { ...@@ -272,7 +275,6 @@ export default {
} }
}, },
/** /**
* 下拉框 支持级联操作 需指定 parent 属性 * 下拉框 支持级联操作 需指定 parent 属性
* @param selectOption.list Array [{"code": "NP","code_name": "个人"}] * @param selectOption.list Array [{"code": "NP","code_name": "个人"}]
......
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