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

src/pages/contractSigning/contract-detail.vue

@@ -119,7 +119,7 @@
     </h-content>
     <h-content v-if="num === 2">
       <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">
             <img src="@/assets/constractSigning/npack.png" alt class="pics" >
             <p class="second first">承租人确认意见</p>
@@ -130,7 +130,7 @@
         </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">
             <img src="@/assets/constractSigning/pack.png" alt class="pics" >
             <p class="second">农行代扣授权书</p>
@@ -145,7 +145,7 @@
             </div>
           </div>
         </item>
-        <item :proportion="[4,1]">
+        <item :proportion="[7,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt class="pics" >
             <p class="second">融资租赁合同</p>
@@ -155,7 +155,7 @@
             <img src="@/assets/constractSigning/detail.png" alt >
           </div>
         </item>
-        <item :proportion="[4,1]">
+        <item :proportion="[7,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt class="pics" >
             <p class="second">租赁物所有权转移及接收确认书</p>
@@ -305,6 +305,7 @@
 </template>
 
 <script>
+
 import Check1 from '@/assets/constractSigning/business.png'
 import Check2 from '@/assets/constractSigning/constract.png'
 import Check3 from '@/assets/constractSigning/lease.png'
@@ -362,6 +363,9 @@ export default {
   },
   computed: {},
   watch: {
+    $route (to, from) {
+      hlsPopup.hideConfirm()
+    },
     ischecked: function (newVal, oldVal) {
       let appro = document.querySelector('.appro') // 同意按钮
       if (newVal) {
@@ -424,6 +428,16 @@ export default {
       // this.popProtocol()
     }
   },
+  /*  beforeRoutrLeave (to, from, next) {
+    next(vm => {
+      consoloe.log('&&&&&&&&&&&&&&')
+      hlsPopup.hideConfirm()
+    })
+  },
+  destroyed () {
+    consoloe.log('&&&&&&&&&&&&&&')
+    hlsPopup.hideConfirm()
+  }, */
   methods: {
     // 签约校验
     signCheck () {

src/pages/distributorSign/contract-details.vue

@@ -156,7 +156,7 @@
     </h-content>
     <h-content v-if="tabNum === 2">
       <list-item :item-height="56">
-        <item :proportion="[4,1]">
+        <item :proportion="[7,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/distributorSign/gray.png" alt="" class="pics">
             <p class="second">经销商担保协议</p>
@@ -211,6 +211,9 @@ export default {
   },
   computed: {},
   watch: {
+    $route (to, from) {
+      hlsPopup.hideConfirm()
+    },
     bp_class () {
       if (this.bp_class === 'NP') {
         this.bp_flag = false

src/pages/messageCenter/message-list.vue

@@ -11,7 +11,7 @@
       </div>
     <scroll
       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">
       <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
         <item-option ref="itemOption">
@@ -365,10 +365,10 @@ export default {
       }
     }
   }
-  /*   .content {
+     .content {
     position: absolute;
     top: 0;
-  }*/
+  }
   .scrollContent {
     padding-top: 1rem;
     padding-bottom: 20px;

src/scripts/hlsPopup.js

@@ -91,7 +91,7 @@ export default {
    */
   showLongCenter: function (content) {
     let vm = this
-    //let text = content || '操作失败'
+    // let text = content || '操作失败'
     let imgUrl = require('../assets/image/waring.png')
     let text = '<div><img src=' + imgUrl + '></div>' + content
     Vue.$vux.toast.show({
@@ -185,6 +185,9 @@ export default {
     }
     Vue.$vux.confirm.show(def)
   },
+  hideConfirm: function () {
+    Vue.$vux.confirm.hide()
+  },
   /**
    * @param actionObject.titleText 弹出框的标题可空
    * @param actionObject.callback 点击按钮的回调函数 回传buttonArray数组下标
@@ -272,7 +275,6 @@ export default {
     }
   },
 
-
   /**
    * 下拉框 支持级联操作 需指定 parent 属性
    * @param selectOption.list Array [{"code": "NP","code_name": "个人"}]