feat: 解决冲突

views/My.vue

@@ -624,7 +624,6 @@ const handleVipActiveClick = (index, item) => {
 // 定义页面配置
 defineExpose({});
 </script>
-
 <style lang="less" scoped>
 @import "@/common.less";
 
@@ -771,11 +770,6 @@ defineExpose({});
 
 
       .integralContainer {
-<<<<<<< HEAD
-        position: absolute;
-        top: 0rpx;
-        right: 0rpx;
-=======
           position: absolute;
           top: 0rpx;
           right: 0rpx;
@@ -804,36 +798,9 @@ defineExpose({});
             text-align: center;
             right: 0rpx;
             top: 81rpx;
->>>>>>> master
-
-        .integralIcon {
-          position: absolute;
-          width: 226rpx;
-          height: 166rpx;
-          right: 0rpx;
-        }
-
-        .integralText0 {
-          position: absolute;
-          font-size: 24rpx;
-          color: #1d1e25;
-          top: 45rpx;
-          right: 0rpx;
-          width: 167rpx;
-          text-align: center;
-        }
-
-        .integralText1 {
-          position: absolute;
-          font-size: 24rpx;
-          color: #1d1e25;
-          width: 167rpx;
-          text-align: center;
-          right: 0rpx;
-          top: 81rpx;
 
+          }
         }
-      }
 
       .edit-btn {
         image {
@@ -975,23 +942,21 @@ defineExpose({});
   .vip-active-area {
     margin-left: 28rpx;
     margin-top: 60rpx;
-
     .vip-title {
       margin-left: 20rpx;
     }
-
     .vip-active-swiper {
       width: 692rpx;
       height: 204rpx;
-      flex-shrink: 0;
-      margin-top: 30rpx;
+			flex-shrink: 0;
+			margin-top: 30rpx;
       margin-bottom: 100rpx;
-
-      .vip-active-img {
-        width: 100%;
-        height: 100%;
-        // border-radius: 16rpx;
-      }
+			
+			.vip-active-img {
+				width: 100%;
+				height: 100%;
+				// border-radius: 16rpx;
+			}
     }
   }
 
@@ -1027,3 +992,4 @@ defineExpose({});
   }
 }
 </style>
+