解决冲突

src/views/display/index.vue

@@ -216,13 +216,8 @@ export default {
     },
 
     handleClick(item) {
-<<<<<<< HEAD
-      let index = this.boutiqueTitles.indexOf(item.title)
-      
-=======
       let index = this.boutiqueTitles.indexOf(item.title);
       // debugger
->>>>>>> c7c929faab87677c988370f44cf76d97ad371ca9
       let newPage;
       if (index == -1) {
         const { themeType, exhibitionId } = item;