add

11408293 · linxin · d74c5e24 · d6079410 · 11408293 · 11408293
Commit 11408293 authored Mar 23, 2020 by linxin
19 changed files
--- a/index.html
+++ b/index.html
@@ -22,16 +22,28 @@
 <body>
 <div id="app-box"></div>
 <!-- built files will be auto injected -->
-<!--<script>
-  if (window.history && window.history.pushState) {
-    // 往历史记录里面添加一条新的当前页面的url
-    history.pushState(null, null, document.URL)
-    // 给 popstate 绑定一个方法 监听页面刷新
-    window.addEventListener('popstate', function(){
-      history.pushState(null, null, location.href );
-      alert('请点击左上角返回按钮返回')
-    }, false) // false阻止默认事件
-  }
-</script>-->
+<script>
+  // if (window.history && window.history.pushState) {
+  //   // 往历史记录里面添加一条新的当前页面的url
+  //   history.pushState(null, null, document.URL)
+  //   // 给 popstate 绑定一个方法 监听页面刷新
+  //   window.addEventListener('popstate', function(){
+  //     history.pushState(null, null, location.href );
+  //     alert('请点击左上角返回按钮返回')
+  //   }, false) // false阻止默认事件
+  // }
+  const u = navigator.userAgent;
+    if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
+      window.addEventListener('resize', function () {
+        // Document 对象的activeElement 属性返回文档中当前获得焦点的元素。
+        if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA') {
+          console.log('安卓触发', document.activeElement.tagName)
+          window.setTimeout(function() {
+            document.activeElement.scrollIntoView(true);
+          }, 50);
+        }
+      })
+    }
+</script>
 </body>
 </html>
--- a/src/assets/login/logintitle.png
+++ b/src/assets/login/logintitle.png
--- a/src/assets/login/regester.png
+++ b/src/assets/login/regester.png
--- a/src/pages/contractCreate/add-undertake.vue
+++ b/src/pages/contractCreate/add-undertake.vue
 <template>
-  <h-view v-if="showFlag" id="add-person">
-    <h-header :proportion="[1,4,1]" class="bar-custom">
-      <span slot="center" style="color:#fff">添加担保人</span>
-      <span slot="right" style="color:#fff" @click="showFlag=false">取消</span>
+  <h-view id="add-person">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <span>合同创建</span>
+      </div>
    </h-header>
    <div class="search has-header">
      <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
@@ -26,12 +28,12 @@
 </template>
 <script>
 export default {
-  props: {
-    bp_agent_id: {
-      type: String,
-      default: '',
-    },
-  },
+  // props: {
+  //   bp_agent_id: {
+  //     type: String,
+  //     default: '',
+  //   },
+  // },
  data () {
    return {
      undertakeList: [], // 担保人列表
@@ -39,10 +41,17 @@ export default {
      pagenum: 1,
      keyWord: '',
      showFlag: false,
+      bp_agent_id: this.$route.params.bp_agent_id,
    }
  },
  watch: {

+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.init()
+      vm.getUndertake()
+    })
  },
  methods: {
    show () {
@@ -50,7 +59,7 @@ export default {
    },
    init () {
      this.undertakeList = []
-      this.selectUdertake = []
+      this.selectUdertake = {}
      this.pagenum = 1
      this.keyWord = ''
    },
@@ -105,10 +114,17 @@ export default {
      })
    },
    addUndertake (e) {
+      let vm = this
      this.selectUdertake = e
-      this.$emit('addUnder', this.selectUdertake)
+      // this.$emit('addUnder', this.selectUdertake)
      setTimeout(() => {
-        this.showFlag = false
+        vm.$router.replace({
+          name: 'CreateBaseInfo',
+          params: {
+            selectUdertake: vm.selectUdertake,
+          },
+        })
+        vm.$router.go(-1)
      }, 100)
    },
    getUndertake () { // 担保人查询
@@ -164,6 +180,7 @@ export default {
    margin: 0 auto;
  }
  .search {
+    position: absolute;
    background-color: #fff;
    padding: 8px 12px;
    width: 100%;
@@ -197,20 +214,27 @@ export default {
      border: 2px solid #bcc6ff;
    }
  }
-
+ .content {
+    position: absolute;
+    top: 0;
+  }
+    .scrollContent {
+    padding-top: 2rem;
+    padding-bottom: 20px;
+  }
 }
 .platform-ios {
-  #person {
+  #add-person {
    .scrollContent {
-      padding-top: 1.4rem;
+      padding-top: 2.4rem;
    }
  }
 }
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
  .platform-ios {
-    #person {
+    #add-person {
      .scrollContent {
-        padding-top: 1.8rem;
+        padding-top: 2.8rem;
      }
    }
  }
