Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-21 11:16:28
+ * @LastEditTime: 2019-10-21 14:00:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -226,7 +226,7 @@ export default {
   },
 }
 </script>
-<style lang='less' >
+<style lang='less' type="text/less">
 #contract-details {
   .all{
     position: absolute;

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 16:40:49
+ * @LastEditTime: 2019-10-21 15:17:55
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -58,7 +58,9 @@
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
-          <input slot="content" placeholder="YYYY-MM-DD" >
+          <!-- <input slot="content" placeholder="YYYY-MM-DD" readonly> -->
+          <div slot="content">{{ dates }}</div>
+          <img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
         </item>
         <item :showArrow="true">
           <div slot="name" class="font-color">还款周期</div>
@@ -90,6 +92,7 @@ export default {
   name: 'FinancingDetails',
   data () {
     return {
+      dates: '',
       plan_price: '',
       price_date_to: '',
     }
@@ -116,11 +119,28 @@ export default {
        name: 'FinancDetails',
      })
    },
+   showTime (format) {
+     let vm = this
+     hlsPopup.showTime({
+       nowDate: new Date().toLocaleDateString(),
+       format: format,
+       callback: (date) => {
+         // alert(date)
+         vm.dates = date
+       },
+     })
+   },
  },
 }
 </script>
 <style lang='less' scoped>
 #details1 {
+  .date-pic {
+    height: 17px;
+    width: 17px;
+    margin-top: 13px;
+    margin-left: 4px;
+  }
     .h-header-btn {
       img {
         width: 16px;