'解决冲突'

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-10 10:52:55
+ * @LastEditTime: 2019-10-21 18:48:53
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -90,7 +90,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">保证金比例</div>
-          <span slot="content">{{ info.deposit_ratio|NumFormat }}</span>
+          <span slot="content">{{ info.deposit_ratio_n }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">保证金</div>
@@ -122,7 +122,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">年利率</div>
-          <input slot="content" v-model="info.int_rate" readonly>
+          <input slot="content" v-model="info.int_rate_n" readonly>
         </item>
       </list-item>
       <div class="repay-plan">

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-21 15:17:55
+ * @LastEditTime: 2019-10-22 09:08:31
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -122,7 +122,7 @@ export default {
    showTime (format) {
      let vm = this
      hlsPopup.showTime({
-       nowDate: new Date().toLocaleDateString(),
+       nowDate: new Date().toLocaleDateString().replace(/\//g, '-'), // return date.replace(/\//g, '-')
        format: format,
        callback: (date) => {
          // alert(date)