add

8ede6c19 · linxin · d07f9f7f · 61386bbb · 8ede6c19 · 8ede6c19
Commit 8ede6c19 authored Apr 03, 2020 by linxin
26 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -21,7 +21,3 @@ module.exports = merge(prodEnv, {
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -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.5"'
+  currentVersion: '"0.1.1"'
 }
--- a/config/uat.env.js
+++ b/config/uat.env.js
@@ -11,6 +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.dev"',
-  currentVersion: '"1.9.0"'
+  currentVersion: '"2.1.6"'
 }
--- a/index.html
+++ b/index.html
@@ -22,16 +22,28 @@
 <body>
 <div id="app-box"></div>
 <!-- built files will be auto injected -->
-<!--<script>
+<!-- <script>
-  if (window.history && window.history.pushState) {
+  // if (window.history && window.history.pushState) {
-    // 往历史记录里面添加一条新的当前页面的url
+  //   // 往历史记录里面添加一条新的当前页面的url
-    history.pushState(null, null, document.URL)
+  //   history.pushState(null, null, document.URL)
-    // 给 popstate 绑定一个方法 监听页面刷新
+  //   // 给 popstate 绑定一个方法 监听页面刷新
-    window.addEventListener('popstate', function(){
+  //   window.addEventListener('popstate', function(){
-      history.pushState(null, null, location.href );
+  //     history.pushState(null, null, location.href );
-      alert('请点击左上角返回按钮返回')
+  //     alert('请点击左上角返回按钮返回')
-    }, false) // false阻止默认事件
+  //   }, false) // false阻止默认事件
-  }
+  // }
-</script>-->
+  // 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/right-register.png
+++ b/src/assets/login/right-register.png
--- a/src/assets/login/title.png
+++ b/src/assets/login/title.png
--- a/src/assets/login/righttitle.png
+++ b/src/assets/login/righttitle.png
--- a/src/main.js
+++ b/src/main.js
@@ -57,8 +57,9 @@ import hlsUtil from './scripts/hlsUtil'
 import Jpush from './scripts/jpushService'
 import Jmessage from './scripts/jmessageService'
+//
-if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev') {
+// || process.env.CONFIG_ENV === 'prod'
+if (process.env.CONFIG_ENV === 'dev' || process.env.CONFIG_ENV === 'uat') {
  const VConsole = require('vconsole')
  new VConsole() // eslint-disable-line
 }
@@ -181,7 +182,19 @@ vum.$vumPlatform.registerBackButtonAction(function (e) {
  e.preventDefault()
  return false
 }, 101)
