'解决冲突'

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-07 13:50:40
+ * @LastEditTime: 2019-11-08 09:23:51
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -43,11 +43,11 @@
         </item>
         <item>
           <div slot="name">商务政策</div>
-          <div slot="content">零手续费产品</div>
+          <div slot="content">{{detailInfo.product_plan_id_n}}</div>
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <div slot="content">{{ detailInfo.lease_num }}</div>
+          <div slot="content">{{ detailInfo.product_num }}</div>
         </item>
 
       </list-item>

src/pages/contractInquire/repay-plans.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-07 14:06:10
+ * @LastEditTime: 2019-11-07 19:38:49
  * @LastEditors: Please set LastEditors
  * @Description: 还款
  * @FilePath:
  -->
 <template>
-  <h-view id="repay-plan" class="public-style">
+  <h-view id="repay-plans" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
@@ -47,7 +47,7 @@
           <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
         </div>
         <div class="name">
-          <p>现金流项目</p>
+          <p>款项</p>
           <p>应还金额</p>
         </div>
         <div class="number">
@@ -146,8 +146,8 @@ export default {
   },
 }
 </script>
-<style lang='less' >
-#repay-plan {
+<style lang='less'>
+#repay-plans {
  
   .total {
     position: relative;

src/pages/distributorSign/financ-details.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-27 18:07:12
- * @LastEditTime: 2019-11-07 09:12:30
+ * @LastEditTime: 2019-11-08 09:10:43
  * @LastEditors: Please set LastEditors
  -->
 <template>

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-11-07 17:37:32
+ * @LastEditTime: 2019-11-08 10:22:17
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -78,7 +78,8 @@
         </item>
         <item @click.native="periodPull" :show-arrow="true">
           <div slot="name" class="font-color">还款周期</div>
-          <input slot="content" v-model="info.annual_pay_times_n" placeholder="月">
+          <span slot="content">{{info.annual_pay_times_n}}</span>
+          <!-- <input slot="content" v-model="info.annual_pay_times_n" placeholder="月"> -->
         </item>
         <item>
           <div slot="name" class="font-color">租赁期数</div>
@@ -259,7 +260,7 @@ export default {
            'equip_price': vm.equip_price,
            'down_payment': vm.equip_price * (vm.info.down_payment_ratio_n.replace('%', '') / 100),
            'deposit': vm.equip_price * (vm.info.deposit_ratio_n.replace('%', '') / 100),
-           'lease_charge': vm.equip_price * (vm.info.lease_charge_ratio_n.replace('%', '') / 100),
+           'lease_charge': (vm.equip_price - vm.equip_price*vm.info.down_payment_ratio_n.replace("%","")/100)*(vm.info.lease_charge_ratio_n.replace("%","")/100),
            'due_date': (vm.price_date_to).substr(0, 10),
            "lease_times": vm.info.lease_times,
             "insurance_fee": vm.insurance_fee,

src/pages/financingTrial/trial-repay-plan.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime: 2019-11-07 17:11:16
+ * @LastEditTime: 2019-11-08 09:36:20
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
- * @FilePath: \hls-xcmg-vue-app\src\pages\financingTrial\trial-repay-plan.vue
  -->
 <template>
-  <h-view id="repay-plan" class="public-style">
+  <h-view id="repay-plan-trial" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
@@ -19,7 +18,7 @@
       <div class="total">
         <div class="sum">
           <div>融资额</div>
-          <p>190,000.00</p>
+          <p>{{info.finance_amount | currency}}</p>
           <img src="@/assets/contractInquire/num.png" alt="">
           <h3><span>{{ info.lease_times }}期</span></h3>
         </div>
@@ -47,7 +46,7 @@
             <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
         </div>
         <div class="name">
-          <p>现金流项目</p>
+          <p>款项</p>
           <p>应还金额</p>
         </div>
         <div class="number">
@@ -148,8 +147,8 @@ export default {
 
 }
 </script>
-<style lang='less' >
-#repay-plan {
+<style lang='less'>
+#repay-plan-trial {
   .h-header {
     background-color: #1D3FFF;
     .h-header-btn {

src/pages/myInfo/my-info.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-11-07 17:48:53
+ * @LastEditTime: 2019-11-08 14:20:16
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
+<!-- -->
 <template>
   <h-view id="my-info">
     <h-header class="bar-custom">
@@ -186,6 +194,9 @@ export default {
         } else {
           this.$router.push({
             name: 'ContractSigning',
+            params: {
+            user_bp_type: this.user_bp_type,
+          },
           })
         }
       } else {

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
  * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-07 16:30:08
+ * @LastEditTime: 2019-11-08 14:06:15
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -157,7 +157,7 @@ export default {
   methods:
 
       {
-        startScroll (v) {
+        startScroll () {
           this.slide = true
         },
         // tab切换