@@ -218,9 +242,9 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
  .platform-ios {
-    #person {
+    #add-person {
      .scrollContent {
-        padding-top: 1.8rem;
+        padding-top: 2.8rem;
      }
      .search {
        input {

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -846,7 +846,8 @@ export default {
           }, */
    setTime () {
      if (!this.saveInfo.lease_start_date) {
-        let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
+        let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
+        let signDate = new Date(date)
        let iToDay = signDate.getDate()
        let iToMon = signDate.getMonth()
        let iToYear = signDate.getFullYear()
@@ -856,13 +857,15 @@ export default {
    },
    showTime (format) { // 预计付款日
      let vm = this
-      let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
+      let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
+      let signDate = new Date(date)
      let iToDay = signDate.getDate()
      let iToMon = signDate.getMonth()
      let iToYear = signDate.getFullYear()
      let newDay = new Date(iToYear, iToMon, (iToDay + 30))
      hlsPopup.showTime({
-        nowDate: newDay.format('yyyy-MM-dd'),
+        // nowDate: newDay.format('yyyy-MM-dd'),
+        nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
        format: format,
        callback: (date) => {
          if (date >= (new Date()).format('yyyy-MM-dd')) {

--- a/src/pages/contractCreate/create-base-info.vue
+++ b/src/pages/contractCreate/create-base-info.vue
@@ -382,15 +382,15 @@
      <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
      <tab-button class="next" @click.native="save">下一步</tab-button>
    </bottom-tab>
-    <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" />
+    <!-- <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" /> -->
  </h-view>
 </template>
 <script>
-import AddUnderTake from '../../pages/contractCreate/add-undertake'
+// import AddUnderTake from '../../pages/contractCreate/add-undertake'
 export default {
-  components: {
-    AddUnderTake,
-  },
+  // components: {
+  //   AddUnderTake,
+  // },
  data () {
    return {
      salesEnter: '', // 页面进入标识，该字段作用：第一次创建时即从销售页面进入进本信息、租赁信息、附件信息。用于判断后面页面录入数据后未保存则点击上一步，再次进入该页面数据丢失问题
@@ -585,6 +585,10 @@ export default {
          vm.getSaveInfo()
          vm.getBaseInfo()
        }, 0)
+      } else if (from.name === 'Addundertake') {
+        if (vm.$route.params.selectUdertake) {
+          vm.addUnder(vm.$route.params.selectUdertake)
+        }
      }
    })
  },
@@ -664,17 +668,25 @@ export default {
      }
    },
    addPerson () {
-      this.$refs.addperson.init()
-      this.$refs.addperson.getUndertake()
-      this.$refs.addperson.show()
+      // this.$refs.addperson.init()
+      // this.$refs.addperson.getUndertake()
+      // this.$refs.addperson.show()
+      this.$router.push({
+        name: 'Addundertake',
+        params: {
+          bp_agent_id: this.bp_agent_id,
+        },
+      })
    },

    makeData () {
      let obj = {}
-      this.selectUdertake.forEach((i, index, arr) => {
-        obj[`bp_id_guta_${index + 1}`] = i.bp_guta_id
-      })
-      return obj
+      if (this.selectUdertake.length > 0) {
+        this.selectUdertake.forEach((i, index, arr) => {
+          obj[`bp_id_guta_${index + 1}`] = i.bp_guta_id
+        })
+        return obj
+      }
    },
    getAgentInfo () {
      let vm = this
@@ -1202,47 +1214,6 @@ export default {
    }
  }
 }
-#add-person {
-  .item {
-    width: 359px;
-    margin: 0 auto;
-  }
-  .search {
-    background-color: #fff;
-    padding: 8px 12px;
-    width: 100%;
-    height: 1.02rem;
-    z-index: 100;
-    margin-bottom: 8px;
-    input {
-      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
-      background-size: 16px 16px;
-      background-color: rgba(239, 239, 239, 0.55);
-      padding-left: 12px;
-      height: 36px;
-      line-height: 36px;
-      border-radius: 4px;
-      width: 100%;
-      font-family: PingFangSC-Regular;
-      font-size: 14px;
-      color: #888c8f;
-    }
-
-    input::placeholder {
-      font-family: PingFangSC-Regular;
-      font-size: 14px;
-      color: #888c8f;
-      letter-spacing: 0;
-    }
-
-    input:focus {
-      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
-      background-size: 16px 16px;
-      background-color: rgba(239, 239, 239, 0.55);
-      border: 2px solid #bcc6ff;
-    }
-  }
-}
 @media (device-width: 414px) and (device-height: 896px) {
  .platform-ios {
    #add-person {

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -65,7 +65,6 @@
            type="text"
            readonly
            placeholder="请选择"
-            @click="selectFactory"
          >
        </item>
        <item>
@@ -179,20 +178,20 @@ export default {
    }
  },
  watch: {
-    'salesInfo.factory': {
-      handler (newVal, oldVal) {
-        this.factoty.forEach(i => {
-          if (i.bp_factory_id === this.salesInfo['factory']) {
-            this.inflow_line = i.inflow_line
-            this.inflow_used = i.inflow_used
-            this.inflow_reset = i.inflow_reset
-            this.salesInfo.credit_id = i.credit_id
-            window.localStorage.setItem('credit_id', i.credit_id)
-          }
-        })
-      },
-      immediate: true,
-    },
+    // 'salesInfo.factory': {
+    //   handler (newVal, oldVal) {
+    //     this.factoty.forEach(i => {
+    //       if (i.bp_factory_id === this.salesInfo['factory']) {
+    //         this.inflow_line = i.inflow_line
+    //         this.inflow_used = i.inflow_used
+    //         this.inflow_reset = i.inflow_reset
+    //         this.salesInfo.credit_id = i.credit_id
+    //         window.localStorage.setItem('credit_id', i.credit_id)
+    //       }
+    //     })
+    //   },
+    //   immediate: true,
+    // },
    // '$route' (to, from) {
    //   debugger
    //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
@@ -236,8 +235,8 @@ export default {
        }
        vm.businessQuery().then(res => {
          vm.agentQuery().then(res => {
-            vm.factoryQuery().then(res => {
-            })
+            // vm.factoryQuery().then(res => {
+            // })
          })
        })
      } else if (from.name === 'CreateBaseInfo') {
@@ -344,18 +343,28 @@ export default {
      let vm = this
      let url = process.env.basePath + 'prj_factory_list'
      let param = {
+        office_id: vm.salesInfo.office_id,
        phone: window.localStorage.getItem('user_phone'),
      }
      vm.hlsPopup.showLoading('请稍候')
-      return vm.hlsHttp.post(url, param).then(function (res) {
+      vm.hlsHttp.post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
-        vm.factoty = res.lists
+        // vm.factoty = res.lists
        if (res.result === 'S') {
-          vm.factoryLists = res.lists.map(item => {
-            return {
-              code: item.bp_factory_id,
-              code_name: item.bp_factory_name,
-            }
+          // vm.factoryLists = res.lists.map(item => {
+          //   return {
+          //     code: item.bp_factory_id,
+          //     code_name: item.bp_factory_name,
+          //   }
+          // })
+          res.lists.forEach(i => {
+            vm.inflow_line = i.inflow_line
+            vm.inflow_used = i.inflow_used
+            vm.inflow_reset = i.inflow_reset
+            vm.salesInfo.factory = i.bp_factory_id
+            vm.salesInfo.credit_id = i.credit_id
+            vm.factory_name = i.bp_factory_name
+            window.localStorage.setItem('credit_id', i.credit_id)
          })
        }
      })
@@ -439,6 +448,7 @@ export default {
        returnItem: function (index, obj) {
          vm.salesInfo.office_id = obj.office_type
          vm.office_name = obj.office_type_n
+          vm.factoryQuery()
        },
      })
    },

--- a/src/pages/distributorSign/contract-details.vue
+++ b/src/pages/distributorSign/contract-details.vue
@@ -322,6 +322,30 @@ export default {
  },
  created () {},
  methods: {
+    // 跳转银行信息录入
+    // entryInfo () {
+    //   let idCard = ''
+    //   if (this.baseInfo.auth_flag) {
+    //     this.baseInfo.auth_flag === '是'
+    //       ? (idCard = this.baseInfo.auth_person_id_card)
+    //       : this.baseInfo.id_card_no
+    //     console.log(',,,,,,,,,,,', idCard)
+    //   } else {
+    //     idCard = this.baseInfo.id_card_no
+    //   }
+    //   this.$router.push({
+    //     name: 'EntryInfo',
+    //     params: {
+    //       id_card_no: idCard,
+    //       bp_name: this.bp_name,
+    //       project_id: this.project_id,
+    //       confirm_status: this.con_confirm_status,
+    //       entry_info_flag: this.entry_info_flag,
+    //       user_bp_type: this.user_bp_type,
+    //       bp_id: this.baseInfo.bp_id,
+    //     },
+    //   })
+    // },
    charge (val, status) {
      let vm = this
      this.hlsPopup.showConfirm({

--- a/src/pages/home/home-page.vue
+++ b/src/pages/home/home-page.vue
@@ -53,9 +53,9 @@
            <div slot="content" class="item-content">
              <div class="top">{{ list.product_name }}</div>
              <img src="@/assets/homePage/hot.png" class="hot">
-              <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
+              <div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?'办事处':'经销商') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?list.office_name:list.agent_name) }}</span></div>
              <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
-              <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n }}</span></div>
+              <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?(list.district_id_n?list.city_id_n + list.district_id_n:list.city_id_n):(list.district_id_n?list.province_id_n + list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n )):(list.office_id? (list.office_province === list.office_city?(list.office_district?list.office_city + list.office_district:list.office_city ):(list.office_district?list.office_province + list.office_city + list.office_district:list.office_province + list.office_city)):(list.agent_province === list.agent_city?(list.agent_district?list.agent_city + list.agent_district:list.agent_city):(list.agent_district?list.agent_province + list.agent_city + list.agent_district:list.agent_province + list.agent_city))) }}</span></div>
            </div>
          </item>
        </list-item>
@@ -82,14 +82,15 @@ export default {
  },
  watch: {},
  created () {
-    this.getLocation()
+    // this.getLocation()
  },
  beforeRouteEnter (to, from, next) {
    next(vm => {
      // if (from.name === 'Login') {
      vm.moduleSeparateList = [...functionState.moduleSeparateList]
      vm.userQuery()
-      vm.guessingQuery() // 猜你喜欢查询
+      // vm.guessingQuery() // 猜你喜欢查询
+      vm.getLocation()

      //  }
    })
@@ -101,17 +102,21 @@ export default {
          let vm = this
          if (vum.Platform.isAndroid()) { // 安卓采用jsapi
            var geolocation = new BMap.Geolocation()
+            vm.hlsPopup.showLoading('数据加载中')
            geolocation.getCurrentPosition(function (res) {
+              vm.hlsPopup.hideLoading()
              if (this.getStatus() === 0) {
                // 判断是否是手动选择过定位
                if (window.localStorage.getItem('province')) {
                  vm.city = window.localStorage.getItem('city')
                  vm.province = window.localStorage.getItem('province')
+                  vm.guessingQuery(vm.city)
                } else {
                  // 没有就定位当前位置
                  console.log(res)
                  vm.city = res.address.city
                  vm.province = res.address.province
+                  vm.guessingQuery(res.address.city)
                }
              }
            }, {enableHighAccuracy: true})
@@ -121,13 +126,16 @@ export default {
              if (window.localStorage.getItem('province')) {
                vm.city = window.localStorage.getItem('city')
                vm.province = window.localStorage.getItem('province')
+                vm.guessingQuery(vm.city)
              } else {
                vm.city = result.city
                vm.province = result.province
+                vm.guessingQuery(result.city)
              }
            }, function (error) {
            })
          }
+          // setTimeout(vm.guessingQuery(), 0)
        },
        goFunctionHome (data) {
          this.$router.push({
@@ -169,12 +177,13 @@ export default {
          })
        },
        // 猜你喜欢
-        guessingQuery () {
+        guessingQuery (e) {
+          console.log(e)
          let vm = this
          let url = $config.basePath + 'guess_you_like_query'
          let param = {
            'user_phone': window.localStorage.getItem('user_phone'),
-            'city': vm.city,
+            'city': e,
          }
          vm.hlsPopup.showLoading('数据加载中')
          vm.$post(url, param).then(function (res) {

--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -13,7 +13,7 @@
    </transition>
    <div class="bird-icon" />
    <div class="login-wrap">
-      <img class="title" src="../assets/login/title.png" >
+      <img class="title" src="../assets/login/logintitle.png" >
      <div class="pwd">
        <div class="pwd-input">
          <input

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
@@ -431,18 +431,18 @@ export default {
    // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
    goSign () {
      if (this.bp_id) {
-        if (this.user_bp_type === 'AGENT') {
-          this.$router.push({
-            name: 'ContractList',
-          })
-        } else {
-          this.$router.push({
-            name: 'ContractSigning',
-            params: {
-              user_bp_type: this.user_bp_type,
-            },
-          })
-        }
+        // if (this.user_bp_type === 'AGENT') {
+        //   this.$router.push({
+        //     name: 'ContractList',
+        //   })
+        // } else {
+        this.$router.push({
+          name: 'ContractSigning',
+          params: {
+            user_bp_type: this.user_bp_type,
+          },
+        })
+        // }
      } else {
        hlsPopup.showLongCenter('请先进行用户绑定')
      }

--- a/src/pages/pay/firstPay/pay-entry.vue
+++ b/src/pages/pay/firstPay/pay-entry.vue
@@ -97,7 +97,7 @@
      <div class="info">
        <div class="info-item">
          <span>还款金额</span>
-          <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
+          <span>{{ parseFloat(money).toFixed(2) |currency }}</span>
        </div>
        <div class="interest">
          <span>本次交易收取{{ rate }}%手续费</span>

--- a/src/pages/regiester2.vue
+++ b/src/pages/regiester2.vue
@@ -7,7 +7,7 @@
      </div>
      <div class="box">
        <div class="box-content">
-          <img class="register-title" src="../assets/login/reg-logo.png" >
+          <img class="register-title" src="../assets/login/regester.png" >
          <div class="reg-item">
            <img src="../assets/login/reg-user.png" class="left-icon" >
            <input v-model="phone_number" placeholder="请输入手机号码" >

--- a/src/pages/userBindNew/np/accessory-info.vue
+++ b/src/pages/userBindNew/np/accessory-info.vue
@@ -578,22 +578,22 @@ export default {
      }
    },
    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)
-        }
+      // 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') {
+      this.$router.push({
+        name: 'NPBankInfo',
      })
+      //   } else {
+      //     hlsPopup.showError(res.message)
+      //   }
+      // })
    },
    async getHouseInfo () {
      let vm = this

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -215,7 +215,7 @@
          >
        </item>
        <item
-          v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"
+          v-if="((baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'"
          :showArrow="true"
        >
          <div slot="name" class="required">婚姻状况</div>
@@ -230,7 +230,7 @@
        </item>
      </list-item>
      <div
-        v-if="(hasSP && baseInfo.bp_type === 'TENANT') || (hasSP && baseInfo.bp_type === 'GUTA')"
+        v-if="(hasSP && (((baseInfo.bp_type === 'TENANT'||baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'))"
      >
        <!-- 主承租人活担保人为已婚显示-->
        <div class="userInfo">配偶信息</div>
@@ -449,17 +449,22 @@ export default {
        vm.isLesons = false
      }
    },
-    'baseInfo.marital_status_n': function (newVal, oldVal) {
-      if (newVal === '已婚') {
-        this.hasSP = true
-      } else {
-        this.hasSP = false
-        this.baseInfo.bp_name_sp = ''
-        this.baseInfo.spouse_phone = ''
-        this.baseInfo.working_place_sp = ''
-        this.baseInfo.address_sp = ''
-      }
+    'baseInfo.marital_status_n': {
+      handler: function (newVal, oldVal) {
+        if (newVal === '已婚') {
+          this.hasSP = true
+        } else {
+          this.hasSP = false
+          this.baseInfo.bp_name_sp = ''
+          this.baseInfo.spouse_phone = ''
+          this.baseInfo.working_place_sp = ''
+          this.baseInfo.address_sp = ''
+        }
+      },
+      deep: true,
+      immediate: true,
    },
+
  },
  created () {
    this.getBpType()
@@ -486,7 +491,34 @@ export default {
        vm.upload_list = [] // 上传图片列表
        vm.dowload_list = [] // 下载图片列表
        vm.img_url = {}
-        vm.baseInfo = {}
+        vm.baseInfo = { bp_type_n: '',
+          academic_background_n: '',
+          marital_status_n: '',
+          bp_type: '',
+          bp_class: vm.$route.params.bp_class,
+          bp_name: '',
+          province_name: '',
+          province_id: '',
+          city_name: '',
+          city_id: '',
+          id_card_no: null,
+          id_card_date_from: '', // 身份证有效期从
+          id_card_date_to: '', // 身份证有效期到
+          cell_phone: window.localStorage.getItem('user_phone'),
+          living_address: '',
+          address_on_resident_booklit: '',
+          marital_status: '',
+          academic_background: '',
+          bp_name_sp: '',
+          id_card_no_sp: '', // 配偶身份证号
+          id_card_date_from_sp: '', // 配偶身份证有效期从
+          id_card_date_to_sp: '', // 配偶身份证有效期到
+          district_id: '',
+          district_name: '',
+          spouse_phone: '',
+          working_place_sp: '',
+          address_sp: '',
+          user_phone: window.localStorage.user_phone }
        vm.idCardFront = '' // 身份证正面图片
        vm.idCardBack = '' // 身份证反面图片
        vm.idCardFrontSp = '' // 配偶身份证正面图片
@@ -647,7 +679,8 @@ export default {
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
-          vm.baseInfo = res.info
+          Object.assign(vm.baseInfo, res.info)
+          // vm.baseInfo = res.info
          vm.from = true
          vm.addRows(vm.baseInfo.address_on_resident_booklit)
          vm.addRowsLive(vm.baseInfo.living_address)
@@ -770,7 +803,7 @@ export default {
            vm.idCardFrontUrlFlag = true
            vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
            // 身份证正面图片已修改，重新上传
-            var list = []
+            let list = []
            let obj = {
              pkvalue: vm.idCardFrontCheck_id,
              source_type: 'PRJ_CDD_ITEM_CHECK',
@@ -789,7 +822,7 @@ export default {
            vm.idCardBackUrlFlag = true
            vm.delete_pic_to_ocr(vm.idCardBackAttachmentId)// 先删除之前识别的图片
            // 身份证反面图片已修改，重新上传
-            var list = []
+            let list = []
            let obj = {
              pkvalue: vm.idCardBackCheck_id,
              source_type: 'PRJ_CDD_ITEM_CHECK',
@@ -808,7 +841,7 @@ export default {
            vm.idCardFrontSpUrlFlag = true
            vm.delete_pic_to_ocr(vm.idCardFrontSpAttachmentId)// 先删除之前识别的图片
            // 配偶身份证正面图片已修改，重新上传
-            var list = []
+            let list = []
            let obj = {
              pkvalue: vm.idCardFrontSpCheck_id,
              source_type: 'PRJ_CDD_ITEM_CHECK',
@@ -827,7 +860,7 @@ export default {
            vm.idCardBackSpUrlFlag = true
            vm.delete_pic_to_ocr(vm.idCardBackSpAttachmentId)// 先删除之前识别的图片
            // 配偶身份证背面图片已修改，重新上传
-            var list = []
+            let list = []
            let obj = {
              pkvalue: vm.idCardBackSpCheck_id,
              source_type: 'PRJ_CDD_ITEM_CHECK',
@@ -973,30 +1006,30 @@ export default {
        vm.hlsPopup.showLongCenter('户籍地址不能为空！')
      } else if (!vm.baseInfo.academic_background) {
        vm.hlsPopup.showLongCenter('学历不能为空！')
-      } else if (!vm.baseInfo.marital_status && (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA')) {
+      } else if (!vm.baseInfo.marital_status && (((vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') && !vm.multipleRole) || vm.multipleRole === 'TENANT' || vm.multipleRole === 'GUTA')) {
        vm.hlsPopup.showLongCenter('婚姻状况不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
        vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
        vm.hlsPopup.showLongCenter('配偶身份证号不能为空！')
      } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
        !vm.baseInfo.id_card_date_from_sp
      ) {
        vm.hlsPopup.showLongCenter('配偶身份证有效期从不能为空！')
      } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
        !vm.baseInfo.id_card_date_to_sp
      ) {
        vm.hlsPopup.showLongCenter('配偶身份证有效期到不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
        vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
      } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
        !vm.baseInfo.working_place_sp
      ) {
        vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
        vm.hlsPopup.showLongCenter('配偶联系地址不能为空！')
      } else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.cell_phone)) {
        vm.hlsPopup.showLongCenter('手机号码有误!')

--- a/src/pages/userBindNew/org/bankInfo.vue
+++ b/src/pages/userBindNew/org/bankInfo.vue
@@ -57,7 +57,7 @@
      </div>
    </div>
    <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="handSubmit">提交</tab-button>
+      <tab-button class="save" @click.native="addCheck">提交</tab-button>
    </bottom-tab>
    <h-modal ref="modal" v-model="showModalValue" position="bottom">
      <h-view>
@@ -169,6 +169,29 @@ export default {
    })
  },
  methods: {
+    // 提交前校验
+    addCheck () {
+      let vm = this
+      let url = process.env.basePath + 'bp_attachment_check'
+      let param = {
+        bp_id: vm.$route.params.bp_id,
+      }
+      if (window.localStorage.getItem('authFlag') === 'true') {
+        console.log(11111111111)
+        vm.handSubmit()
+      } else {
+        console.log(2222222222)
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.handSubmit()
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
+    },
    // 银行卡查询
    getBankInfo () {
      let vm = this
@@ -276,7 +299,7 @@ export default {
      }
    },
    putData () {
-      this.throttle(this.handSubmit(), 3000)
+      this.throttle(this.addCheck(), 3000)
    },
    // 提交
    async handSubmit () {

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -554,23 +554,6 @@ export default {
    })
  },
  methods: {
-    // 附件信息保存前校验
-    addCheck () {
-      let vm = this
-      let url = process.env.basePath + 'bp_attachment_check'
-      let param = {
-        bp_id: vm.bp_id,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
    addRow (e, event) {
      // let num = Math.ceil((el.target.scrollHeight - 42) / 20)
      // if (num > 0) {

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,7 @@ import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
 import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
 import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
 import previewPdf from '@/pages/contractSigning/previewPdf'
+import Addundertake from '@/pages/contractCreate/add-undertake'

 import About from '@/pages/myInfo/About'
 import UserAgree from '@/pages/myInfo/UserAgreement'
@@ -302,6 +303,8 @@ export default new Router({
    {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
    {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},
    {path: '/previewPdf', component: previewPdf, name: 'previewPdf', meta: {keepAlive: false}},
+    {path: '/add-undertake', component: Addundertake, name: 'Addundertake', meta: {keepAlive: false}},
+
    // 我的发票
    {path: '/invoice', component: MyInvoice, name: 'MyInvoice', meta: {keepAlive: false}},
    {