+// input遮挡
+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(false)
+      }, 50)
+    }
+  })
+}
 /* eslint-disable no-new */
 new Vue({
  data () {

--- a/src/pages/contractCreate/add-undertake.vue
+++ b/src/pages/contractCreate/add-undertake.vue
 <template>
-  <h-view v-if="showFlag" id="add-person">
+  <h-view id="add-person">
-    <h-header :proportion="[1,4,1]" class="bar-custom">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
-      <span slot="center" style="color:#fff">添加担保人</span>
+      <div slot="left" class="h-header-btn">
-      <span slot="right" style="color:#fff" @click="showFlag=false">取消</span>
+        <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: {
+  // props: {
-    bp_agent_id: {
+  //   bp_agent_id: {
-      type: String,
+  //     type: String,
-      default: '',
+  //     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: {
+  // components: {
-    AddUnderTake,
+  //   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.init()
-      this.$refs.addperson.getUndertake()
+      // this.$refs.addperson.getUndertake()
-      this.$refs.addperson.show()
+      // this.$refs.addperson.show()
+      this.$router.push({
+        name: 'Addundertake',
+        params: {
+          bp_agent_id: this.bp_agent_id,
+        },
+      })
    },
    makeData () {
      let 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': {
+    // 'salesInfo.factory': {
-      handler (newVal, oldVal) {
+    //   handler (newVal, oldVal) {
-        this.factoty.forEach(i => {
+    //     this.factoty.forEach(i => {
-          if (i.bp_factory_id === this.salesInfo['factory']) {
+    //       if (i.bp_factory_id === this.salesInfo['factory']) {
-            this.inflow_line = i.inflow_line
+    //         this.inflow_line = i.inflow_line
-            this.inflow_used = i.inflow_used
+    //         this.inflow_used = i.inflow_used
-            this.inflow_reset = i.inflow_reset
+    //         this.inflow_reset = i.inflow_reset
-            this.salesInfo.credit_id = i.credit_id
+    //         this.salesInfo.credit_id = i.credit_id
-            window.localStorage.setItem('credit_id', i.credit_id)
+    //         window.localStorage.setItem('credit_id', i.credit_id)
-          }
+    //       }
-        })
+    //     })
-      },
+    //   },
-      immediate: true,
+    //   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') {
@@ -328,6 +327,7 @@ export default {
            vm.office_name = res.info.bp_agent_name
            vm.salesInfo.office_id = res.info.bp_agent_id
            vm.salesInfo.bp_id_agent = ''
+            vm.factoryQuery()
          } else {
            vm.salesInfo.bp_id_agent = res.info.bp_agent_id
          }
@@ -344,18 +344,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 => {
+          // vm.factoryLists = res.lists.map(item => {
-            return {
+          //   return {
-              code: item.bp_factory_id,
+          //     code: item.bp_factory_id,
-              code_name: item.bp_factory_name,
+          //     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 +449,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/contractInquire/contract-records.vue
+++ b/src/pages/contractInquire/contract-records.vue
@@ -26,6 +26,8 @@
        <p><span :class="{'selected':selected === 'two'}" @click="isSelected('two')">首付还款中</span></p>
        <p><span :class="{'selected':selected === 'three'}" @click="isSelected('three')">还款中</span></p>
        <p><span :class="{'selected':selected === 'four'}" @click="isSelected('four')">已结清</span></p>
+        <p><span :class="{'selected':selected === 'five'}" @click="isSelected('five')">撤销</span></p>
+        <p><span :class="{'selected':selected === 'six'}" @click="isSelected('six')">其他</span></p>
      </div>
      <div class="search">
@@ -50,6 +52,8 @@
            <p v-if="item.contract_status_n === '首付还款中'" class="orange">首付还款中</p>
            <p v-if="item.contract_status_n === '还款中'" class="blue">还款中</p>
            <p v-if="item.contract_status_n === '已结清'" class="black">已结清</p>
+            <p v-if="item.contract_status_n === '撤销'" class="undo">{{ item.xcmg_contract_status_n }}</p>
+            <p v-if="item.contract_status_n === '其他'" class="other">{{ item.xcmg_contract_status_n }}</p>
          </div>
          <div class="center">
            <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
@@ -86,17 +90,23 @@ export default {
      unRepayLists: [], // 首付还款中
      repayingLists: [], // 还款中
      repayedLists: [], // 已结清
+      undoLists: [], // 撤销
+      otherLists: [], // 其他
      pagenum: 1, // 全部列表页码
      unSigned_pagenum: 1, // 待首付页码
      unRepay_pagenum: 1, // 首付还款中页码
      repaying_pagenum: 1, // 还款中页码
      repayed_pagenum: 1, // 已结清页码
+      undo_pagenum: 1, // 已撤销页码
+      other_pagenum: 1, // 其他页码
      searchInput: '', // 搜索内容
      contract_status_n: '全部', // 全部/待首付/首付还款中/还款中/已结清
      unSigned_flag: false, // 控制tab切换时再次请求
      unRepay_flag: false,
      repaying_flag: false,
      repayed_flag: false,
+      undo_flag: false,
+      other_flag: false,
      bp_type: '', // 用户类型
    }
  },
@@ -137,6 +147,20 @@ export default {
        if (!this.repayed_flag) {
          this.recordQuery('已结清', this.repayedLists)
        }
+      } else if (this.selected === 'five') {
+        this.contract_status_n = '撤销'
+        // this.pageNum = this.repayed_pagenum
+        this.showLists = this.undoLists
+        if (!this.undo_flag) {
+          this.recordQuery('撤销', this.undoLists)
+        }
+      } else if (this.selected === 'six') {
+        this.contract_status_n = '其他'
+        // this.pageNum = this.repayed_pagenum
+        this.showLists = this.otherLists
+        if (!this.other_flag) {
+          this.recordQuery('其他', this.otherLists)
+        }
      }
    },
    searchInput () {
@@ -158,6 +182,8 @@ export default {
        vm.unRepay_pagenum = 1
        vm.repaying_pagenum = 1
        vm.repayed_pagenum = 1
+        vm.undo_pagenum = 1
+        vm.other_pagenum = 1
        vm.searchInput = ''
        vm.contract_status_n = '全部'
        vm.lists = []
@@ -165,10 +191,14 @@ export default {
        vm.unRepayLists = []
        vm.repayingLists = []
        vm.repayedLists = []
+        vm.undoLists = []
+        vm.otherLists = []
        vm.unSigned_flag = false
        vm.unRepay_flag = false
        vm.repaying_flag = false
        vm.repayed_flag = false
+        vm.other_flag = false
+        vm.undo_flag = false
        if (window.localStorage.multipleRole === 'TENANT') {
          vm.bp_type = 'TENANT'
        } else if (window.localStorage.bp_type === 'TENANT' && !window.localStorage.multipleRole) {
@@ -184,6 +214,8 @@ export default {
        vm.unRepay_pagenum = 1
        vm.repaying_pagenum = 1
        vm.repayed_pagenum = 1
+        vm.undo_pagenum = 1
+        vm.other_pagenum = 1
        vm.searchInput = ''
        vm.contract_status_n = '全部'
        vm.lists = []
@@ -191,10 +223,14 @@ export default {
        vm.unRepayLists = []
        vm.repayingLists = []
        vm.repayedLists = []
+        vm.undoLists = []
+        vm.otherLists = []
        vm.unSigned_flag = false
        vm.unRepay_flag = false
        vm.repaying_flag = false
        vm.repayed_flag = false
+        vm.other_flag = false
+        vm.undo_flag = false
        vm.bp_type = vm.$route.params.bp_type
        vm.recordQuery('全部', vm.lists)
      }
@@ -264,6 +300,12 @@ export default {
            } else if (status === '已结清') {
              vm.repayed_flag = true
              vm.$refs.scroll.update(true)
+            } else if (status === '撤销') {
+              vm.undo_flag = true
+              vm.$refs.scroll.update(true)
+            } else if (status === '其他') {
+              vm.other_flag = true
+              vm.$refs.scroll.update(true)
            }
          } else if (res.lists.length === 10) {
            if (status === '全部') {
@@ -280,6 +322,12 @@ export default {
            } else if (status === '已结清') {
              vm.repayed_flag = true
              vm.$refs.scroll.update(false)
+            } else if (status === '撤销') {
+              vm.undo_flag = true
+              vm.$refs.scroll.update(false)
+            } else if (status === '其他') {
+              vm.other_flag = true
+              vm.$refs.scroll.update(false)
            }
          }
        } else {
@@ -305,6 +353,12 @@ export default {
      } else if (vm.selected === 'four') {
        vm.repayed_pagenum++
        vm.pageNum = vm.repayed_pagenum
+      } else if (vm.selected === 'five') {
+        vm.undo_pagenum++
+        vm.pageNum = vm.undo_pagenum
+      } else if (vm.selected === 'six') {
+        vm.other_pagenum++
+        vm.pageNum = vm.other_pagenum
      }
      let name = ''
      if (vm.bp_type === 'TENANT') {
@@ -345,6 +399,10 @@ export default {
                vm.repayingLists.push(array[index])
              } else if (vm.selected === 'four') {
                vm.repayedLists.push(array[index])
+              } else if (vm.selected === 'five') {
+                vm.undoLists.push(array[index])
+              } else if (vm.selected === 'six') {
+                vm.otherLists.push(array[index])
              }
            })
            vm.$refs.scroll.update(true)
@@ -360,6 +418,10 @@ export default {
                vm.repayingLists.push(array[index])
              } else if (vm.selected === 'four') {
                vm.repayedLists.push(array[index])
+              } else if (vm.selected === 'five') {
+                vm.undoLists.push(array[index])
+              } else if (vm.selected === 'six') {
+                vm.otherLists.push(array[index])
              }
            })
            vm.$refs.scroll.update(true)
@@ -382,11 +444,17 @@ export default {
        this.searchRepaying()
      } else if (vm.selected === 'four') {
        this.searchRepayed()
+      } else if (vm.selected === 'five') {
+        this.searchUndo()
+      } else if (vm.selected === 'six') {
+        this.searchOther()
      }
      vm.unSigned_flag = false
      vm.unRepay_flag = false
      vm.repaying_flag = false
      vm.repayed_flag = false
+      vm.undo_flag = false
+      vm.other_flag = false
      // let resAll = await this.searchAll()
      // if (resAll) {
      //   let res = await this.searchUnsign() // 待首付结果
@@ -595,6 +663,74 @@ export default {
        }
      })
    },
+    searchUndo () {
+      let vm = this
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
+      let param = {
+        contract_status_n: '撤销',
+        user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        // bp_type: vm.bp_type,
+        pagenum: 1,
+        pagesize: 10,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        vm.undoLists = res.lists
+        if (vm.selected === 'five') {
+          vm.showLists = vm.undoLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+      })
+    },
+    searchOther () {
+      let vm = this
+      let name = ''
+      if (vm.bp_type === 'TENANT') {
+        name = 'con_contract_list_tenant'
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+        name = 'con_contract_list_saleman'
+      } else if (vm.bp_type === 'GUTA') {
+        name = 'con_contract_list_guta'
+      }
+      let url = $config.basePath + name
+      // let url = $config.basePath + 'con_contract_list'
+      let param = {
+        contract_status_n: '其他',
+        user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        // bp_type: vm.bp_type,
+        pagenum: 1,
+        pagesize: 10,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        vm.otherLists = res.lists
+        if (vm.selected === 'six') {
+          vm.showLists = vm.otherLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+      })
+    },
  },
 }
 </script>
@@ -699,9 +835,10 @@ export default {
          position: absolute;
          right: 20px;
          top: 13px;
-          width: 57px;
+          // width: 57px;
-          height: 21px;
+          padding: 2px 4px;
-          line-height: 19px;
+          // height: 21px;
+          // line-height: 19px;
          text-align: center;
          border-radius: 2px;
          font-family: PingFangSC-Regular;
@@ -709,7 +846,7 @@ export default {
        }
        p.orange {
-          width: 30%;
+          // width: 30%;
          border: 1px solid #FDB62F;
          color: #FDB62F;
          white-space: nowrap;
@@ -729,6 +866,14 @@ export default {
          color: #4B4A4B;
          border: 1px solid #4B4A4B;
        }
+         p.undo {
+          color: #333399;
+          border: 1px solid #333399;
+        }
+         p.other {
+          color: #33CCCC;
+          border: 1px solid #33CCCC;
+        }
      }
      .center {

--- 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>
@@ -102,27 +102,27 @@ export default {
        // 定位
        getLocation () {
          let vm = this
-          if (vum.Platform.isAndroid()) { // 安卓采用jsapi
+          // if (vum.Platform.isAndroid()) { // 安卓采用jsapi
-            var geolocation = new BMap.Geolocation()
+          //   var geolocation = new BMap.Geolocation()
-            vm.hlsPopup.showLoading('数据加载中')
+          //   vm.hlsPopup.showLoading('数据加载中')
-            geolocation.getCurrentPosition(function (res) {
+          //   geolocation.getCurrentPosition(function (res) {
-              vm.hlsPopup.hideLoading()
+          //     vm.hlsPopup.hideLoading()
-              if (this.getStatus() === 0) {
+          //     if (this.getStatus() === 0) {
-                // 判断是否是手动选择过定位
+          //       // 判断是否是手动选择过定位
-                if (window.localStorage.getItem('province')) {
+          //       if (window.localStorage.getItem('province')) {
-                  vm.city = window.localStorage.getItem('city')
+          //         vm.city = window.localStorage.getItem('city')
-                  vm.province = window.localStorage.getItem('province')
+          //         vm.province = window.localStorage.getItem('province')
-                  vm.guessingQuery(vm.city)
+          //         vm.guessingQuery(vm.city)
-                } else {
+          //       } else {
-                  // 没有就定位当前位置
+          //         // 没有就定位当前位置
-                  console.log(res)
+          //         console.log(res)
-                  vm.city = res.address.city
+          //         vm.city = res.address.city
-                  vm.province = res.address.province
+          //         vm.province = res.address.province
-                  vm.guessingQuery(res.address.city)
+          //         vm.guessingQuery(res.address.city)
-                }
+          //       }
-              }
+          //     }
-            }, {enableHighAccuracy: true})
+          //   }, {enableHighAccuracy: true})
-          } else { // ios使用插件定位
+          // } else { // ios使用插件定位
          console.log('&&&&&&&&&&&&___ios')
          baidumap_location.getCurrentPosition(function (result) {
            if (window.localStorage.getItem('province')) {
@@ -136,7 +136,7 @@ export default {
            }
          }, function (error) {
          })
-          }
+          // }
          // setTimeout(vm.guessingQuery(), 0)
        },
        goFunctionHome (data) {

--- a/src/pages/home/location.vue
+++ b/src/pages/home/location.vue
@@ -95,22 +95,22 @@ export default {
        // 重新定位到当前位置
        relocation () {
          let vm = this
-          if (vum.Platform.isAndroid()) { // 安卓采用jsapi
+          // if (vum.Platform.isAndroid()) { // 安卓采用jsapi
-            var geolocation = new BMap.Geolocation()
+          //   var geolocation = new BMap.Geolocation()
-            geolocation.getCurrentPosition(function (res) {
+          //   geolocation.getCurrentPosition(function (res) {
-              if (this.getStatus() === 0) {
+          //     if (this.getStatus() === 0) {
-                window.localStorage.setItem('province', res.address.province)
+          //       window.localStorage.setItem('province', res.address.province)
-                window.localStorage.setItem('city', res.address.city)
+          //       window.localStorage.setItem('city', res.address.city)
-                vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
+          //       vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
-                vm.province = '请选择省'
+          //       vm.province = '请选择省'
-                vm.city = '请选择市'
+          //       vm.city = '请选择市'
-                vm.flag = false
+          //       vm.flag = false
-                vm.province_flag = true
+          //       vm.province_flag = true
-              }
+          //     }
-            }, function (error) {
+          //   }, function (error) {
-              console.log(error)
+          //     console.log(error)
-            }, {enableHighAccuracy: true})
+          //   }, {enableHighAccuracy: true})
-          } else { // ios使用插件定位
+          // } else { // ios使用插件定位
          baidumap_location.getCurrentPosition(function (result) {
            console.log('*********** ' + JSON.stringify(result))
            window.localStorage.setItem('province', result.province)
@@ -123,7 +123,7 @@ export default {
          }, function (error) {
            console.log('errorerrorerrorerror  ' + error)
          })
-          }
+          // }
        },
        // 省份查询

--- 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/logintitle.png" >
+      <img class="title" src="../assets/login/right-title.png" >
      <div class="pwd">
        <div class="pwd-input">
          <input

--- 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/regester.png" >
+          <img class="register-title" src="../assets/login/right-register.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
@@ -587,22 +587,22 @@ export default {
      }
    },
    attachmentCheck () {
-      let vm = this
+      // let vm = this
-      let url = process.env.basePath + 'bp_attachment_check'
+      // let url = process.env.basePath + 'bp_attachment_check'
-      let param = {
+      // let param = {
-        bp_id: window.localStorage.getItem('bp_id'),
+      //   bp_id: window.localStorage.getItem('bp_id'),
-      }
+      // }
-      vm.hlsPopup.showLoading('正在校验数据')
+      // vm.hlsPopup.showLoading('正在校验数据')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      // vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+      //   vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
+      //   if (res.result === 'S') {
-          vm.$router.push({
+      this.$router.push({
        name: 'NPBankInfo',
      })
-        } else {
+      //   } else {
-          hlsPopup.showError(res.message)
+      //     hlsPopup.showError(res.message)
-        }
+      //   }
-      })
+      // })
    },
    async getHouseInfo () {
      let vm = this

--- 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 () {
@@ -372,8 +395,9 @@ export default {
        vm.authUrl = res.info.data.authUrl
        return vm.authUrl
      } else if ((res.info.code === 0) && (res.info.data.openId)) {
-        vm.authUrl = res.info.data.openId
+        // vm.authUrl = res.info.data.openId
-        return vm.authUrl
+        // return vm.authUrl
+        return false
      } else {
        // hlsPopup.showError(res.info.msg)
        // vm.errorMsg = res.info.msg

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -399,12 +399,12 @@
            <div v-if="!laImg" @click="LaUpload()">
              <img src="@/assets/userBind/camera.png">
            </div>
-            <div v-if="laImg && !isApproved" class="licenseBox" @click="LaUpload('')">
+            <div v-if="laImg" class="licenseBox" @click="LaUpload()">
              <img :src="laImg" style="width: 100%;height: 100%;margin: 0">
            </div>
-            <div v-if="isApproved" class="licenseBox"><!--v-if="licenseImg && isApproved"-->
+            <!-- <div v-if="isApproved" class="licenseBox">
              <img v-if="laImg" :src="laImg" style="width: 100%;height: 100%;margin: 0" @click="showBigPicture(laImg)">
-            </div>
+            </div> -->
          </div>
        </div>
        <!--
@@ -575,6 +575,12 @@ export default {
        this.flag = true
      }
    },
+    // 'flag' (newVal, oldVal) {
+    //   if (window.localStorage.getItem('bp_id') && !newVal) {
+    //     debugger
+    //     this.checkUpdate()
+    //   }
+    // },
    // 监听客户类型
    'baseInfo.bp_type_n' () {
      let vm = this
@@ -682,6 +688,8 @@ export default {
        vm.licenseEditFlag = false // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
        vm.LaEditFlag = false // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
        vm.isClear = false
+        vm.bp_type_flag = false
+        vm.hasMultiRole = false
        vm.idCardFrontUrlFlag = false // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
@@ -847,15 +855,14 @@ export default {
            vm.multiRoleList = res.lists
            vm.type = '请输入业务经办员工代码'
            vm.typeName = '业务经办人'
-            if (res.lists.length > 0) {
-              vm.bp_type_flag = true
-              console.log(11111111111111)
-            }
            if (res.lists.length === 0 || res.lists.length === 1) {
              vm.hasMultiRole = false
            } else if (res.lists.length === 2) {
              vm.hasMultiRole = true
            }
+            if (res.lists.length > 0) {
+              vm.bp_type_flag = true
+            }
          } else {
            vm.hasMultiRole = false
          }
@@ -871,9 +878,12 @@ export default {
      let res = await vm.hlsHttp.post(url, param)
      if (res.result === 'S') {
        vm.hasPeople = true
+        // vm.bp_type_flag = true
        return true
      } else {
        vm.hasMultiRole = false
+        vm.hasPeople = false
+        vm.bp_type_flag = false
        return false
      }
    },
@@ -914,16 +924,23 @@ export default {
        },
      })
    },
-    // changeUndertake () {
+    checkUpdate () {
-    //   this.$router.push({
+      let vm = this
-    //     name: 'MarginFirstPay',
+      let url = process.env.basePath + 'prj_cdd_check_update'
-    //     params: {
+      let param = {
-    //       bp_id: this.$route.params.bp_id,
+        document_id: window.localStorage.bp_id,
-    //       status: this.$route.params.status,
+        tab_group: 'HLS_ORG_AUTH',
-    //       isAGENT: this.isAGENT,
+      }
-    //     },
+      vm.hlsPopup.showLoading('请稍候')
-    //   })
+      vm.hlsHttp.post(url, param).then(function (res) {
-    // },
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.loadItemList(false, 'HLS_ORG_AUTH')
+        } else {
+          hlsPopup.showError(res.message)
+        }
+      })
+    },
    addRows (e) {
      if (e) {
        let addNum = Math.ceil(e.length / 16)
@@ -1271,21 +1288,146 @@ export default {
            window.localStorage.setItem('bp_type', vm.baseInfo.bp_type)
            window.localStorage.setItem('bp_id', res.bp_id)
            vm.bindCheck()
+            vm.saveAttatchment()
            // 查询资料清单
-            vm.loadItemList(flag)
+            // vm.loadItemList(flag)
          } else {
            vm.hlsPopup.showLongCenter(res.message)
          }
        })
      }
    },
+    saveAttatchment () {
+      let vm = this
+      if (vm.idCardFrontEditFlag) { // 法定代表人身份证正面图片已修改，重新上传
+        vm.idCardFrontUrlFlag = true
+        vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.idCardFrontCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.idCardFrontCheck_id,
+          'filePath': vm.idCardFront,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '法人身份证正面',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.idCardFrontEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.idCardBackEditFlag) { // 法定代表人身份证背面图片已修改，重新上传
+        vm.idCardBackUrlFlag = true
+        vm.delete_pic_to_ocr(vm.idCardBackAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.idCardBackCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.idCardBackCheck_id,
+          'filePath': vm.idCardBack,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '法人身份证背面',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.idCardBackEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.authidCardFrontEditFlag) { // 授权人身份证正面图片已修改，重新上传
+        vm.authidCardFrontUrlFlag = true
+        vm.delete_pic_to_ocr(vm.authidCardFrontAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.authidCardFrontCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.authidCardFrontCheck_id,
+          'filePath': vm.authidCardFront,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '授权人身份证正面',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.authidCardFrontEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.authidCardBackEditFlag) { // 授权人身份证背面图片已修改，重新上传
+        vm.authidCardBackUrlFlag = true
+        vm.delete_pic_to_ocr(vm.authidCardBackAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.authidCardBackCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.authidCardBackCheck_id,
+          'filePath': vm.authidCardBack,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '授权人身份证背面',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.authidCardBackEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.licenseEditFlag) { // 营业执照图片已修改，重新上传
+        vm.licenseImgUrlFlag = true
+        vm.delete_pic_to_ocr(vm.licenseAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.licenseCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.licenseCheck_id,
+          'filePath': vm.licenseImg,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '企业营业执照',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.licenseEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+      if (vm.LaEditFlag) { // 授权书图片已修改，重新上传
+        vm.laImgUrlFlag = true
+        vm.delete_pic_to_ocr(vm.laAttachmentId)// 先删除之前识别的图片
+        let list = []
+        let obj = {
+          'pkvalue': vm.laCheck_id,
+          'source_type': 'PRJ_CDD_ITEM_CHECK',
+          'picture': '',
+          'check_id': vm.laCheck_id,
+          'filePath': vm.laImg,
+          'attachment_id': '',
+          'user_id': 1,
+          'fileName': '授权证书',
+        }
+        list.push(obj)
+        vm.save_picture(list)
+        vm.LaEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
+      }
+    },
    // 授权切换
    authorizeChange () {
      this.flag = !this.flag
+      this.authMsg = {
+        auth_person_name: '',
+        auth_person_matter: '',
+        auth_person_id_card: '',
+        auth_cell_phone: '',
+        auth_person_position: '',
+        auth_id_card_date_from: '', // 授权人身份证有效期从
+        auth_id_card_date_to: '', // 授权人身份证有效期到
+      }
+      this.authidCardFront = ''
+      this.authidCardBack = ''
+      this.laImg = ''
      if (this.flag) {
        this.auth_flag = '未授权'
      } else {
        this.auth_flag = '已授权'
+        this.checkUpdate()
      }
    },
    // 选择省份
@@ -1525,10 +1667,12 @@ export default {
          vm.addAddressRows(res.info.living_address)
          if (vm.baseInfo.auth_flag === '是') {
            vm.flag = false
+            vm.loadItemList(true, 'HLS_ORG_AUTH')// 附件查询
          } else if (vm.baseInfo.auth_flag === '否') {
            vm.flag = true
+            vm.loadItemList(true, 'HLS_ORG_NAUTH')// 附件查询
          }
-          vm.loadItemList(true)// 附件查询
+          // vm.loadItemList(true)// 附件查询
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -1752,9 +1896,9 @@ export default {
      })
    },
    // 附件查询
-    loadItemList (flag) {
+    loadItemList (flag, type) {
      let vm = this
-      let bpId = vm.from ? vm.$route.params.bp_id : vm.bp_id
+      let bpId = vm.from ? window.localStorage.bp_id : vm.bp_id
      if (bpId === 'undefined') {
        bpId = null
      }
@@ -1763,7 +1907,7 @@ export default {
        master: {
          'document_id': bpId,
          'document_table': 'HLS_BP_MASTER',
-          'tab_group': vm.flag ? 'HLS_ORG_NAUTH' : 'HLS_ORG_AUTH',
+          'tab_group': type,
        },
      }
      // vm.hlsPopup.showLoading('请稍候')

--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -563,23 +563,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}},
    {

--- a/www.zip
+++ b/www.zip
--- a/www/index.html
+++ b/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.86fcba644d8041457ce897f4067d5333.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.df6dc5efef3e34ce596d.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.d089c3d6affb6993374aa520f9b599cf.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.adf9b230a1046c0fc990.js></script><script type=text/javascript src=./static/js/app.8001ee304fb16957d18d.js></script></body></html>
\ No newline at end of file