冲突

@@ -149,7 +149,7 @@ function editOrder(onEdit) {
         address: address,
         address: address,
         mobile: mobile,
         mobile: mobile,
         phone: phone
         phone: phone
-    }
+    };
 
 
     if (/\*/.test(mobile)) {
     if (/\*/.test(mobile)) {
         d = {
         d = {
@@ -158,7 +158,7 @@ function editOrder(onEdit) {
             userName: userName,
             userName: userName,
             address: address,
             address: address,
             phone: phone
             phone: phone
-        }
+        };
     }
     }
 
 
     $.ajax({
     $.ajax({

 .favorite-editorials {
 .favorite-editorials {
-     position: relative;
-    
+    position: relative;
+
     .num {
     .num {
         position: absolute;
         position: absolute;
         top: -30px;
         top: -30px;