Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/base.vue

@@ -296,16 +296,16 @@
           </div>
         </div>
       </div>
-      <RentInfo v-show="tabNum==1" />
+      <RentInfo v-show="tabNum==1" :confirm_status="confirm_status"/>
       <AccessoryInfo v-show="tabNum==2" @down="getDown" />
     </h-content>
-    <bottom-tab v-if="confirm_status!=='APPROVED'" class="footer-button">
+    <bottom-tab v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" class="footer-button">
       <tab-button class="approve" @click.native="showModalValue=true">
         <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
     <h-modal
-      v-if="confirm_status!=='APPROVED'" ref="modal" v-model="showModalValue" position="bottom"
+      v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" ref="modal" v-model="showModalValue" position="bottom"
       cus-class="sign-modal">
       <h-view>
         <h-content class="approveContent">
@@ -317,7 +317,7 @@
             <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
           </div>
         </h-content>
-        <bottom-tab v-if="confirm_status!=='APPROVED'">
+        <bottom-tab>
           <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge('拒绝')">
             <img src="@/assets/intoApproval/reject.png" >拒绝
           </tab-button>
@@ -348,7 +348,6 @@ export default {
       ischecked: false,
       isConfirm: false,
       baseInfo: {},
-      confirm_status: '',
       checkedImg: checkedImg,
       isDown: false,
       bp_class: window.sessionStorage.bp_class,

src/pages/intoApproval/intoApproval/refund.vue

@@ -106,6 +106,7 @@ export default {
   },
   data () {
     return {
+      confirm_status: this.$route.params.confirm_status,
       info: {
         finance_amount: '',
         lease_charge: '',
@@ -123,10 +124,17 @@ export default {
   },
   methods: {
     goBase () {
+      let confirmStatus
+      if (this.confirm_status !== 'APPROVED') {
+        confirmStatus = true
+      } else {
+        confirmStatus = false
+      }
       this.$router.replace({
         name: 'Base',
         params: {
           isConfirm: true,
+          hasButtom: confirmStatus,
         },
       })
     },

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -117,6 +117,12 @@ export default {
       }
     },
   },
+  props: {
+    confirm_status: {
+      type: String,
+      default: '',
+    },
+  },
   data () {
     return {
       rentInfo: {
@@ -149,6 +155,9 @@ export default {
     changeRefund () {
       this.$router.push({
         name: 'Refund',
+        params: {
+          confirm_status: this.confirm_status,
+        },
       })
     },
     getRent () {

src/pages/intoApproval/intoList.vue

@@ -214,6 +214,7 @@ export default {
         name: 'Base',
         params: {
           confirm_status: item.confirm_status,
+          hasButtom: true,
         },
       })
     },

src/pages/personalCenter/personList.vue

+<template>
+  <div>
+    <div class="head">头像</div>
+    <button>用户绑定</button>
+  </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style scoped>
+.head{
+    width:100px;
+    height:100px;
+    border:1px solid #000;
+}
+button{
+    margin-top:80%;
+    width:150px;
+    height:50px;
+    border:1px solid #000;
+}
+</style>

src/pages/userBind/npReadOnly/naturePersonReadOnly.vue

@@ -201,6 +201,26 @@ export default {
 
   },
   methods: {
+    reSubmit () {
+      console.log(this.baseInfo.bp_id)
+      let url = $config.basePath + 'bp_bind_submit'
+      let param = {
+        master: {
+          bp_id: this.baseInfo.bp_id,
+          company_id: '2145',
+        },
+      }
+      let vm = this
+      this.hlsHttp.post(url, param).then(function (res) {
+        console.log('企业信息提交', res)
+        if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('提交成功')
+          vm.$router.push({
+            name: 'Home',
+          })
+        }
+      })
+    },
     basicInfoQuery () {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'

src/router/index.js

@@ -45,7 +45,8 @@ import ContractSigning from '../pages/contractSigning/contract-signing'
 import ContractDetail from '@/pages/ContractSigning/contract-detail'
 import ContractContent from '@/pages/ContractSigning/contract-content'
 import EntryInfo from '@/pages/ContractSigning/entry-info'
-
+// 个人中心
+import PersonList from '@/pages/personalCenter/personList'
 Vue.use(Router)
 
 export default new Router({
@@ -74,7 +75,7 @@ export default new Router({
       meta: {keepAlive: true},
       children: [
         {path: '/tab/home', component: Home, name: 'Home', meta: {keepAlive: true}},
-        {path: '/tab/my-info', component: MyInfo, name: 'MyInfo', meta: {keepAlive: true}},
+        {path: '/tab/my-info', component: PersonList, name: 'PersonList', meta: {keepAlive: true}},
       ],
     },
 
@@ -128,6 +129,7 @@ export default new Router({
     {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
     {path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
     {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
+    // 个人中心
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {