Merge branch 'ren' into develop

src/pages/distributorSign/financing-details.vue → 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-09-30 13:08:02
+ * @LastEditTime: 2019-10-18 10:57:30
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -30,7 +30,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">设备总价</div>
-          <input slot="content" placeholder="请输入设备总价" >
+          <input slot="content" v-model="plan_price" placeholder="请输入设备总价">
         </item>
         <item>
           <div slot="name" class="font-color">首付款比例</div>
@@ -90,11 +90,25 @@ export default {
   name: 'FinancingDetails',
   data () {
     return {
-
+      plan_price: '',
+      price_date_to: '',
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'FinancingTrial') {
+      next(vm => {
+        vm.price_date_to = vm.$route.params.price_date_to // 有效日期
+        vm.plan_price = vm.$route.params.plan_price // 参考价
+        // console.log(vm.plan_price, vm.price_date_to)
+      })
+    }
+    next()
+  },
+  created () {
+
+  },
   methods:
  {
    goRepay () {
@@ -147,9 +161,9 @@ export default {
       margin-top: 7px;
       margin-left: 20px;
       line-height: 15px;
-font-size: 13px;
-color: rgba(101,100,100,0.80);
-letter-spacing: 0.4px;
+      font-size: 13px;
+      color: rgba(101,100,100,0.80);
+      letter-spacing: 0.4px;
     }
     .alert img {
       width: 18px;
@@ -163,7 +177,7 @@ letter-spacing: 0.4px;
 }
 .footer-button {
     .approve {
-      width: 358.6px;
+      width: 96%;
       height: 44px;
       background: #00469c;
       border-radius: 4px;
@@ -172,6 +186,7 @@ letter-spacing: 0.4px;
       font-size: 15px;
       line-height: 20px;
       letter-spacing: 10px;
+      margin: 0 auto;
     }
   }
 }

src/pages/distributorSign/financing-trial.vue → src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-09-30 10:04:07
+ * @LastEditTime: 2019-10-18 10:11:01
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -15,7 +15,7 @@
     </h-header>
     <h-content>
       <div class="descript">
-        <img src="" alt="">
+        <img src="@/assets/trial/product.png" alt="">
         <p class="produc">零手续费产品</p>
       </div>
 
@@ -54,16 +54,34 @@ export default {
   name: 'FinancingTrial',
   data () {
     return {
-
+      plan_price: '',
+      price_date_to: '',
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'ProDetailed') {
+      next(vm => {
+        vm.price_date_to = vm.$route.params.price_date_to // 有效日期
+        vm.plan_price = vm.$route.params.plan_price // 参考价
+        // console.log(vm.plan_price, vm.price_date_to)
+      })
+    }
+    next()
+  },
+  created () {
+
+  },
   methods:
  {
    goDetails () {
      this.$router.push({
        name: 'FinancingDetails',
+       params: {
+         plan_price: this.plan_price,
+         price_date_to: this.price_date_to,
+       },
      })
    },
  },
@@ -91,9 +109,16 @@ export default {
     display: flex;
     flex-direction: row;
     background: rgba(0, 70, 156, 0.1);
+    img {
+      width: 16px;
+      height: 16px;
+      margin-left: 16px;
+      margin-top: 9px;
+      margin-right: 8px;
+    }
     .produc {
         font-family: PingFangSC-Semibold;
-        font-size: 15px;
+        font-size: 14px;
         height: 34px;
         line-height: 34px;
         color: #00469C;

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-17 19:12:22
+ * @LastEditTime: 2019-10-18 10:06:48
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -92,7 +92,7 @@
       </list-item>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button :class="{bgcolor: bgc_flag}" class="butt"><img src="@/assets/productQuery/trial.png" alt=""> 试算</tab-button>
+      <tab-button :class="{bgcolor: bgc_flag}" class="butt" @click.native="goTrial(baseInfo.plan_price,baseInfo.price_date_to)"><img src="@/assets/productQuery/trial.png" alt=""> 试算</tab-button>
       <tab-button class="collect butt" @click.native="collect"><img :src="src" alt="">收藏</tab-button>
     </bottom-tab>
     <div v-if="collect_flag" class="show-collect">
@@ -122,10 +122,18 @@ export default {
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'ProductList') {
+      next(vm => {
+        vm.baseMsg()
+        vm.detailMsg()
+        vm.confgMsg()
+      })
+    }
+    next()
+  },
   created () {
-    this.baseMsg()
-    this.detailMsg()
-    this.confgMsg()
+
   },
   methods:
  {
@@ -190,6 +198,16 @@ export default {
        }
      })
    },
+   // 试算price:产品参考价，date:有效日期
+   goTrial (price, date) {
+     this.$router.push({
+       name: 'FinancingTrial',
+       params: {
+         plan_price: price,
+         price_date_to: date,
+       },
+     })
+   },
  },
 }
 </script>

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-10-17 11:02:08
+ * @LastEditTime: 2019-10-18 10:14:00
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -40,8 +40,9 @@ import Refund from '@/pages/intoApproval/intoApproval/refund'
 import ContractList from '@/pages/distributorSign/contract-list'
 import ContractDetails from '@/pages/distributorSign/contract-details'
 import FinancDetails from '@/pages/distributorSign/financ-details' // 还款计划
-import FinancingTrial from '@/pages/distributorSign/financing-trial'
-import FinancingDetails from '@/pages/distributorSign/financing-details' // 融资明细
+// 融资试算
+import FinancingTrial from '@/pages/financingTrial/financing-trial'
+import FinancingDetails from '@/pages/financingTrial/financing-details' // 融资明细
 // 合同签约
 import ContractSigning from '../pages/contractSigning/contract-signing'
 import ContractDetail from '@/pages/ContractSigning/contract-detail'
@@ -153,7 +154,8 @@ export default new Router({
     {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
     {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}},
     {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
-    {path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: false}},
+    // 试算
+    {path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}},
     {path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: false}},
     // 合同签约
     {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: true}},
@@ -173,7 +175,7 @@ export default new Router({
     {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
     // 产品查询
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
-    {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: false}},
+    {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},
     {path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {