'解决冲突'

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-21 18:03:21
+ * @LastEditTime: 2019-10-22 09:43:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -23,10 +23,10 @@
       </div>
     </h-header>
     <div class="tab-style">
-      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1">商务条件</div>
-      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2" >合同文本</div>
+      <div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;"><img :src="num === 0?check1:uncheck1">商务条件</div>
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check2:uncheck2" >合同文本</div>
     </div>
-    <h-content v-show="num === 1" class="business-condition">
+    <h-content v-if="num === 0" class="business-condition">
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" >商务政策</div>
@@ -110,7 +110,7 @@
       </div>
 
     </h-content>
-    <h-content v-show="num === 2">
+    <h-content v-if="num === 1">
       <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
         <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
@@ -149,7 +149,7 @@
         </item>
       </list-item>
     </h-content>
-    <bottom-tab v-show="num === 2">
+    <bottom-tab v-show="num === 1">
       <tab-button class="footer" @click.native="inSure">
         确认签约
       </tab-button>
@@ -158,19 +158,19 @@
 </template>
 
 <script>
-  import Check1 from '@/assets/constractSigning/business.png'
-  import Check2 from '@/assets/constractSigning/constract.png'
-  import unCheck1 from '@/assets/constractSigning/unbusiness.png'
-  import unCheck2 from '@/assets/constractSigning/unconstract.png'
+import Check1 from '@/assets/constractSigning/business.png'
+import Check2 from '@/assets/constractSigning/constract.png'
+import unCheck1 from '@/assets/constractSigning/unbusiness.png'
+import unCheck2 from '@/assets/constractSigning/unconstract.png'
 
-  export default {
+export default {
   name: 'ContractDetail',
   components: {
   },
   data () {
     return {
       isshow: false, // 提示框的显示与隐藏
-        num: 1,
+      num: 0,
       conditionInfo: {},
       check1: Check1,
       check2: Check2,
@@ -224,10 +224,10 @@
       this.isshow = true
     },
   },
-  }
+}
 </script>
 <style lang='less' type="text/less">
-  #contract-details {
+#contract-details {
   .all{
     position: absolute;
     background-color: transparent;
@@ -289,7 +289,7 @@
         line-height: 32px;
       }
     }
-    }
+}
   .h-header-btn {
     img {
       width: 16px;
@@ -541,5 +541,5 @@
     height: 40px;
     margin: 4px 2% 0 2%;
   }
-  }
+}
 </style>

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)