Merge branch 'uat' into develop

config/dev.env.js

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

config/prod.env.js

@@ -2,7 +2,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
-  debug: false,
+  debug: true,
   isMobilePlatform: true,
   loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
   basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
   fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"0.0.1"'
+  currentVersion: '"0.0.7"'
 }

config/uat.env.js

@@ -11,5 +11,6 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.6.3"'
+  currentVersion: '"1.7.6"'
 }
+

src/components/currencyInput.vue

@@ -90,11 +90,34 @@ export default {
     // },
     onFocus (event) {
       // if (this.disable) return
+      let vm = this
       this.focused = true
       let value = event.target.value
       event.target.value = ''
       event.target.value = value
+
       setTimeout(function () {
+        let dom = document.querySelector('.content')
+        let veiwHeight = vm.getClientHeight()
+        let eleHeight = vm.getOffsetTop(event.target)
+        let scrollTop = Math.floor(dom.scrollTop)
+        let result = Math.floor(veiwHeight - (eleHeight - scrollTop))
+        let fontS = parseFloat(document.documentElement.style.fontSize) * 5
+        console.log(fontS)
+        if (result >= fontS) {
+        } else {
+          let ele = document.createElement('div')
+          ele.setAttribute('class', 'add-height')
+          ele.style.height = (fontS - result + 44) + 'px'
+          ele.style.background = '#fff'
+
+          // setTimeout(() => {
+          dom.appendChild(ele)
+          // }, 100)
+          dom.scrollTop = scrollTop + (fontS - result + 44)
+          // dom.scrollTo(dom.scrollLeft, scrollTop + (256 - result))
+        }
+        console.log(veiwHeight, eleHeight, scrollTop, result, fontS)
         event.target.type = 'text'
         event.target.focus()
       }, 0)
@@ -107,9 +130,35 @@ export default {
       if (this.allCheck && this.allCheck < 1000) {
         hlsPopup.showLongCenter('设备总价不能小于1000元!')
       }
+      if (document.querySelector('.add-height')) {
+        document.querySelector('.content').removeChild(document.querySelector('.add-height'))
+      }
       event.target.type = 'text'
       event.target.blur()
       this.focused = false
+      setTimeout(function () {
+        document.getElementsByTagName('body')[0].style.height = window.innerHeight + 'px'
+      }, 50)
+    },
+
+    // 取窗口可视范围的高度
+    getClientHeight () {
+      var clientHeight = 0
+      if (document.body.clientHeight && document.documentElement.clientHeight) {
+        clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+      } else {
+        clientHeight = (document.body.clientHeight > document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+      }
+      return clientHeight
+    },
+    getOffsetTop (obj) {
+      var tmp = obj.offsetTop
+      var node = obj.offsetParent
+      while (node != null) {
+        tmp += node.offsetTop
+        node = node.offsetParent
+      }
+      return tmp
     },
   },
 }

src/components/rateInput.vue

@@ -86,12 +86,33 @@ export default {
     // },
     onFocus (event) {
       // if (this.disable) return
+      let vm = this
       this.focused = true
       let value = (event.target.value).trim()
       let uncurrency = this.$options.filter['uncurrency']
       let newVal = uncurrency(value)
       event.target.value = newVal
       setTimeout(function () {
+        let dom = document.querySelector('.content')
+        let veiwHeight = vm.getClientHeight()
+        let eleHeight = vm.getOffsetTop(event.target)
+        let scrollTop = Math.floor(dom.scrollTop)
+        let result = Math.floor(veiwHeight - (eleHeight - scrollTop))
+        let fontS = parseFloat(document.documentElement.style.fontSize) * 5
+        console.log(fontS)
+        if (result >= fontS) {
+        } else {
+          let ele = document.createElement('div')
+          ele.setAttribute('class', 'add-height')
+          ele.style.height = (fontS - result + 44) + 'px'
+          ele.style.background = '#fff'
+          // setTimeout(() => {
+          dom.appendChild(ele)
+          // }, 100)
+          dom.scrollTop = scrollTop + (fontS - result + 44)
+          // dom.scrollTo(dom.scrollLeft, scrollTop + (256 - result))
+        }
+        console.log(veiwHeight, eleHeight, scrollTop, result)
         event.target.type = 'text'
         event.target.value = newVal
         // event.target.focus()
@@ -99,9 +120,32 @@ export default {
     },
     onBlur (event) {
       // if (this.disable) return
+      if (document.querySelector('.add-height')) {
+        document.querySelector('.content').removeChild(document.querySelector('.add-height'))
+      }
       event.target.type = 'text'
       this.focused = false
     },
+    // 取窗口可视范围的高度
+    getClientHeight () {
+      var clientHeight = 0
+      if (document.body.clientHeight && document.documentElement.clientHeight) {
+        clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+      } else {
+        clientHeight = (document.body.clientHeight > document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+      }
+      return clientHeight
+    },
+    // 取窗口滚动条高度
+    getOffsetTop (obj) {
+      var tmp = obj.offsetTop
+      var node = obj.offsetParent
+      while (node != null) {
+        tmp += node.offsetTop
+        node = node.offsetParent
+      }
+      return tmp
+    },
   },
 }
 </script>

src/main.js

@@ -58,7 +58,7 @@ import Jpush from './scripts/jpushService'
 
 import Jmessage from './scripts/jmessageService'
 
-if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev') {
+if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev' || process.env.CONFIG_ENV === 'prod') {
   const VConsole = require('vconsole')
   new VConsole() // eslint-disable-line
 }

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.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)
@@ -442,9 +442,10 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       hlsUtil.baiduOcrFace(obj, url, function (res) {
         hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
+          if (identifyScore >= 50) {
             hlsPopup.showPopup({
               title: '提示',
               content: `识别分数为${identifyScore},请进行活体检测`,
@@ -456,6 +457,9 @@ export default {
           } else {
             hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
           }
+        } else {
+          hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+        }
       })
     },
     goBodyCheck (confirm_id) {

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-base-info.vue

@@ -556,6 +556,8 @@ export default {
             vm.saveInfo[i] = 'N'
           } else if (i === 'bp_id') {
             vm.saveInfo[i] = window.localStorage.bp_id_tenant
+          } else if (i === 'bp_class') {
+            vm.saveInfo[i] = window.localStorage.bp_class_tenant
           }
           //  vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
         })
@@ -565,8 +567,10 @@ export default {
           vm.getBaseInfo()
         }, 0)
       } else if (from.name === 'ContractCreateList' && vm.status === 'false') {
+        vm.saveInfo.bp_class = window.localStorage.bp_class_tenant
         vm.fromPutted = false
         vm.saveInfo.bp_id = vm.$route.params.bp_id
+        vm.project_status = vm.$route.params.project_status
         vm.showSpecialFlag = true // 是否展示农行代扣和是否特批
         vm.selectUdertake = []
         setTimeout(() => {

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

@@ -72,8 +72,8 @@
         </div>
       </div>
       <div class="userInfo">补充资料</div>
-      <p v-if="npFlag" class="titles">抵押证书</p>
-      <div class="house spec">
+      <p v-if="npFlag" class="title">抵押证书</p>
+      <div v-if="npFlag" class="house spec">
         <!--抵押 待上传图片列表-->
         <div
           v-for="(item, index) in mort_upload_list"
@@ -100,8 +100,7 @@
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
-      <br>
-      <p class="titles">特批申请书</p>
+      <p class="title title-top">特批申请书</p>
       <div class="house spec">
         <!--待上传图片列表-->
         <div
@@ -178,6 +177,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.bpClass = window.localStorage.bp_class_tenant
       if (from.name === 'CreateRentInfo') {
         vm.idCardFront = ''
         vm.idCardBack = ''
@@ -192,10 +192,9 @@ export default {
         vm.mort_dowload_list = []
         vm.spec_dowload_list = []
         vm.cddItemList = []
-        vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
         vm.fromPage = window.localStorage.fromPage
-        if (window.localStorage.bp_class === 'NP') {
+        if (window.localStorage.bp_class_tenant === 'NP') {
           vm.npFlag = true
         } else {
           vm.npFlag = false
@@ -229,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()
           })
         }
       })
@@ -243,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
@@ -263,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'] =
@@ -488,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)
@@ -522,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)
           })
         }
       })
