Merge branch 'ren' into develop

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-10-18 10:57:30
+ * @LastEditTime: 2019-10-18 16:40:49
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -38,7 +38,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">首付款</div>
-          <input slot="content" placeholder="首付款金额自动填充" >
+          <input slot="content" placeholder="首付款金额自动填充" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">保证金比例</div>
@@ -46,7 +46,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">保证金</div>
-          <input slot="content" placeholder="保证金金额自动填充" >
+          <input slot="content" placeholder="保证金金额自动填充" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">手续费比例</div>
@@ -54,7 +54,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">手续费</div>
-          <input slot="content" placeholder="手续费金额自动填充" >
+          <input slot="content" placeholder="手续费金额自动填充" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-18 10:06:48
+ * @LastEditTime: 2019-10-18 15:35:42
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -125,6 +125,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     if (from.name === 'ProductList') {
       next(vm => {
+        vm.product_id = vm.$route.params.product_id
         vm.baseMsg()
         vm.detailMsg()
         vm.confgMsg()
@@ -145,10 +146,25 @@ export default {
    collect () {
      this.collect_flag = true
      console.log(this.collect_flag)
+     let vm = this
+     let url = $config.basePath + 'save_collection'
+     let param = {
+       master: {
+         product_id: vm.product_id,
+         user_phone: window.localStorage.user_phone,
+       },
+     }
+     vm.$post(url, param).then(function (res) {
+       console.log('收藏', res)
+       if (res.result === 'S') {
+         vm.src = require('@/assets/productQuery/coll-success.png')
          setTimeout(() => {
-       this.collect_flag = false
-       this.src = require('@/assets/productQuery/coll-success.png')
+           vm.collect_flag = false
          }, 1500)
+       } else {
+         hlsPopup.showLongCenter(res.message)
+       }
+     })
    },
    // 基本信息查询
    baseMsg () {