'router'

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-29 13:18:23
+ * @LastEditTime: 2019-09-29 14:53:45
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -111,13 +111,8 @@ export default new Router({
     {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
     {path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
     // 经销商签约
-<<<<<<< HEAD
     {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
     {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
-=======
-    {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
-    {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}},
->>>>>>> ren
     {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
     // 合同签约
     {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: true}},