'1.3uat'

config/uat.env.js

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

src/pages/contractCreate/add-undertake.vue

@@ -16,7 +16,7 @@
             <br >证件号
           </div>
           <div slot="content">
-            <input v-model="item.bp_name" placeholder="暂无信息" readonly >
+            <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
             <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
           </div>
         </item>

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

@@ -522,11 +522,11 @@ export default {
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({
-            name: 'ContractCreateList',
+            name: 'MyInfo',
           })
         } else {
           vm.hlsPopup.showLongCenter(res.message)

src/pages/messageCenter/reject-detail.vue

@@ -37,7 +37,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.notice_detail = res.info.notice_detail
+          vm.notice_detail = res.info.notice_body
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -73,6 +73,8 @@ export default {
         line-height: 20px;
         p{
             text-indent: 35px;
+            color: #666666;
+            font-size: 14px;
         }
     }
 }

src/pages/myInfo/role-switch-component.vue

-/**
-* @Author Sean
-* @Date 2019/11/27
-*/
-<template>
-  <transition name="role">
-    <div v-show="showFlag" class="role-switch-wrap">
-      <div class="role-switch-content">
-        <div class="content-header">
-          <span>请选择要切换的角色</span>
-          <img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
-        </div>
-        <div class="content-wrap">
-          <div v-for="(item,index) in roleList" :key="index" :class="{'item-active':index === switchIndex}" class="role-item" @click="chooseRole(index)">
-            <span>{{ item.bp_type_desc }}</span>
-          </div>
-          <div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn"><span @click="roleConfirm">确定</span></div>
-        </div>
-      </div>
-    </div>
-  </transition>
-</template>
-
-<script>
-export default {
-  props: ['roleList'],
-  data () {
-    return {
-      showFlag: false,
-      switchIndex: '',
-    }
-  },
-  created: function () {
-  },
-  mounted: function () {
-  },
-  updated: function () {
-  },
-  methods: {
-    chooseRole(index){
-      this.switchIndex = index
-    },
-    roleConfirm () {
-      if(this.switchIndex === ''){
-
-      }else {
-        this.showFlag = false
-        this.$emit('roleConfirm',this.roleList[this.switchIndex])
-      }
-    },
-    show () {
-      this.switchIndex = ''
-      this.showFlag = true
-    },
-    roleCancle () {
-      this.showFlag = false
-      this.$emit('roleCancle')
-    },
-  },
-}
-</script>
-
-<style scoped lang="less">
-  .role-enter-active, .role-leave-active {
-    transition: opacity .5s;
-  }
-
-  .role-enter, .role-leave-to /* .fade-leave-active below version 2.1.8 */ {
-    opacity: 0;
-  }
-
-  .role-switch-wrap {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    z-index: 999;
-    background: rgba(56, 63, 69, 0.30);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .role-switch-content {
-      width: 80%;
-      margin: 0 auto;
-
-      .content-header {
-        width: 100%;
-        height: 44px;
-        background-color: @headerColor;
-        font-family: PingFangSC-Semibold;
-        font-size: 16px;
-        color: #FFFFFF;
-        letter-spacing: 0;
-        text-align: center;
-        line-height: 44px;
-        border-top-left-radius: 14px;
-        border-top-right-radius: 14px;
-        img {
-          width: 26px;
-          float: right;
-        }
-      }
-
-      .content-wrap {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        background-color: #FFF;
-        padding: 10px 0;
-        border-bottom-left-radius: 14px;
-        border-bottom-right-radius: 14px;
-        .role-item {
-          width: 90%;
-          height: 44px;
-          background: #FFFFFF;
-          border: 1px solid #CFCFCF;
-          border-radius: 4px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          margin: 4px 0;
-
-          span {
-            font-family: PingFangSC-Regular;
-            font-size: 14px;
-            color: #656464;
-            letter-spacing: 0;
-            line-height: 18px;
-          }
-        }
-        .item-active{
-          background: rgba(29,63,255,0.10);
-          border: 1px solid #1D3FFF;
-          border-radius: 4px;
-        }
-      }
-
-      .content-btn {
-        margin-top: 10px;
-        width: 84%;
-        height: 40px;
-        background: rgba(56, 63, 69, 0.50);
-        border-radius: 4px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        span {
-          font-family: PingFangSC-Semibold;
-          font-size: 15px;
-          color: #FAFAFA;
-          line-height: 20px;
-        }
-      }
-      .content-btn-active{
-        background: #1D3FFF;
-        border-radius: 4px;
-      }
-    }
-  }
-</style>

src/pages/pay/marginPay/first-pay.vue

@@ -18,7 +18,6 @@
           </div>
         </div>
       </div>
-
       <section class="pay-content">
         <div class="pos">
           <div class="pay-money">
@@ -34,6 +33,20 @@
             </div>
           </div>
         </div>
+        <div class="pos">
+          <div class="pay-money">
+            <div class="pay-icon">
+              <img src="@/assets/payment/first-pay.png" >已还保证金
+            </div>
+            <div class="pay-input">
+              <span>已还保证金</span>
+              <span style="text-align:right;display:inline-block;margin-right:5px;">￥{{ Paied|currency }}</span>
+              <!-- <div @click="createOrder">
+                <img src="@/assets/payment/into.png" >
+              </div>-->
+            </div>
+          </div>
+        </div>
         <div class="write">
           <div class="box">
             <span>备注</span>
@@ -67,17 +80,38 @@ export default {
   },
   data () {
     return {
-      money: 0,
+      money: null,
+      Paied: 0, // 已缴纳金额
       default: 0,
       pay_note: '', // 备注
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      vm.getPaied()
+    })
   },
   computed: {},
   watch: {},
   methods: {
+    getPaied () {
+      let vm = this
+      let url = process.env.basePath + 'bp_agent_query'
+      let param = {
+        info: {
+          phone: window.localStorage.user_phone,
+        },
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.Paied = res.info.paid_deposit
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     putOrder (money) {
       let vm = this
       let url = process.env.basePath + 'create_order_agent_amt'

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

@@ -451,15 +451,34 @@ export default {
         vm.$post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
-            vm.$router.push({
+            /*vm.$router.push({
               name: 'NPBankInfo',
-            })
+            })*/
+            vm.attachmentCheck()
           } else {
             hlsPopup.showLongCenter(res.message)
           }
         })
       }
     },
+    attachmentCheck(){
+      let vm = this
+      let url = process.env.basePath + 'bp_attachment_check'
+      let param = {
+        bp_id: window.localStorage.getItem('bp_id'),
+      }
+      vm.hlsPopup.showLoading('正在校验数据')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'NPBankInfo',
+          })
+        } else {
+          hlsPopup.showError(res.message)
+        }
+      })
+    },
     getHouseInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_house_info_query'

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

@@ -529,7 +529,7 @@ export default {
         vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
         vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
         vm.isClear = false
-        //vm.baseInfo.bp_class = vm.$route.params.bp_class
+        // vm.baseInfo.bp_class = vm.$route.params.bp_class
       }
     })
   },
@@ -762,6 +762,35 @@ export default {
         }
       })
     },
+    // 基本信息保存前校验
+    bindCheck () {
+      let vm = this
+      var business_num = ''
+      if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
+        business_num = vm.baseInfo.agent_username
+      } else if (vm.baseInfo.bp_type === 'AGENT' || vm.baseInfo.bp_type === 'FACTORY') {
+        business_num = vm.baseInfo.business_license_num
+      } else if (vm.baseInfo.bp_type === 'OFFICE') {
+        business_num = vm.baseInfo.business_license_num
+      }
+      let url = process.env.basePath + 'bp_bind_check'
+      let param = {
+        bp_class: 'NP',
+        bp_type: vm.baseInfo.bp_type,
+        business_num: business_num,
+      }
+      vm.hlsPopup.showLoading('正在校验数据有效性')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'NPInvoiceInfo',
+          })
+        } else {
+          hlsPopup.showError(res.message)
+        }
+      })
+    },
     async saveProtocol () {
       let vm = this
       let url = process.env.basePath + 'bp_np_bind_save'
@@ -779,7 +808,8 @@ export default {
         window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
         window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
         window.localStorage.setItem('from', vm.from)
-        vm.$router.push({
+       // vm.bindCheck()
+         vm.$router.push({
           name: 'NPInvoiceInfo',
         })
         return res.bp_id
@@ -789,7 +819,6 @@ export default {
     },
     async saveWord () {
       let vm = this
-      debugger
       if (!vm.baseInfo.bp_type) {
         vm.hlsPopup.showLongCenter('客户类型不能为空！')
       } else if (vm.isPaople && !vm.baseInfo.agent_username) {

src/pages/userBindNew/org/bankInfo.vue

@@ -304,32 +304,6 @@ export default {
           }
         },
       })
-      // this.hlsPopup.showConfirm({
-      //   title: '提示',
-      //   content: '您确认提交吗？',
-      //   onConfirm: data => {
-      //     if (data) {
-      //       let url = $config.basePath + 'bp_bind_submit'
-      //       let param = {
-      //         master: {
-      //           bp_id: this.$route.params.bp_id,
-      //           company_id: '2145',
-      //         },
-      //       }
-      //       let vm = this
-      //       vm.hlsPopup.showLoading('请稍候')
-      //       this.hlsHttp.post(url, param).then(function (res) {
-      //         vm.hlsPopup.hideLoading()
-      //         if (res.result === 'S') {
-      //           vm.hlsPopup.showSuccess('提交成功')
-      //           vm.$router.push({
-      //             name: 'MyInfo',
-      //           })
-      //         }
-      //       })
-      //     }
-      //   },
-      // })
     },
     // 获取个人认证url
     getNpCertificationUrl () {

src/pages/userBindNew/org/baseInfo.vue

@@ -395,7 +395,7 @@
             </div>
           </div>
         </div>
-
+        <!--
         <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
           <img src="@/assets/userBind/tax.png" class="left-img">
           <div>
@@ -404,8 +404,8 @@
           </div>
           <img src="@/assets/userBind/arrow-right.png" class="right-img">
         </div>
-      </div>
-    </h-content>
+      </div> -->
+    </div></h-content>
     <bottom-tab class="footer-button">
       <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
       <tab-button class="save" @click.native="verified">下一步</tab-button>
@@ -752,16 +752,16 @@ export default {
         },
       })
     },
