Merge branch 'liuxin' into develop

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

@@ -16,7 +16,7 @@
         :key="index"
         class="card"
       >
-        <span>{{ list.description }}</span>
+        <span style="color:#1D3FFF">{{ list.description }}</span>
         <div class="img-content">
           <!--待上传图片列表-->
           <div v-if="list.cdd_item==='ASSETS_CARD'">
@@ -49,24 +49,24 @@
             </div>
           </div>
           <div v-if="list.cdd_item==='CAR_CARD'">
-            <div v-if="!isUploadCar" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+            <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
-            <div v-if="isUploadCar&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+            <div v-if="carImg&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img :src="carImg" style="width:100%;height:100%">
             </div>
-            <div v-if="isUploadCar&&isApproved" class="card-upload plus" @click="showBigPicture(carImg)">
+            <div v-if="carImg&&isApproved" class="card-upload plus" @click="showBigPicture(carImg)">
               <img :src="carImg" style="width:100%;height:100%">
             </div>
           </div>
           <div v-if="list.cdd_item==='HOUSE_CARD'">
-            <div v-if="!isUploadHouse" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+            <div v-if="!houseImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
-            <div v-if="isUploadHouse&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
+            <div v-if="houseImg&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img :src="houseImg" style="width:100%;height:100%">
             </div>
-            <div v-if="isUploadHouse&&isApproved" class="card-upload plus" @click="showBigPicture(houseImg)">
+            <div v-if="houseImg&&isApproved" class="card-upload plus" @click="showBigPicture(houseImg)">
               <img :src="houseImg" style="width:100%;height:100%">
             </div>
           </div>
