处理首页冲突

src/views/index/Index-cs.vue

@@ -36,32 +36,6 @@ export default class IndexCs extends Mixins(IndexMixin) {
     if (newVal.length) {
       this.charityType = (newVal[0] as any).detail;
     }
-<<<<<<< HEAD
-    if (newVal) {
-      const promises = Promise.all([
-                                    this.getProofCount(),
-                                    this.$api.template.folderList({
-                                                                  template_type: 1,
-                                                                })]);
-      const [ , folderListResult ] = await promises;
-      const { results = [] } = folderListResult;
-      const ids = results.map((folder: any) => folder.id);
-      const res = await this.$api.template.list({id: ids});
-      this.list = res.results || [];
-      this.loading = false;
-    }
-  }
-  private toLogin() {
-    this.$router.push({name: 'Login'});
-  }
-  private mounted() {
-    this.getSystemList();
-  }
-  private async getSystemList() {
-    const { results = []}  = await this.$api.template.systemList();
-    this.charityType = results[0].detail;
-=======
->>>>>>> 73ec870e1d8b720afdf1afce7a7ef7d4ed915a7f
   }
   private goProofDetail(templateId: string) {
     this.$router.push({ name: 'ProofDetail', query: {templateId} });

src/views/index/Index-sy.vue

@@ -74,11 +74,7 @@ import IndexMixin from '@/mixins/Index';
     [Empty.name]: Empty,
   },
 })
-<<<<<<< HEAD
-export default class IndexSy extends Vue {
-=======
 export default class IndexSy extends Mixins(IndexMixin) {
->>>>>>> 73ec870e1d8b720afdf1afce7a7ef7d4ed915a7f
   @Inject('APP-NAME') private APP_NAME!: string;
   @State('isLogin') private isLogin!: boolean;
   @State('proofCount') private proofCount!: number;