Merge remote-tracking branch 'origin/release/5.4.1' into gray

@@ -20,7 +20,7 @@
             </div>
             </div>
         </div>
         </div>
         {{/if}}
         {{/if}}
-        <button class="btn-edit">编辑</button>
+        <button class="btn-edit"></button>
     </div>
     </div>
    
    
     {{#if ordinaryCart}}
     {{#if ordinaryCart}}

@@ -77,6 +77,10 @@
         }
         }
 
 
         .btn-edit {
         .btn-edit {
+            &:before {
+                content: "编辑";
+            }
+
             display: none;
             display: none;
             width: 100px;
             width: 100px;
             height: 60px;
             height: 60px;
@@ -334,10 +338,12 @@
 }
 }
 
 
 .main-wrap.edit {
 .main-wrap.edit {
-    .nav-btn {
-        &:before {
+    .nav-btn:before {
         content: "完成";
         content: "完成";
     }
     }
+
+    .btn-edit:before {
+        content: "完成";
     }
     }
 
 
     .all-gift-box {
     .all-gift-box {