@@ -189,9 +189,14 @@ export default {
       list: {},
       houseImg: '',
       carImg: '',
-      isApproved: window.localStorage.isApproved,
-      isUploadHouse: false,
-      isUploadCar: false,
+      house_id: '',
+      car_id: '',
+      houseFlag: false, // 房产证查看标识，为false则用查询出来的，为true则用拍照出来的
+      carFlag: false, // 行驶证查看标识，为false则用查询出来的，为true则用拍照出来的
+      isUploadHouse: false, // 房产证修改标识
+      isUploadCar: false, // 行驶证修改标识
+      houseAttachmentId: '',
+      carAttachmentId: '',
       hauseInfo: {
         house_owner: '',
         public_situation: '',
@@ -214,6 +219,11 @@ export default {
       dowload_list: [],
     }
   },
+  computed: {
+    isApproved () {
+      return window.localStorage.user_bp_status === 'APPROVED'
+    },
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'NPInvoiceInfo' && window.localStorage.from) {
@@ -224,6 +234,43 @@ export default {
   },
   methods: {
     save () {
+      let vm = this
+      if (vm.isUploadHouse) {
+        vm.houseFlag = true
+        vm.delete_pic_to_ocr(vm.houseAttachmentId)// 房产证修改，重新上传
+        let list = []
+        let obj = {
+          pkvalue: vm.house_id,
+          source_type: 'PRJ_CDD_ITEM_CHECK',
+          picture: '',
+          check_id: vm.house_id,
+          filePath: vm.houseImg,
+          attachment_id: '',
+          user_id: 1,
+          fileName: '房产证',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.isUploadHouse = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.isUploadCar) {
+        vm.carFlag = true
+        vm.delete_pic_to_ocr(vm.carAttachmentId)// 房产证修改，重新上传
+        let list = []
+        let obj = {
+          pkvalue: vm.car_id,
+          source_type: 'PRJ_CDD_ITEM_CHECK',
+          picture: '',
+          check_id: vm.car_id,
+          filePath: vm.carImg,
+          attachment_id: '',
+          user_id: 1,
+          fileName: '行驶证',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.isUploadCar = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
       this.$router.push({
         name: 'NPBankInfo',
       })
@@ -281,8 +328,10 @@ export default {
         } else {
           if (ocrType === 'HOUSE_CARD') {
             vm.houseImg = imgUrl[0]
+            vm.isUploadHouse = true
           } else if (ocrType === 'CAR_CARD') {
             vm.carImg = imgUrl[0]
+            vm.isUploadCar = true
           }
         }
       }
@@ -467,6 +516,19 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          var listTemp = [...res.lists]
+          listTemp.forEach(item => {
+            switch (item.cdd_item) {
+              case 'HOUSE_CARD': // 房产证
+                vm.house_id = item.check_id
+                break
+              case 'CAR_CARD': // 承租人身份证背面
+                vm.car_id = item.check_id
+                break
+              default:
+                break
+            }
+          })
           vm.cddItemList = res.lists.filter(i => {
             return i.description.indexOf('身份证') === -1
           })
@@ -477,6 +539,24 @@ export default {
         }
       })
     },
+    delete_pic_to_ocr (attachment_id) {
+      let vm = this
+      var delete_list = []
+      let obj = { attachment_id: attachment_id }
+      delete_list.push(obj)
+      let url = process.env.basePath + 'app_delete_attment' // 附件删除
+      let param = {
+        picturelist: delete_list,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+
+        } else if (res.result === 'E') {
+
+        }
+      })
+    },
     load_picture (check_id, index, cdd_item) {
       let vm = this
       let url =
@@ -495,8 +575,23 @@ export default {
               item.attachment_id +
               '&access_token=' +
               window.localStorage.access_token
-            vm.dowload_list.push(item)
           })
+          switch (cdd_item) {
+            case 'HOUSE_CARD': // 房产证
+              if (!vm.houseFlag) {
+                vm.houseImg = res.lists[0].url
+              }
+              vm.houseAttachmentId = res.lists[0].attachment_id
+              break
+            case 'CAR_CARD': // 行驶证
+              if (!vm.carFlag) {
+                vm.carImg = res.lists[0].url
+              }
+              vm.carAttachmentId = res.lists[0].attachment_id
+              break
+            default:
+              vm.dowload_list.push(res.lists)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/userBindNew/userBind.vue

+<template>
+  <h-view id="user-bind" class="public-style" title="用户绑定">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo(-1)">
+        <span>用户绑定</span>
+      </div>
+    </h-header>
+    <h-content class="content">
+      <div class="info">
+        <div class="info-icon">
+          <img src="@/assets/userBind/info.png" >
+          <span @click="goEnterprise">温馨提示</span>
+        </div>
+        <p>绑定成功后，您即可使用APP中合同查询、还款查询等功能。</p>
+      </div>
+      <p>选择用户类型</p>
+      <!--<h-button :class="flag==0?'nature':'org'" @click.native="flag = 0">
+        <img src="@/assets/userBind/np.png" class="n-img" >自然人
+      </h-button>
+      <h-button :class="flag==1?'nature':'org'" @click.native="flag = 1">
+        <img src="@/assets/userBind/entr.png" class="o-img" >企业
+      </h-button>-->
+      <div class="bind-wrap" @click="flag = 0">
+        <img :src="flag==0? bindnped:bindnp">
+      </div>
+      <div class="bind-wrap" @click="flag = 1">
+        <img :src="flag==1? bindorged:bindorg">
+      </div>
+      <h-button class="enter" @click.native="changePage">
+        进入
+        <img src="@/assets/userBind/right.png" >
+      </h-button>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      flag: 0,
+      bindnp: require('@/assets/userBind/bindnp.png'),
+      bindnped: require('@/assets/userBind/bindnped.png'),
+      bindorg: require('@/assets/userBind/bindorg.png'),
+      bindorged: require('@/assets/userBind/bindorged.png'),
+    }
+  },
+  created () {
+
+  },
+  methods: {
+    changePage () {
+      let name
+      let bpClass
+      if (this.flag === 0) {
+        name = 'NPBaseInfo'
+        bpClass = 'NP'
+      } else if (this.flag === 1) {
+        name = 'EnterpriseNew'
+        bpClass = 'ORG'
+      }
+      this.$router.push({
+        name: name,
+        params: {
+          'bp_class': bpClass,
+        },
+      })
+    },
+    goEnterprise () {
+      this.$router.push({
+        name: 'EnterpriseNew',
+      })
+    },
+  },
+}
+</script>
+<style lang="less" scoped type="text/less">
+#user-bind {
+  .content {
+    .info {
+      height: 88px;
+      line-height: 88px;
+      background-color: rgba(142, 195, 30, 0.1);
+      .info-icon {
+        height: 30px;
+        padding-top: 20px;
+        display: flex;
+        align-items: center;
+        img {
+          width: 15.8px;
+          height: 15.8px;
+          margin-left: 17.1px;
+        }
+        span {
+          color: rgba(142, 195, 30, 1);
+          font-family: PingFangSC-Semibold;
+          font-size: 14px;
+          margin-left: 9px;
+          letter-spacing: 0.5px;
+          line-height: 20px;
+        }
+      }
+      p {
+        font-size: 13px;
+        font-family: PingFangSC-Regular;
+        color: rgba(101, 100, 100, 0.8);
+        width: 310px;
+        margin-left: 42px;
+        letter-spacing: 0.4px;
+        line-height: 18px;
+        margin-top: 8px;
+      }
+    }
+    p {
+      color: rgba(101, 100, 100, 0.4);
+      font-family: PingFangSC-Regular;
+      letter-spacing: 0.5px;
+      line-height: 24px;
+      margin-left: 16px;
+      margin-top: 24px;
+    }
+    .bind-wrap{
+      width: 92%;
+      margin: 10px auto;
+      img{
+        width: 100%;
+      }
+    }
+    .enter {
+      display: block;
+      width: 343px;
+      height: 56px;
+      font-size: 15px;
+      letter-spacing: 0.5px;
+      line-height: 20px;
+      margin: 0 auto;
+      margin-top: 16px;
+      font-family: PingFangSC-Regular;
+      border-radius: 4px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .enter {
+      background-color: @headerColor;
+      color: #fff;
+      margin-top: 80px;
+      img {
+        width: 18px;
+        margin-left: 6.3px;
+      }
+    }
+  }
+}
+
+</style>