解决冲突

src/pages/myInfo/my-info.vue

@@ -637,7 +637,7 @@ export default {
           vm.flag = true
           if (vm.user_bp_class === 'NP') {
             vm.$router.push({
-              name: 'NaturePerson',
+              name: 'NPBaseInfo',
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,
@@ -656,7 +656,7 @@ export default {
           vm.flag = false
           if (vm.user_bp_class === 'NP') {
             vm.$router.push({
-              name: 'NaturePerson',
+              name: 'NPBaseInfo',
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,
@@ -704,6 +704,7 @@ export default {
           vm.bp_id = res.info.user_bp_id
           vm.bp_identity = res.info.bp_identity
           window.localStorage.setItem('bp_id', res.info.user_bp_id)
+          window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
           window.localStorage.setItem('bp_name', res.info.user_bp_name)
           vm.user_bp_name = res.info.user_bp_name
           vm.user_bp_type = res.info.user_bp_type

src/pages/pay/pay-page.vue

@@ -63,6 +63,8 @@
       </div>
       <button v-if="showpay" @click="pay">立即支付</button>
       <button v-if="showSelect" @click="searchResult">查询支付结果</button>
+      <button v-if="isGo" @click="goMyInfo">返回个人中心</button>
+
     </h-content>
   </h-view>
 </template>
@@ -83,6 +85,7 @@ export default {
       showpay: true,
       isSuccess: false,
       isFaild: false,
+      isGo: false,
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -92,6 +95,7 @@ export default {
       vm.showpay = true
       vm.isSuccess = false
       vm.isFaild = false
+      vm.isGo = false
       vm.name = from.name
       vm.url = vm.$route.params.url
     })
@@ -105,12 +109,17 @@ export default {
     pay () {
       let vm = this
       cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
-      //window.open(this.url)
+      // window.open(this.url)
       setTimeout(() => {
         vm.showSelect = true
         vm.showpay = false
       }, 3000)
     },
+    goMyInfo () {
+      this.$router.push({
+        name: 'MyInfo',
+      })
+    },
     getDetail () {
       let vm = this
       let url = process.env.basePath + 'order_info_query'
@@ -122,6 +131,8 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.info, res.info)
+          vm.isGo = true
+          vm.showSelect = false
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/pay/payment/contract-record.vue

@@ -37,8 +37,8 @@
                   <span class="bp-name">{{ item.bp_name }}</span>
                 </div>
                 <div>
-                  <span>车牌号</span>
-                  <span>{{ detail.lease_item_car_num }}</span>
+                  <span>车辆型号</span>
+                  <span>{{ detail.vehicle_model }}</span>
                 </div>
               </div>
               <div class="list">
@@ -54,7 +54,7 @@
               <div class="list">
                 <div>
                   <span>发动机号</span>
-                  <span>{{ detail.lease_item_engine_num }}</span>
+                  <span>{{ detail.engine }}</span>
                 </div>
 
                 <div>
@@ -64,8 +64,8 @@
               </div>
               <div class="list">
                 <div>
-                  <span>厂商型号</span>
-                  <span>{{ detail.lease_item_factory_num }}</span>
+                  <span>合格证编号</span>
+                  <span>{{ detail.certificate_number }}</span>
                 </div>
 
                 <div>

src/pages/userBind/np/naturePerson.vue

@@ -311,7 +311,8 @@
         <div
           v-if="(cddItemList.length && baseInfo.bp_type === 'TENANT') || (cddItemList.length && baseInfo.bp_type === 'GUTA')"
           class="userInfo"
-        >附件信息</div>
+        >附件信息
+        </div>
         <div
           v-for="(list, index) in cddItemList"
           v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"

src/pages/userBind/userBind.vue

@@ -53,7 +53,7 @@ export default {
       let name
       let bpClass
       if (this.flag === 0) {
-        name = 'NaturePerson'
+        name = 'NPBaseInfo'
         bpClass = 'NP'
       } else if (this.flag === 1) {
         name = 'EnterpriseNew'

src/pages/userBindNew/np/baseInfo.vue

-q12312

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

+<template>
+  <h-view id="np-invoice">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" >
+        <span>开票信息</span>
+      </div>
+    </h-header>
+    <h-content>
+      <list-item :item-height="44">
+        <item :showArrow="true">
+          <div slot="name">纳税人类型</div>
+          <input
+            slot="content"
+            v-model="invoiceInfo.taxpayer_type_n"
+            type="text"
+            readonly
+            placeholder="请选择"
+            onfocus="this.blur()"
+            @click="selectTaxpayer"
+          >
+        </item>
+        <item :showArrow="true">
+          <div slot="name">发票类型</div>
+          <input
+            slot="content"
+            v-model="invoiceInfo.invoice_kind_n"
+            type="text"
+            readonly
+            placeholder="请选择"
+            onfocus="this.blur()"
+            @click="selectInvoiceType"
+          >
+        </item>
+        <item>
+          <div slot="name">发票抬头</div>
+          <input slot="content" v-model="invoiceInfo.invoice_title" type="text" placeholder="请输入发票抬头" >
+        </item>
+        <item>
+          <div slot="name">发票地址</div>
+          <textarea
+            slot="content"
+            ref="myTestarea"
+            v-model="invoiceInfo.invoice_adds"
+            cols="22" rows="1" type="text" placeholder="请输入发票地址"
+            @input="addRows(invoiceInfo.invoice_adds)" />
+        </item>
+        <item>
+          <div slot="name">开户电话</div>
+          <input slot="content" v-model="invoiceInfo.invoice_tel" type="text" placeholder="请输入开户电话" >
+        </item>
+        <item>
+          <div slot="name">发票开户行</div>
+          <textarea
+            slot="content"
+            ref="myTestareaLive"
+            v-model="invoiceInfo.open_bank"
+            cols="22"
+            rows="1"
+            type="text"
+            placeholder="请输入发票开户行及账号"
+            @input="addRowsLive(invoiceInfo.open_bank)"
+          />
+        </item>
+        <item>
+          <div slot="name">开户行账号</div>
+          <input
+            slot="content" v-model="invoiceInfo.open_account" type="number" pattern="\d*"
+            placeholder="请输入开户行账号" >
+        </item>
+      </list-item>
+    </h-content>
+    <bottom-tab class="footer-button">
+      <tab-button class="save" @click.native="save">下一步</tab-button>
+    </bottom-tab>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      value: '',
+      invoicList: [],
+      taxpayerList: [],
+      invoiceInfo: {
+        bp_id: null,
+        bp_class: null,
+        taxpayer_type_n: '',
+        invoice_kind_n: '',
+        taxpayer_type: '',
+        invoice_kind: '',
+        invoice_title: '',
+        invoice_adds: '',
+        invoice_tel: '',
+        open_bank: '',
+        open_account: '',
+      },
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'NPBaseInfo' && window.localStorage.from) {
+        vm.getInvoice()
+      }
+    })
+  },
+  created () {
+    this.getInvoiceType()
+    this.getTaxpayer()
+    this.addRows(this.invoiceInfo.invoice_adds)
+    this.addRowsLive(this.invoiceInfo.open_bank)
+  },
+  methods: {
+    getInvoice () {
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_query'
+      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') {
+          Object.assign(vm.invoiceInfo, res.info)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    save () {
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_save'
+      let name = window.localStorage.bp_type === 'TENANT' || window.localStorage.bp_type === 'GUTA' ? 'AccessoryInfo' : 'NPBankInfo'
+      vm.invoiceInfo.bp_id = window.localStorage.getItem('bp_id')
+      vm.invoiceInfo.bp_class = 'NP'
+      let param = {
+        master: vm.invoiceInfo,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: name,
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    addRows (e) {
+      let addNum = parseInt(e.length / 16)
+      if (addNum === 0) {
+        this.$refs.myTestarea.rows = 1
+      } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        this.$refs.myTestarea.rows = addNum + 1
+      }
+    },
+    addRowsLive (e) {
+      let addNum = parseInt(e.length / 16)
+      if (addNum === 0) {
+        this.$refs.myTestareaLive.rows = 1
+      } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        this.$refs.myTestareaLive.rows = addNum + 1
+      }
+    },
+    getInvoiceType () {
+      let vm = this
+      let url = process.env.basePath + 'bp_invoice_kind_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.invoicList = res.lists.map(item => {
+            return {
+              code: item.invoice_kind,
+              code_name: item.invoice_kind_n,
+            }
+          })
+        }
+      })
+    },
+    getTaxpayer () {
+      let vm = this
+      let url = process.env.basePath + 'bp_taxpayer_type_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.taxpayerList = res.lists.map(item => {
+            return {
+              code: item.taxpayer_type,
+              code_name: item.taxpayer_type_n,
+            }
+          })
+        }
+      })
+    },
+    selectInvoiceType (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.invoicList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.invoiceInfo.invoice_kind = obj.bp_type
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n
+        },
+      })
+    },
+    selectTaxpayer (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.taxpayerList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.invoiceInfo.taxpayer_type = obj.bp_type
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n
+        },
+      })
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+input::placeholder{
+    color: #B4B4B5;
+}
+ textarea::placeholder {
+    color: #b4b4b5;
+  }
+  textarea {
+    text-align: right;
+    color:#666;
+  }
+  .save {
+    color: #fff;
+    border-radius: 4px;
+    background-color: @headerColor;
+  }
+</style>

