Merge branch 'ren' into develop

src/pages/contractSigning/contract-content.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-04 15:21:56
+ * @LastEditTime: 2019-12-04 19:39:24
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -18,12 +18,13 @@
       <div class="dealer">
         <img v-show="name ==='农行代扣授权书'" src="@/assets/constractSigning/twill.png" alt="">
 
-        <img v-show="name === '租赁主合同'" src="@/assets/constractSigning/contract-icon.png" alt="">
+        <img v-show="name === '融资租赁合同'" src="@/assets/constractSigning/contract-icon.png" alt="">
         <h1>{{ name }}</h1>
-        <Distributors v-if="name === '经销商担保协议'"/>
+        <Distributors v-if="name === '经销商担保协议' || '农行代扣授权书'"/>
         <Lessee v-if="name === '承租人确认意见'"/>
         <Transfer v-if="name === '租赁物所有权转移及接收确认书'"/>
-        <LeasingContract v-if="name === '融资租赁合同'"/>
+        <LeasingContract v-if="name === '融资租赁合同'&&business_type === 'LEASE'"/>
+        <LeasingContractBack v-if="name === '融资租赁合同'&&business_type === 'LEASEBACK'"/>
       </div>
     </h-content>
   </h-view>
@@ -38,6 +39,7 @@ import Lessee from '@/pages/contractSigning/lessee'
 import Distributors from '@/pages/contractSigning/distributor-text'
 import Transfer from '@/pages/contractSigning/transfer-book'
 import LeasingContract from '@/pages/contractSigning/leasing-contract'
+import LeasingContractBack from '@/pages/contractSigning/leasing-contract-back'
 
 export default {
   name: 'ContractDetail',
@@ -46,6 +48,7 @@ export default {
     Transfer,
     Distributors,
     LeasingContract,
+    LeasingContractBack,
   },
   data () {
     return {
@@ -56,12 +59,14 @@ export default {
       uncheck2: unCheck2,
       res: '',
       name: '',
+      business_type: '',
     }
   },
   computed: {},
   watch: {},
   activated () {
     this.name = this.$route.params.name
+    this.business_type = this.$route.params.business_type
   },
   methods:
  {

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-04 13:38:57
+ * @LastEditTime: 2019-12-04 19:42:20
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -125,14 +125,14 @@
           </div>
           <div slot="content" class="in-detail" @click="goContractContent('融资租赁合同')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
         </item>
-        <item :proportion="[4,1]">
+        <!-- <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt="" class="pics">
             <p class="second">经销商担保协议</p>
             <img :src="agentPic" alt="" class="read">
           </div>
           <div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
-        </item>
+        </item> -->
         <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt="" class="pics">
@@ -666,6 +666,7 @@ export default {
         name: 'ContractContent',
         params: {
           name,
+          business_type: this.baseInfo.business_type,
         },
       })
       if (name === '经销商担保协议') {

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-02 16:10:47
+ * @LastEditTime: 2019-12-04 20:17:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -45,6 +45,12 @@
               slot="content" v-model="bank_lists[0].bank_full_name" type="text"
               placeholder="请输入银行名称" readonly>
           </item>
+          <item>
+            <div slot="name" >预留手机号</div>
+            <input
+              slot="content" type="number"
+              placeholder="请输入预留手机号">
+          </item>
           <item>
             <div slot="name" >支行名称</div>
             <input

src/pages/myProductCollection/my-product-list.Vue

@@ -25,7 +25,7 @@
 <div class="division-box">
 
       <list-item v-for="(item,index) in productList" :key="index">
-        <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
+        <item :proportion="[1,4]" @click.native="goDetailed(item)">
           <div slot="name" class="item-pic">
               <img :src="item.url" alt="">
             </div>
@@ -191,13 +191,14 @@ export default {
      })
    },
     // val：产品id, status: 收藏状态
-    goDetailed (val, status, bp_id) { // 进入产品查询功能明细页面
-      window.localStorage.setItem('collect_status', status)
+    goDetailed (item) { // 进入产品查询功能明细页面
+      window.localStorage.setItem('collect_status', item.collect_status)
+      window.localStorage.setItem('division', item.division)
       this.$router.push({
         name: 'ProDetailed',
         params: {
-          product_id: val,
-          bp_id: bp_id,
+          product_id: item.product_id,
+          bp_id: item.bp_id,
           //  collect_status: status,
         },
       })