merge

src/views/Catalog/index.ux

@@ -111,17 +111,9 @@ export default {
     getCatalog(params).then(r => {
       if (isLoadPrev) {
         this.list.unshift(...r.list)
-<<<<<<< HEAD
-        console.log(this.list)
         this.startpage = r.meta.current_page
       } else {
         this.list.push(...r.list)
-        console.log(this.list)
-=======
-        this.startpage = r.meta.current_page
-      } else {
-        this.list.push(...r.list)
->>>>>>> c19c95f858f0bf14d84641c777e3999c5531bd6b
         this.meta = r.meta;
       }
     })