Merge branch 'master' of iqiyoo:zhuishuyun_quickapp_front

src/assets/less/shelf.less

@@ -52,7 +52,16 @@
     padding: 32px 22px;
     justify-content: space-between;
     align-items: center;
-
+    .complete-btn {
+      width: 80px;
+      height: 35px;
+      background-color: #3aacff;
+      border-radius: 20px;
+      align-items: center;
+      text-align: center;
+      color: #fff;
+      font-size: 25px;
+    }
     text {
       color: #333;
       font-size: 26px;
@@ -170,7 +179,7 @@
   }
   .item_wrap {
     flex-direction: column;
-    padding-bottom: 50px ;
+    padding-bottom: 50px;
     .last-read {
       font-size: 24px;
       color: #999999;

src/views/Shelf/index.ux

@@ -15,12 +15,15 @@
       if="{{mockList.length>0}}"
     >
       <text>共{{ booksize }}本</text>
-      <div>
+      <div if="modeText">
         <text>
           <image src="../../assets/imgs/manage.png" class="modeimage"></image>
         </text>
         <text @click="changeMode" class="mode-text">{{ modeText }}</text>
       </div>
+      <div if="!modeText">
+        <text @click="changeMode" class="complete-btn">完成</text>
+      </div>
     </div>
     <div if="{{mockList.length<=0 && isinit}}" class="blank_img">
       <image
@@ -93,9 +96,7 @@
                     show="{{isDelMode}}"
                     @click="deleteBook($item)"
                   >
-                    <image
-                      src="../../assets/imgs/delete_recent.png"
-                    ></image>
+                    <image src="../../assets/imgs/delete_recent.png"></image>
                     <text>删除</text>
                   </div>
                 </stack>
@@ -189,7 +190,7 @@ export default {
     this.isDelMode = !this.isDelMode;
   },
   listenMode(v) {
-    this.modeText = v ? '取消' : '管理';
+    this.modeText = v ? '' : '管理';
   },
   toCategory() {
     this.$emit('change');