阅读器样式

src/assets/less/reader.less

@@ -1,6 +1,7 @@
 .reader-wrap {
   flex-direction: column;
   background-color: #e6e6e6;
+  width: 100%;
   
   .reader-title {
     margin: 0 24px;

src/views/Reader/index.ux

@@ -45,14 +45,8 @@ export default {
     }
   },
   onShow() {
-<<<<<<< HEAD
-    it.getShortCut(() => {
-      this.showShortPop = true;
-
-=======
     it.getShortCut((value) => {
       this.showShortPop = !value;
->>>>>>> 49ca0d62c807be784a0d4361c8a8c08b956f9298
     })
   },
   addShelf() {