src/router/index.js

@@ -113,6 +113,11 @@ import DrawbackDetail from '@/pages/drawback/drawback-detail'
 
 // 视屏面签
 import VideoSign from '@/pages/videoSign/video-list'
+// 新版用户绑定
+import NPBaseInfo from '@/pages/userBindNew/np/base-info'
+import NPInvoiceInfo from '@/pages/userBindNew/np/invoice-info'
+import NPBankInfo from '@/pages/userBindNew/np/bank-info'
+import AccessoryInfo from '@/pages/userBindNew/np/accessory-info'
 
 Vue.use(Router)
 
@@ -274,6 +279,12 @@ export default new Router({
     {path: '/video-sign', component: VideoSign, name: 'VideoSign', meta: {keepAlive: true}},
     // 消息中心
     {path: '/reject-detail', component: RejectDetail, name: 'RejectDetail', meta: {keepAlive: true}},
+    // 新版用户绑定-自然人
+    {path: '/np-base-info', component: NPBaseInfo, name: 'NPBaseInfo', meta: {keepAlive: true}},
+    {path: '/np-invoice-info', component: NPInvoiceInfo, name: 'NPInvoiceInfo', meta: {keepAlive: true}},
+    {path: '/np-bank-info', component: NPBankInfo, name: 'NPBankInfo', meta: {keepAlive: true}},
+    {path: '/accessory-info', component: AccessoryInfo, name: 'AccessoryInfo', meta: {keepAlive: true}},
+
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {