style:index

src/pages/index/index.vue

@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-<!--
- * @Author: aBin
- * @email: binbin0314@126.com
- * @Date: 2021-07-19 10:09:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-19 18:51:34
--->
 <template>
   <view>
     <Title />
@@ -15,14 +7,6 @@
       <TimeLine />
       <!-- <view class="mt-5">
     <view class="mt-5">
-=======
-<template>
-  <view class="container p-4 bg-gray-100">
-    <Globals />
-
-    <u-button @tap="$u.route('/pages/test/test')">打开test界面</u-button>
-    <!-- <view class="mt-5">
->>>>>>> 51c24a5ebfc5f0e5be65b9f99854c6f259551ab8
       <u-button type="primary" size="default" @click="$u.route('/pages/plugin-test/plugin-test')">iframe 验证</u-button>
     </view>
     <view class="my-3">
@@ -38,14 +22,11 @@
 
 <script>
 import Globals from 'components/Globals/index.vue';
-<<<<<<< HEAD
 import Title from 'components/Title/Title.vue';
 import Roles from 'components/Roles/Roles.vue';
 import TimeLine from 'components/TimeLine/index.vue';
 
 // import Project from 'components/Project/Project.vue';
-=======
->>>>>>> 51c24a5ebfc5f0e5be65b9f99854c6f259551ab8
 
 export default {
   components: { Globals, TimeLine, Roles, Title },