样式等问题

src/components/business/coop-list-item.vue

@@ -17,10 +17,10 @@
         >{{item.projectStatusValue | statusText}}</span>
       </div>
       <div class="coop-item-right">
-        <span class="coop-item-right-title">{{item.name}} <span v-if="item.cardStatus == 1" class="active">已激活</span></span>
+        <span class="coop-item-right-title">{{item.name}}</span>
         <span v-if="item.cmeType == 2" class="coop-item-right-other">{{item.level}} | {{item.scope}}</span>
         <span v-if="item.cmeType != 2" class="coop-item-right-other">{{item.level}} | {{item.credit}} | {{item.scope}}</span>
-        <span class="coop-item-right-other">{{item.startDate | formatTime('{y}.{m}.{d}')}}至{{item.endDate | formatTime('{y}.{m}.{d}')}}</span>
+        <span class="coop-item-right-other">{{item.startDate | formatTime('{y}.{m}.{d}')}}至{{item.endDate | formatTime('{y}.{m}.{d}')}} <span v-if="item.cardStatus == 1" class="active">已激活</span></span>
       </div>
     </div>
     <NoMoreContent v-show="paramData.length > 9"></NoMoreContent>
@@ -281,17 +281,6 @@ export default {
       font-size: px2rem(16px);
       font-weight: 700;
       color: rgba(55, 56, 57, 1);
-      .active {
-        display: inline-block;
-        width: px2rem(42px);
-        height: px2rem(18px);
-        line-height: px2rem(18px);
-        font-size: px2rem(11px);
-        text-align: center;
-        border-radius: 4px;
-        border: 1px solid rgba(202,168,97,1);
-        color: #CAA861;
-      }
     }
     &-other {
       height: px2rem(21px);
@@ -303,6 +292,20 @@ export default {
       overflow : hidden;
       text-overflow: ellipsis;
       white-space:nowrap;
+      .active {
+        // display: inline-block;
+        // justify-items: flex-end;
+        float: right;
+        width: px2rem(42px);
+        height: px2rem(15px);
+        margin-top: px2rem(3px);
+        line-height: px2rem(15px);
+        font-size: px2rem(11px);
+        text-align: center;
+        border-radius: 4px;
+        border: 1px solid rgba(202,168,97,1);
+        color: #CAA861;
+      }      
     }
   }
 }

src/components/cme/change-card.vue

@@ -124,7 +124,8 @@ export default {
       position: relative;
       top: 0;
       right: px2rem(-120px);
-      width: 12px;
+      width: px2rem(12px);
+      height: px2rem(12px);
     }
   }
   .tip {
@@ -135,9 +136,14 @@ export default {
       line-height: 1.2;
       font-size: px2rem(12px);
       img {
+        position: relative;
+        top: px2rem(1px);
         width: px2rem(12px);
         height: px2rem(12px);
-        margin: px2rem(2px) px2rem(4px) 0 px2rem(1px);
+        // margin: px2rem(2px) px2rem(4px) 0 px2rem(1px);
+      }
+      span {
+        margin-left: px2rem(4px);
       }
       color: #979899;
     }
@@ -160,7 +166,7 @@ export default {
     }
     img {
       position: absolute;
-      top: px2rem(30px);
+      top: px2rem(31px);
       right: px2rem(12px);
       width: px2rem(15px);
       height: px2rem(15px);

src/components/cme/teacter-intro.vue

@@ -73,6 +73,7 @@ export default {
                     font-size: px2rem(16px);
                     color: #373839;
                     font-weight: 700;
+                    line-height: 1.1;
                 }
                 .leader-title {
                     width: px2rem(220px);

src/views/credit-edit.vue

@@ -192,6 +192,7 @@ export default {
     padding-top: px2rem(8px) !important;
     line-height: px2rem(20px) !important;
     font-size: px2rem(15px);
+    box-shadow: none !important;
   }
 }
 

src/views/merge-detail.vue

@@ -137,8 +137,8 @@
     <!--去激活-->
     <ChangeCard
       :changeErrorMsg="changeCardErrorMsg"
-      :isShow="showChangeCard" 
-      @cancle="cancleChangeCard" 
+      :isShow="showChangeCard"
+      @cancle="cancleChangeCard"
       @confirm="changeCardAction">
     </ChangeCard>
     <!-- <CardPopup :cardInfo="cardInfo" :isShow="isShowPopup" @clickOverlay="clickOverlay" @cancle="jumpToCardList()" @confirm="confirm"></CardPopup> -->