'修改冲突'

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-09-27 11:13:31
+ * @LastEditTime: 2019-09-27 14:38:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -131,7 +131,7 @@
         </item>
       </list-item>
       <div class="repay-plan">
-        <p>查看还款计划</p>
+        <p @click="repayPlan">查看还款计划</p>
       </div>
       <div class="equipment-list">设备清单</div>
       <list-item :item-height="44" class="second-part">
@@ -224,6 +224,11 @@ export default {
    judgeBp () {
      this.bp_flag = !this.bp_flag
    },
+   repayPlan () {
+     this.$router.push({
+       name: 'FinancDetails',
+     })
+   },
  },
 }
 </script>

src/pages/distributorSign/contract-list.vue

@@ -100,12 +100,13 @@ export default {
 .hinput {
     width: 100%;
     height: 68px;
-    border-bottom:1px solid #ccc;
+    border-bottom:1px solid #cccccc70;
     display: flex;
     justify-content: center;
     align-items: center;
     margin-top: 3px;
     background: #fff;
+    margin-bottom: 9px;
     .search-box {
         width: 93.6%;
         height: 36px;
@@ -131,7 +132,7 @@ export default {
     height: 120px;
     // border: 1px solid #ccc;
     background: #fff;
-   // margin-bottom: 18px;
+    margin-bottom: 8px;
     .item {
         width: 100%;
         height: 34px;
@@ -172,7 +173,7 @@ export default {
             width: 100%;
             height: 18px;
             display: flex;
-            flex-basis: row;
+            flex-direction: row;
             .name {
                 font-family: PingFangSC-Regular;
                 font-size: 13px;

src/pages/distributorSign/financ-details.vue

+<!--
+ * @Description: 融资明细
+ * @Author: your name
+ * @Date: 2019-09-27 14:25:25
+ * @LastEditTime: 2019-09-27 14:40:18
+ * @LastEditors: Please set LastEditors
+ -->
+
+<template>
+  <h-view>
+    <h-view id="financ" class="public-style">
+      <h-header :proportion="[5,1,1]" class="bar-custom">
+        <div slot="left" class="h-header-btn">
+          <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+          <span>融资明细</span>
+        </div>
+      </h-header>
+    </h-view>
+</h-view></template>
+
+<script>
+export default {
+  name: 'FinancDetails',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods:
+ {
+
+ },
+}
+</script>
+<style lang='less' scoped>
+#financ {
+  .h-header-btn {
+      img {
+        width: 16px;
+        height: 16px;
+        margin-left: 4px;
+      }
+      span {
+        font-family: PingFangSC-Semibold;
+        margin-left: 16px;
+        font-size: 17px;
+        letter-spacing: 0.61px;
+        line-height: 24px;
+      }
+}
+}
+</style>

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-09-25 21:10:20
+ * @LastEditTime: 2019-09-27 14:36:20
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -33,6 +33,7 @@ import IntoList from '@/pages/intoApproval/intoList'
 // 经销商签约
 import ContractList from '@/pages/distributorSign/contract-list'
 import ContractDetails from '@/pages/distributorSign/contract-details'
+import FinancDetails from '@/pages/distributorSign/financ-details'
 
 Vue.use(Router)
 
@@ -103,6 +104,7 @@ export default new Router({
     // 经销商签约
     {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
     {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
+    {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {