解决冲突

src/page-instrument/view-detail/index.module.less

@@ -266,37 +266,36 @@
     z-index: 10000;
     background: rgba(0, 0, 0, .6);
 
-    <<<<<<< HEAD .lottie {
-        =======&.isPreView {
-            background: transparent;
-
-            .loadingTip {
-                color: #999;
-            }
-        }
-
-        .lottie {
-            >>>>>>>feature-tianyong-newVersion width: 120px;
-        }
+    &.isPreView {
+        background: transparent;
 
         .loadingTip {
-            font-size: 14px;
-            color: #fff;
+            color: #999;
         }
     }
 
-    .bg2Left {
-        width: 52px;
-        height: 125px;
-        position: absolute;
-        left: 0;
-        top: 0;
+    .lottie {
+        width: 120px;
     }
 
-    .bg2Right {
-        width: 52px;
-        height: 125px;
-        position: absolute;
-        right: 0;
-        top: 0;
-    }
+    .loadingTip {
+        font-size: 14px;
+        color: #fff;
+    }
+}
+
+.bg2Left {
+    width: 52px;
+    height: 125px;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.bg2Right {
+    width: 52px;
+    height: 125px;
+    position: absolute;
+    right: 0;
+    top: 0;
+}