Merge branch 'liuxin' into develop

src/components/currencyInput.vue

@@ -52,16 +52,15 @@ export default {
     onFocus (event) {
       if (this.disable) return
       this.focused = true
-      //  let value = obj.value
-      // if (document.selection) {
-      //   var sel = obj.createTextRange()
-      //   sel.moveStart('character', value.length)
-      //   sel.collapse()
-      //   sel.select()
-      // } else if (typeof obj.selectionStart === 'number' && typeof obj.selectionEnd === 'number') {
-      //   obj.selectionStart = obj.selectionEnd = value.length
-      // }
-      console.log(event)
+      let value = event.target.value
+      if (document.selection) {
+        var sel = value.createTextRange()
+        sel.moveStart('character', value.length)
+        sel.collapse()
+        sel.select()
+      } else if (typeof value.selectionStart === 'number' && typeof value.selectionEnd === 'number') {
+        value.selectionStart = value.selectionEnd = value.length
+      }
       setTimeout(function () {
         event.target.type = 'number'
         event.target.focus()

src/pages/contractCreate/add-person.vue

-<template>
-  <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>
-    <h-content>
-      <div class="search has-header">
-        <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
-      </div>
-      <list-item :item-height="68" class="item">
-        <item>
-          <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
-          <div slot="name">担保人名称<br>证件号</div>
-          <div slot="content">
-            <input placeholder="暂无信息" readonly >
-            <input placeholder="暂无信息" readonly >
-          </div>
-        </item>
-      </list-item>
-    </h-content>
-  </h-view>
-</template>
-<script>
-export default {
-  data () {
-    return {
-      keyWord: '',
-    }
-  },
-}
-</script>
-<style lang="less" scoped>
-#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 {
-      .search {
-        input {
-          background: url("../../assets/contractStart/search1.png") 320px
-            no-repeat;
-          background-size: 16px 16px;
-          background-color: rgba(239, 239, 239, 0.55);
-          padding: 8px 12px;
-          border-radius: 4px;
-          width: 100%;
-          font-family: PingFangSC-Regular;
-          font-size: 14px;
-          color: #888c8f;
-        }
-      }
-    }
-  }
-}
-</style>

src/pages/contractCreate/contract-create-list.vue

@@ -122,20 +122,8 @@ export default {
       })
     },
     changePage () {
-      let vm = this
-      let url = process.env.basePath + 'get_project_id'
-      let param = {}
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          window.localStorage.setItem('project_id', res.info.project_id)
-          vm.$router.push({
-            name: 'CreateBaseInfo',
-          })
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
+      this.$router.push({
+        name: 'SalesInfo',
       })
     },
     loadMore () {},

src/pages/contractCreate/sales-info.vue

@@ -154,6 +154,7 @@ export default {
       bp_agent_id: '', // 经销商id
       bp_agent_name: '', // 经销商名称
       salesInfo: {
+        bp_type: window.localStorage.bp_type,
         bp_id_tenant: '', // 承租人id
         business_type: '', // 业务类型
         bp_id_agent: '', // 经销商id
@@ -186,7 +187,7 @@ export default {
         vm.inflow_line = '' // 授信总额度
         vm.inflow_used = '' // 已使用授信额度
         vm.inflow_reset = '' // 剩余授信额度
-        vm.user_bp_type = vm.$route.params.user_bp_type
+        vm.user_bp_type = window.localStorage.bp_type
         vm.sales = window.localStorage.bp_name
         vm.salesInfo = {
           bp_id_tenant: '', // 承租人id
@@ -197,6 +198,7 @@ export default {
           factory: '', // 主机厂id
           manu_manager: '', // 办事处业务员
           dates: '请选择',
+          bp_type: window.localStorage.bp_type,
         }
         vm.businessQuery()
         vm.agentQuery()
@@ -432,9 +434,12 @@ export default {
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        console.log('销售信息保存', res)
         if (res.result === 'S') {
           hlsPopup.showLongCenter('创建成功！')
+          window.localStorage.setItem('project_id', res.project_id)
+          vm.$router.push({
+            name: 'CreateBaseInfo',
+          })
         }
       })
     },

src/pages/myInfo/my-info.vue

@@ -734,6 +734,7 @@ export default {
           window.localStorage.setItem('bp_name', res.info.user_bp_name)
           window.localStorage.setItem('bp_identity', res.info.bp_identity)
           window.localStorage.setItem('bp_class', res.info.user_bp_class)
+          window.localStorage.setItem('bp_type', res.info.user_bp_type)
           vm.user_bp_name = res.info.user_bp_name
           vm.user_bp_type = res.info.user_bp_type
           vm.user_phone = res.info.user_phone

src/router/index.js

@@ -123,7 +123,6 @@ import ContractCreateList from '@/pages/contractCreate/contract-create-list'
 import SalesInfo from '@/pages/contractCreate/sales-info'
 import PickLessee from '@/pages/contractCreate/pick-lessee'
 import CreateBaseInfo from '@/pages/contractCreate/create-base-info'
-import AddPerson from '@/pages/contractCreate/add-person'
 import CreateRentInfo from '@/pages/contractCreate/creat-rent-info'
 import CreateEnclosureInfo from '@/pages/contractCreate/create-enclosure-info'
 
@@ -295,7 +294,6 @@ export default new Router({
     {path: '/sales-info', component: SalesInfo, name: 'SalesInfo', meta: {keepAlive: true}},
     {path: '/pick-lessee', component: PickLessee, name: 'PickLessee', meta: {keepAlive: true}},
     {path: '/create-base-info', component: CreateBaseInfo, name: 'CreateBaseInfo', meta: {keepAlive: true}},
-    {path: '/add-person', component: AddPerson, name: 'AddPerson', meta: {keepAlive: true}},
     {path: '/create-rent-info', component: CreateRentInfo, name: 'CreateRentInfo', meta: {keepAlive: true}},
     {path: '/create-enclosure-info', component: CreateEnclosureInfo, name: 'CreateEnclosureInfo', meta: {keepAlive: true}},