Merge branch 'liuin' into uat

config/dev.env.js

@@ -16,4 +16,3 @@ module.exports = merge(prodEnv, {
   currentVersion: '"1.9.0"',
 })
 
-

config/uat.env.js

@@ -13,3 +13,4 @@ module.exports = {
   appId: '"com.xcmg.app"',
   currentVersion: '"1.7.4"'
 }
+

src/pages/carConfirm/confirm-detail.vue

@@ -74,8 +74,8 @@
             <input slot="content" v-model="info.project_number" readonly placeholder="暂无数据" >
           </item>
           <item>
-            <div slot="name">经销商</div>
-            <input slot="content" v-model="info.bp_agent_name" readonly placeholder="暂无数据" >
+            <div slot="name">{{ info.bp_agent_name?'经销商':'办事处' }}</div>
+            <div slot="content">{{ info.bp_agent_name?info.bp_agent_name:info.office_name }}</div>
           </item>
           <item>
             <div slot="name">承租人</div>
@@ -196,7 +196,7 @@ export default {
       agentPic: '', // 经销商担保协议图片
       bankPic: '', // 农行代扣授权书图片
       legalPic: '', // 法人授权书图片
-      confirm_id: '',
+      confirm_id: this.$route.params.confirm_id,
       readed: require('@/assets/constractSigning/read.png'), // 已读
       unRead: require('@/assets/constractSigning/unread.png'), // 未读
       tabNum: 0,
@@ -243,8 +243,8 @@ export default {
         vm.getDetail()
         vm.getEquipment()
         vm.getAttachment()
+        vm.confirm_id = vm.$route.params.confirm_id
       }
-      vm.confirm_id = vm.$route.params.confirm_id
       vm.agentPic = vm.unRead
       vm.leasePic = vm.unRead
       if (vm.$route.params.confirm_status === 'SUBMIT') {
@@ -410,7 +410,7 @@ export default {
       let vm = this
       let url = $config.basePath + 'car_id_card_query'
       let param = {
-        confirm_id: vm.confirm_id,
+        confirm_id: vm.$route.params.confirm_id,
       }
       hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)

src/pages/contractCreate/add-undertake.vue

@@ -197,18 +197,7 @@ export default {
       border: 2px solid #bcc6ff;
     }
   }
-   .content {
-    position: absolute;
-    top: 0;
-  }
-   .scrollContent {
-       padding-top: 1rem;
-    padding-bottom: 120px;
-  }
-  .tab-style {
-    width: 100%;
-    position: absolute;
-  }
+
 }
 .platform-ios {
   #person {

src/pages/contractCreate/create-enclosure-info.vue

@@ -228,7 +228,7 @@ export default {
         if (res.result === 'S') {
           vm.mortId = res.info.check_id
           vm.certificateQuery(vm.mortId, 'mort').then(res => {
-
+            vm.hlsPopup.hideLoading()
           })
         }
       })
@@ -242,7 +242,7 @@ export default {
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         console.log('特批证书check_id查询', res)
         if (res.result === 'S') {
           vm.checkId = res.info.check_id
@@ -262,7 +262,7 @@ export default {
       }
       hlsPopup.showLoading('请稍候')
       return vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           res.lists.forEach(item => {
             item['url'] =
@@ -487,7 +487,7 @@ export default {
           tab_group: group,
         },
       }
-      // vm.hlsPopup.showLoading('请稍候')
+      vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         // vm.hlsPopup.hideLoading()
         console.log(res)
@@ -521,8 +521,14 @@ export default {
             }
           })
           // 查询图片
+          // hlsPopup.showLoading('请稍候')
           listTemp.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
+            if (index === listTemp.length - 1) {
+              debugger
+              vm.hlsPopup.hideLoading()
+            }
+            console.log(index, listTemp.length - 1)
           })
         }
       })
@@ -534,9 +540,9 @@ export default {
       let param = {
         check_id: check_id,
       }
-      hlsPopup.showLoading('请稍候')
+      // hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           res.lists.forEach(item => {
             item['url'] =

src/pages/messageCenter/message-list.vue

@@ -148,6 +148,7 @@ export default {
             vum.forEach(returnData, function (data, index, array) {
               vm.list.push(array[index])
             })
+            vm.pagenum++
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {

src/scripts/hlsPopup.js

@@ -59,7 +59,7 @@ export default {
           position: 'middle',
         }) */
       }
-    }, 40000)
+    }, 60000)
   },
   /**
    * 隐藏