11

src/router/index.js

@@ -64,12 +64,10 @@ const routes = [
     component: () => import('../views/user/index.vue'),
   },
   {
-<<<<<<< HEAD
     path: '/user/detail',
     name: 'user',
     meta: { title: '详情', isleftarrow: true },
     component: () => import('../views/user/detail.vue'),
-=======
     path: '/account/index',
     name: 'account_user',
     meta: { title: '账号管理', isleftarrow: false },
@@ -196,7 +194,6 @@ const routes = [
     name: 'adminCenter',
     meta: { title: '审核详情', isleftarrow: true },
     component: () => import('../views/adminCenter/transaction/detail.vue'),
->>>>>>> 7df36af78f6c28e14120668807c43aedc8e49ed9
   },
   // 公众号第一版结束
   // 公众号第二版开始 viewTwo

src/views/user/index.vue

@@ -64,7 +64,6 @@ export default {
   methods: {
     // 选择菜单
     chageAcieve(index) {
-<<<<<<< HEAD
       if (index == 0) {
         this.$set(this, `title`, '调查问卷');
       } else if (index == 1) {
@@ -75,9 +74,7 @@ export default {
         console.log('登录');
         this.$set(this, `title`, '账号管理');
       }
-=======
       if (index == 3) this.$router.push({ path: '/account/index' });
->>>>>>> 7df36af78f6c28e14120668807c43aedc8e49ed9
     },
     //跳转详情
     btnClick(data) {