Merge branch 'dev/v1.7.5_cyl' of jianyu/jy-points into feature/v1.7.5

jypoints-pc/src/components/GetMission.vue

@@ -27,7 +27,7 @@
           </div>
         </div>
         <div class="g-m-b-content-c column" v-if="taskInfo.status === 2">
-          <p class="g-m-b-content-c-line-1">“{{ renderText.text2 }}限时福利”挑战成功，<span class="color-red">超级订阅7天体验</span></p>
+          <p class="g-m-b-content-c-line-1">“{{ renderText.text2 }}限时福利”挑战成功，恭喜获得<span class="color-red">超级订阅7天体验</span></p>
           <div class="g-m-b-content-c-line-2">
             <div class="j-tag tag-red" v-if="renderText.tagText">{{ renderText.tagText }}</div>
             <p class="g-m-b-content-c-text">{{ renderText.text1 }}：7天内完成全部{{ renderText.text2 }}，可额外获得七天超级订阅会员。</p>

jypoints-pc/src/components/PointOverview.vue

@@ -1,6 +1,5 @@
 <template>
   <section class="point-overview">
-    <img class="overview-bg" src="@/assets/image/point-overview-bg@2x.png" alt="">
     <div class="point-overview-content">
       <div class="p-o-content-left">
         <div class="content-left-l">
@@ -32,6 +31,9 @@
         <el-link type="info" :underline="false" @click="toDetailPage">积分明细</el-link>
         <el-link type="info" :underline="false" target="_blank" href="/swordfish/frontPage/integral/sess/jypoints_deduct_rules">积分规则</el-link>
       </div>
+      <div class="overview-bg-container">
+        <img class="overview-bg" src="@/assets/image/point-overview-bg2@2x.png" alt="">
+      </div>
     </div>
   </section>
 </template>
@@ -125,31 +127,44 @@ export default {
 .point-overview {
   position: relative;
   width: 100%;
-  border-radius: 8px;
+  height: calc(120px + 24px);
   // background: linear-gradient(91deg, #0C0F4F 0.06%, #091732 99.23%);
 }
-.overview-bg {
-  display: block;
-  width: 100%;
+.overview-bg-container {
+  position: absolute;
+  right: 0;
+  bottom: -15px;
+  z-index: 2;
+  width: 505px;
+  height: 99px;
+  img {
+    display: block;
+    width: 100%;
+  }
 }
 .point-overview-content {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 84%;
+  position: relative;
+  height: 120px;
   display: flex;
   align-items: center;
   justify-content: space-between;
   font-size: 14px;
   line-height: 22px;
   color: #fff;
-  z-index: 2;
+  border-radius: 8px;
+  background: linear-gradient(91deg, #0C0F4F 0.06%, #091732 99.23%);
   .icon-points {
     width: 28px;
     height: 28px;
   }
 }
+
+.p-o-content-left,
+.p-o-content-right {
+  position: relative;
+  z-index: 5;
+}
+
 .p-o-content-left {
   display: flex;
   align-items: center;
@@ -199,7 +214,7 @@ export default {
       display: flex;
       align-items: center;
       width: 100%;
-      height: 26px;
+      height: 28px;
       padding: 0 8px;
       white-space: nowrap;
     }