修改合并的问题

pages_category_page1/integral/index.vue

@@ -247,13 +247,8 @@ page {
   background: #FAFAFA;
 }
 .memberCenter {
-<<<<<<< HEAD
   border-top: 1rpx solid #252744;
   background: url("@/static/images/temp/integral_bg.png") no-repeat left top;
-=======
-  border-top: 2rpx solid #4b4b4b;
-  background: url("http://36.138.125.206:8081/ceres-local-file/static/images/addBankBg.png") no-repeat left top;
->>>>>>> 586af40 (统一修改图片地址)
   background-size: contain;
   min-height: 389rpx;
   padding: 0 20rpx;
@@ -274,12 +269,8 @@ page {
     .memberBoxTop {
       position: relative;
       .memberTopPos{
-<<<<<<< HEAD
         //background: url("https://ceres.zkthink.com/static/images/integralBg.png") no-repeat left top;
         background: linear-gradient(-30deg, #C8CBF7, #E6E8FB);
-=======
-        //background: url("http://36.138.125.206:8081/ceres-local-file/static/images/integralBg.png") no-repeat left top;
->>>>>>> 586af40 (统一修改图片地址)
         background-size: cover;
         height: 302rpx;
         border-radius: 24rpx;
@@ -326,11 +317,7 @@ page {
     padding: 0 30rpx;
     .signLeft {
       .signIcon {
-<<<<<<< HEAD
         background: url("@/static/images/temp/signIcon.png") no-repeat center left;
-=======
-        background: url("http://36.138.125.206:8081/ceres-local-file/static/images/signIcon.png") no-repeat center left;
->>>>>>> 586af40 (统一修改图片地址)
         background-size: contain;
         height: 76rpx;
         width: 76rpx;
@@ -359,38 +346,22 @@ page {
         margin-right: 15rpx;
       }
       .detailIcon {
-<<<<<<< HEAD
         background: url("@/static/images/temp/detailIcon1.png") no-repeat center center;
         background-size: contain;
       }
       .exchangeIcon {
         background: url("@/static/images/temp/exchangeIcon1.png") no-repeat center center;
-=======
-        background: url("http://36.138.125.206:8081/ceres-local-file/static/images/detailIcon.png") no-repeat center center;
-        background-size: contain;
-      }
-      .exchangeIcon {
-        background: url("http://36.138.125.206:8081/ceres-local-file/static/images/exchangeIcon.png") no-repeat center center;
->>>>>>> 586af40 (统一修改图片地址)
         background-size: contain;
       }
     }
     .active {
       background: #252744;
       .detailIcon {
-<<<<<<< HEAD
         background: url("@/static/images/temp/detailIcon.png") no-repeat center center;
         background-size: contain;
       }
       .exchangeIcon {
         background: url("@/static/images/temp/exchangeIcon.png") no-repeat center center;
-=======
-        background: url("http://36.138.125.206:8081/ceres-local-file/static/images/detailIcon1.png") no-repeat center center;
-        background-size: contain;
-      }
-      .exchangeIcon {
-        background: url("http://36.138.125.206:8081/ceres-local-file/static/images/exchangeIcon1.png") no-repeat center center;
->>>>>>> 586af40 (统一修改图片地址)
         background-size: contain;
       }
       text {