@@ -535,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'] =
@@ -640,12 +645,18 @@ export default {
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
-        if (res.result === 'S') {
+        if (res.code === '200') {
           vm.hlsPopup.hideLoading()
           vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({
             name: 'MyInfo',
           })
+        } else if (res.code === '201' || res.code === '202') {
+          vm.hlsPopup.hideLoading()
+          vm.hlsPopup.showLongCenter(res.message)
+          vm.$router.push({
+            name: 'MyInfo',
+          })
         } else {
           vm.hlsPopup.hideLoading()
           vm.hlsPopup.showLongCenter(res.message)
@@ -663,6 +674,14 @@ export default {
       no-repeat;
     background-size: 20px 20px;
   }
+.title{
+        color: #656464;
+        margin-left: 16px;
+        font-size: 13px;
+  }
+  .title-top{
+        margin-top:10px;
+  }
   .hls-list-item {
     margin-bottom: 0px !important;
   }

src/pages/contractRepayment/refund.vue

@@ -16,19 +16,19 @@
               <th>款项</th>
               <th>应还金额</th>
               <th>还款金额</th>
-              <th>支付方式</th>
+              <!-- <th>支付方式</th> -->
             </tr>
             <tr>
               <td>本金</td>
               <td>{{ pop.principal|currency }}</td>
               <td>{{ pop.received_principal|currency }}</td>
-              <td>{{ pop.pay_method }}</td>
+              <!-- <td>{{ pop.pay_method }}</td> -->
             </tr>
             <tr>
               <td>利息</td>
               <td>{{ pop.interest|currency }}</td>
               <td>{{ pop.received_interest|currency }}</td>
-              <td>{{ pop.pay_method }}</td>
+              <!-- <td>{{ pop.pay_method }}</td> -->
             </tr>
           </table>
         </div>
@@ -69,23 +69,25 @@
           <div class="name">
             <p>
               现金流项目
-              <span>支付方式</span>
+              <!-- <span>支付方式</span> -->
+              <span>已还金额</span>
+
             </p>
             <p>
               {{ item.cf_item_name }}
-              <span>{{ item.pay_method }}</span>
+              <!-- <span>{{ item.pay_method }}</span> -->
+              <span
+                :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
+              >{{ item.received_amount|currency }}</span>
             </p>
           </div>
           <div class="name">
             <p>
               应还金额
-              <span>已还金额</span>
             </p>
             <p>
               {{ parseFloat(item.due_amount).toFixed(2)|currency }}
-              <span
-                :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
-              >{{ item.received_amount|currency }}</span>
+
             </p>
           </div>
         </div>

src/pages/contractSigning/contract-detail.vue

@@ -236,7 +236,7 @@
         <img src="@/assets/constractSigning/certification.png" >认证
       </tab-button>
       <tab-button class="next" @click.native="inSure">
-        <img src="@/assets/intoApproval/approve.png" >审批
+        <img src="@/assets/intoApproval/approve.png" >确认签约
       </tab-button>
     </bottom-tab>
     <h-modal
@@ -701,9 +701,10 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       hlsUtil.baiduOcrFace(obj, url, function (res) {
         hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
+          if (identifyScore > 50) {
             hlsPopup.showPopup({
               title: '提示',
               content: `识别分数为${identifyScore},请进行活体检测`,
@@ -715,6 +716,9 @@ export default {
           } else {
             hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
           }
+        } else {
+          hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+        }
       })
       /* vm.save_picture(vm.faceListUpload)
       let identifyScore = 90
@@ -746,7 +750,7 @@ export default {
           window.localStorage.setItem('backFlag', true)
           vm.$routeGo()
         } else {
-          vm.hlsPopup.showSuccess(res.message)
+          vm.hlsPopup.showLongCenter(res.message)
         }
       })
     },

src/pages/contractSigning/entry-info.vue

@@ -245,7 +245,7 @@ export default {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
             vm.hlsPopup.showSuccess('保存成功')
-            vm.$routeGo()
+            vm.checkBank()
             // vm.$router.push({
             //   name: 'ContractDetail',
             //   // params: {
@@ -258,6 +258,23 @@ export default {
         })
       }
     },
+    checkBank () {
+      let vm = this
+      let url = $config.basePath + 'abc_bank_sign'
+      let param = {
+        project_id: vm.bank_lists.project_id,
+        trans_type: '0',
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$routeGo()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     bankCardQuery () {
       let vm = this
       let url = $config.basePath + 'con_bank_query'

src/pages/contractStart/add-car.vue

@@ -95,8 +95,8 @@
           >
         </item>
         <item v-if="read">
-          <div slot="name">经销商</div>
-          <input slot="content" v-model="detail.bp_agent_name" readonly placeholder="暂无数据" >
+          <div slot="name">{{ detail.bp_agent_name?'经销商':'办事处' }}</div>
+          <div slot="content">{{ detail.bp_agent_name?detail.bp_agent_name:detail.office_name }}</div>
         </item>
         <item>
           <div slot="name">承租人</div>

src/pages/distributorSign/contract-details.vue

@@ -205,6 +205,33 @@
         <img src="@/assets/intoApproval/approve.png" >确认签约
       </tab-button>
     </bottom-tab>
+    <h-modal
+      v-if="confirm_status!=='APPROVED'"
+      ref="modal"
+      v-model="showModalValue"
+      position="bottom"
+      cus-class="sign-modal"
+    >
+      <h-view>
+        <h-content class="approveContent">
+          <div class="approveBottom">
+            <span>
+              审批意见
+              <img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
+            </span>
+            <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
+          </div>
+        </h-content>
+        <bottom-tab>
+          <tab-button class="reject" @click.native="showModalValue=true;charge('拒绝','REJECTED')">
+            <img src="@/assets/intoApproval/reject.png" >拒绝
+          </tab-button>
+          <tab-button class="same" @click.native="showModalValue=true;charge('同意','APPROVED')">
+            <img src="@/assets/intoApproval/approve.png" >同意
+          </tab-button>
+        </bottom-tab>
+      </h-view>
+    </h-modal>
     <!--活体检测-->
     <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
   </h-view>
@@ -294,6 +321,19 @@ export default {
   },
   created () {},
   methods: {
+    charge (val, status) {
+      let vm = this
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: `您确认${val}吗？`,
+        onConfirm: data => {
+          if (data) {
+            // 需要先校验是否认证通过
+            vm.issure(status)
+          }
+        },
+      })
+    },
     // 合同文本详情附件查询
     getAttachment () {
       let vm = this
@@ -367,15 +407,7 @@ export default {
       let vm = this
       let flag = await this.signCheck()
       if (flag) { // 只有认证通过后方可进行签约操作
-        this.hlsPopup.showConfirm({
-          title: '提示',
-          content: '您确认签约吗？',
-          onConfirm: (data) => {
-            if (data) {
-              vm.issure('APPROVED')
-            }
-          },
-        })
+        this.showModalValue = true // 审批内容框显示
       }
     },
     async goContent (item, index) {
@@ -487,9 +519,10 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       vm.hlsUtil.baiduOcrFace(obj, url, function (res) {
         vm.hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
+          if (identifyScore >= 50) {
             vm.hlsPopup.showPopup({
               title: '提示',
               content: `识别分数为${identifyScore},请进行活体检测`,
@@ -501,6 +534,9 @@ export default {
           } else {
             vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
           }
+        } else {
+          vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+        }
       })
     },
 

src/pages/login.vue

@@ -72,9 +72,25 @@ export default {
     })
   },
   created () {
+    const winSize = vum.$vumPlatform.getWinSize()
+    if (window.localStorage.isReadPolicy === 'false') {
+      window.localStorage.clear()
+    } else if (window.localStorage.isReadPolicy === 'true') {
+      window.localStorage.clear()
+      window.localStorage.setItem('isReadPolicy', true)
+    } else {
+      window.localStorage.clear()
+    }
+    if (winSize.width) {
+      window.localStorage.setItem('width', winSize.width)
+    }
+    if (winSize.height) {
+      window.localStorage.setItem('height', winSize.height)
+    }
   },
   mounted () {
     window.addEventListener('native.keyboardhide', function () {
+      document.getElementById('userInput').blur()
       document.activeElement.blur()
     })
     if (vum.Platform.isAndroid()) { // 安卓
@@ -139,6 +155,7 @@ export default {
     },
     async access () {
       document.getElementById('passwordInput').blur()
+      document.getElementById('userInput').blur()
       document.activeElement.blur()
       let vm = this
       if (!vm.username || vm.username === undefined) {
@@ -154,10 +171,12 @@ export default {
       }
     },
     registerNew: function () {
+      document.getElementById('userInput').blur()
       document.getElementById('passwordInput').blur()
       this.$router.push('regiester2')
     },
     pwdForgotten: function () {
+      document.getElementById('userInput').blur()
       document.getElementById('passwordInput').blur()
       this.$router.push('pwd-forgot')
     },

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/pages/myInfo/my-info.vue

@@ -1001,7 +1001,11 @@ export default {
             const u = navigator.userAgent
             const isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)
             if (isiOS) {
-              cordova.InAppBrowser.open(authUrl, '_blank', 'location=yes')
+              let ref = cordova.InAppBrowser.open(authUrl, '_blank', 'location=yes,toolbar=yes')
+              ref.addEventListener('exit', function () {
+                console.log('Browser is closed...')
+                vm.userQuery()
+              })
               console.log('ios')
             } else {
               vm.$router.push({

src/pages/pay/firstPay/contract-record.vue

@@ -18,7 +18,8 @@
           </div>
         </div>
       </div>
-      <section class="pay-content">
+    </div>
+    <h-content class="pay-content">
       <section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/file.png" >
@@ -40,8 +41,8 @@
           </div>
         </div>
       </section>
-      </section>
-    </div>
+    </h-content>
+
     <div class="prompt has-footer">
       <div>
         <img src="@/assets/payment/prompt.png" alt >
@@ -221,7 +222,7 @@ export default {
       font-family: PingFangSC-Regular;
       font-size: 14px;
       color: #ffffff;
-      margin-top: 1.8%;
+      margin-top: 9.8%;
     }
     .data {
       font-family: Verdana-Bold;

src/pages/pay/payment/contract-record.vue

@@ -22,7 +22,8 @@
         <input v-model="keyWords" type="text" placeholder="请输入合同号/承租人名称" >
         <img src="@/assets/payment/search.png" alt >
       </div>
-      <section class="pay-content">
+    </div>
+    <h-content class="pay-content">
       <section v-for="(item,index) in showList" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/file.png" alt >
@@ -75,17 +76,15 @@
               </div>
             </div>
           </div>
+        </div>
+      </section>
       <list-item :item-height="44">
         <item>
           <div slot="name">逾期利息</div>
           <span slot="content">{{ money|currency }}</span>
         </item>
       </list-item>
-          </div>
-
-        </section>
-      </section>
-
+    </h-content>
     <div class="prompt has-footer">
       <div>
         <img src="@/assets/payment/prompt.png" alt >
@@ -99,7 +98,7 @@
     <bottom-tab>
       <tab-button class="footer" @click.native="checkPay()">提交订单</tab-button>
     </bottom-tab>
-    </div>
+
   </h-view>
 </template>
 <script>
@@ -367,8 +366,8 @@ export default {
     left:0;
     right:0;
     margin:auto;
-    height: 53%;
-    overflow: scroll;
+    height: 54%;
+    overflow-y: scroll;
     .contract-item {
       background-color: #fff;
       box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);

src/pages/userBindNew/np/accessory-info.vue

@@ -394,8 +394,8 @@ export default {
         vm.isUploadEstate = false, // 不动产权证修改标识
         vm.bp_type = window.localStorage.bp_type
         setTimeout(() => {
-          vm.loadItemList()
-          // vm.getCarInfo()
+          vm.loadItemList(true)
+          vm.getCarInfo()
           // vm.getHouseInfo()
           // vm.getEstateInfo()
         }, 0)
@@ -454,6 +454,7 @@ export default {
         vm.isUploadCar = false, // 行驶证修改标识
         vm.isUploadEstate = false, // 不动产权证修改标识
         vm.bp_type = window.localStorage.bp_type
+        vm.loadItemList(false)
       }
     })
   },
@@ -524,7 +525,7 @@ export default {
       // hlsPopup.showLoading('请稍候')
       if (flag) {
         let res = await vm.$post(url, param)
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.carInfo, res.info)
           return true
@@ -972,11 +973,10 @@ export default {
         }
       })
     },
-    async loadItemList () {
+    loadItemList (flag) {
       let vm = this
       vm.dowload_list = []
       let bpId = window.localStorage.getItem('bp_id')
-      let flag = await vm.getCarInfo()
       if (bpId === 'undefined') {
         bpId = null
       }
@@ -989,7 +989,7 @@ export default {
         },
       }
       vm.hlsPopup.showLoading('请稍候')
-      if (flag) {
+      // if (flag) {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
@@ -1013,12 +1013,14 @@ export default {
             return i.description.indexOf('身份证') === -1
           })
           // 查询图片
+          if (flag) {
             vm.cddItemList.forEach((item, index) => {
               vm.load_picture(item.check_id, index, item.cdd_item)
             })
           }
-        })
         }
+      })
+      // }
     },
     delete_pic_to_ocr (attachment_id) {
       let vm = this
@@ -1039,9 +1041,8 @@ export default {
     },
     load_picture (check_id, index, cdd_item) {
       let vm = this
-      let randomString = Math.floor(Math.random() * 50)
       let url =
-        process.env.basePath + 'attachment_list_query' + '&index' + randomString // 附件查询
+        process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
       let param = {
         check_id: check_id,
       }

src/pages/userBindNew/org/baseInfo.vue

@@ -913,7 +913,6 @@ export default {
           title: '提示',
           content: '您确认提交吗？',
           onConfirm: data => {
-            console.log(data)
             if (data) {
               let url = $config.basePath + 'bp_bind_submit'
               let param = {
@@ -1218,6 +1217,8 @@ export default {
           if (res.result === 'S') {
             // vm.hlsPopup.showSuccess('保存成功,请去维护附件信息')
             vm.bp_id = res.bp_id
+            window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
+            window.localStorage.setItem('bp_id', res.bp_id)
             vm.bindCheck()
             // 查询资料清单
             vm.loadItemList(flag)

src/pages/userBindNew/org/enclosure.vue

@@ -476,8 +476,8 @@ export default {
         vm.cddItemList = []
         vm.isApproved = window.localStorage.isApproved
         vm.bp_id = vm.$route.params.bp_id
-        vm.loadItemList()
-        // vm.houseQuery()
+        vm.loadItemList(true)
+        vm.houseQuery()
         // vm.carQuery()
         // vm.propertyQuery() // 不动产权证查询
       } else if (from.name === 'Invoice' && window.localStorage.from === 'false') {
@@ -539,6 +539,7 @@ export default {
         vm.cddItemList = []
         vm.isApproved = window.localStorage.isApproved
         vm.bp_id = vm.$route.params.bp_id
+        vm.loadItemList(false)
       }
     })
   },
@@ -595,7 +596,7 @@ export default {
       if (flag) {
         // hlsPopup.showLoading('请稍候')
         let res = await vm.$post(url, param)
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.hauseInfo, res.info)
           // vm.hauseInfo = res.info
@@ -931,11 +932,11 @@ export default {
         vm.propertyInfo.right_others = result.right_others.word
       })
     },
-    async loadItemList () {
+    loadItemList (flag) {
       let vm = this
       let url = process.env.basePath + 'prj_cdd_check_list'
-      let flag = await vm.houseQuery()
-      let bpId = vm.bp_id
+      vm.dowload_list = []
+      let bpId = window.localStorage.getItem('bp_id')
       if (bpId === 'undefined') {
         bpId = null
       }
@@ -946,7 +947,7 @@ export default {
           'tab_group': window.localStorage.authFlag ? 'HLS_ORG_NAUTH' : 'HLS_ORG_AUTH',
         },
       }
-      if (flag) {
+      hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
@@ -969,13 +970,13 @@ export default {
           })
           vm.cddItemList = res.lists.filter(item => { return item.cdd_item === 'HOUSE_CARD' || item.cdd_item === 'CAR_CARD' || item.cdd_item === 'ASSETS_CARD' || item.cdd_item === 'REAL_EST_CERTIFICATE' })
           // 查询图片
-            console.log('cddItemList.........', vm.cddItemList)
+          if (flag) {
             vm.cddItemList.forEach((item, index) => {
               vm.load_picture(item.check_id, index, item.cdd_item)
             })
           }
-        })
         }
+      })
     },
 
     load_picture (check_id, index, cdd_item) {

src/scripts/hlsPopup.js

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

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.847e746df14b00abfbdaf2589fffdce1.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.de2135e8e9a254a66647.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.13dd33b9d73dd9675f640ae7274a2bec.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.24fa7cbfb87bafa98dc2.js></script></body></html>
\ No newline at end of file