-    changeUndertake () {
-      this.$router.push({
-        name: 'MarginFirstPay',
-        params: {
-          bp_id: this.$route.params.bp_id,
-          status: this.$route.params.status,
-          isAGENT: this.isAGENT,
-        },
-      })
-    },
+    // changeUndertake () {
+    //   this.$router.push({
+    //     name: 'MarginFirstPay',
+    //     params: {
+    //       bp_id: this.$route.params.bp_id,
+    //       status: this.$route.params.status,
+    //       isAGENT: this.isAGENT,
+    //     },
+    //   })
+    // },
     addRows (e) {
       let addNum = parseInt(e.length / 16)
       if (addNum === 0) {

src/pages/userBindNew/org/enclosure.vue

@@ -414,6 +414,9 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'Invoice') {
+        vm.carImg = '',
+        vm.houseImg = '',
+        vm.propertyImg = '', // 不动产识别图片
         vm.propertyInfo = { // 不动产证
           bp_id: vm.$route.params.bp_id,
           right_person: '',
@@ -515,8 +518,8 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-           Object.assign(vm.hauseInfo, res.info)
-          //vm.hauseInfo = res.info
+          Object.assign(vm.hauseInfo, res.info)
+          // vm.hauseInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -534,8 +537,8 @@ export default {
         vm.hlsPopup.hideLoading()
         console.log('行驶证信息查询', res)
         if (res.result === 'S') {
-           Object.assign(vm.carInfo, res.info)
-         // vm.carInfo = res.info
+          Object.assign(vm.carInfo, res.info)
+          // vm.carInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -553,72 +556,86 @@ export default {
         vm.hlsPopup.hideLoading()
         console.log('不动产权证查询', res)
         if (res.result === 'S') {
-           Object.assign(vm.propertyInfo, res.info)
-         // vm.propertyInfo = res.info
+          Object.assign(vm.propertyInfo, res.info)
+          // vm.propertyInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
     // 行驶证信息保存
-    saveCarInfo () {
+    async saveCarInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_vehicleLicense_save'
       let param = {
         master: vm.carInfo,
       }
       hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.$router.push({
-            name: 'BankInfo',
-            params: {
-              bp_id: vm.bp_id,
-            },
-          })
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+      }
     },
     // 不动产信息保存
-    savePropertyInfo () {
+    async savePropertyInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_real_estate_save'
       let param = {
         master: vm.propertyInfo,
       }
-      // hlsPopup.showLoading('请稍候')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+      }
+    },
+    // 房产证信息保存
+    async saveHouseInfo () {
+      let vm = this
+      let url = process.env.basePath + 'bp_house_info_save'
+      let isSaveCar = await vm.saveCarInfo()
+      let isSaveEstate = await vm.savePropertyInfo()
+      let param = {
+        master: vm.hauseInfo,
+      }
+      hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-
+         /* vm.$router.push({
+            name: 'BankInfo',
+            params: {
+              bp_id: vm.bp_id,
+            },
+          })*/
+          vm.attachmentCheck()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
       })
     },
-    // 房产证信息保存
-    saveHouseInfo () {
+    attachmentCheck () {
       let vm = this
-      let url = process.env.basePath + 'bp_house_info_save'
-      // vm.hauseInfo.regist_date.substr(0, 10)
-      console.log('regist_date', vm.hauseInfo.regist_date)
+      let url = process.env.basePath + 'bp_attachment_check'
       let param = {
-        /*master: {
-          ...vm.hauseInfo,
-          regist_date: vm.hauseInfo.regist_date.substr(0, 10),
-        },*/
-        master: vm.hauseInfo,
+        bp_id: vm.bp_id,
       }
-      // hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+      vm.hlsPopup.showLoading('正在校验数据')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.saveCarInfo()
+          vm.$router.push({
+            name: 'BankInfo',
+            params: {
+              bp_id: vm.bp_id,
+            },
+          })
         } else {
-          hlsPopup.showLongCenter(res.message)
+          hlsPopup.showError(res.message)
         }
       })
     },
@@ -678,7 +695,7 @@ export default {
         vm.save_picture(list)
         vm.isUploadProperty = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
       }
-      vm.savePropertyInfo()
+      //  vm.savePropertyInfo()
       vm.saveHouseInfo()
     },
     // 房产证/车辆证识别

src/scripts/hlsHttp.js

@@ -35,11 +35,14 @@ axios.interceptors.response.use(response => {
     err.message = response.data.message
     hlsPopup.showError(err.message)
     return Promise.resolve(err)
+  } else if (response.code === '404') {
+    hlsPopup.showError('未找到资源文件')
   } else {
     return response.data
   }
 }, err => {
   if (err && err.response) {
+    debugger
     switch (err.response.status) {
       case 400:
         err.message = '错误请求'