Merge remote-tracking branch 'remotes/origin/feature/双11' into release/v5.5

pages/activity/doubleEleven/index.vue

@@ -45,7 +45,7 @@
           <div class="content">
             <div class="title">{{item.couponName}}</div>
             <div class="tips">{{item.couponExplain}}</div>
-            <div class="number">剩余数量:{{item.remainder}}张</div>
+            <div class="number">剩余数量：{{item.remainder}}张</div>
           </div>
           <div v-if="item.receivingStatus===1" class="btn" @click="receiveCouponRewards(item)"></div>
           <div v-else-if="item.receivingStatus===2" class="btn-collect"></div>
@@ -73,7 +73,7 @@
               <div class="content">
                 <div class="title">{{coupons.couponName}}</div>
                 <div class="tips">{{coupons.couponExplain}}</div>
-                <div class="number">有效期至:{{coupons.validityPeriod}}</div>
+                <div class="number">有效期至 {{coupons.validityPeriod}}</div>
               </div>
           </div>
 
@@ -85,7 +85,7 @@
               <div class="content">
                 <div class="title">月卡套餐7折优惠券</div>
                 <div class="tips">满90元可用，优惠券有效期<span style="color:#D358A8">3</span>天</div>
-                <div class="number">有效期至:2022.11.10 16:28</div>
+                <div class="number">有效期至 2022.11.10 16:28</div>
               </div>
             </div> -->
 
@@ -429,8 +429,8 @@ img{
 
 
 .popup-container{
-  width: 295px;
-  height: 407px;
+  width: 325px;
+  height: 437px;
   background: url('../../../assets/image/activity/double-eleven/bj2.png') no-repeat;
   background-size: 100% 100%;
   padding-top: 210px;
@@ -438,7 +438,7 @@ img{
   padding-right: 15px;
 
   .coupon{
-    width: 265px;
+    width: 295px;
     height: 95px;
     margin-bottom: 20px;
     .let-title{

pages/activity/doubleEleven/pc.vue

@@ -43,7 +43,7 @@
             <div class="content">
               <div class="title-coupon">{{item.couponName}}</div>
               <div class="tips">{{item.couponExplain}}</div>
-              <div class="number">剩余数量:{{item.remainder}}张</div>
+              <div class="number">剩余数量：{{item.remainder}}张</div>
             </div>
             <div v-if="item.receivingStatus===1" class="btn" @click="receiveCouponRewards(item)"></div>
             <div v-else-if="item.receivingStatus===2" class="btn-collect"></div>
@@ -70,7 +70,7 @@
                 <div class="content">
                   <div class="title-coupon">{{coupons.couponName}}</div>
                   <div class="tips">{{coupons.couponExplain}}</div>
-                  <div class="number">有效期至:{{coupons.validityPeriod}}</div>
+                  <div class="number">有效期至 {{coupons.validityPeriod}}</div>
                 </div>
             </div>
   
@@ -82,7 +82,7 @@
                 <div class="content">
                   <div class="title-coupon">月卡套餐7折优惠券</div>
                   <div class="tips">满90元可用，优惠券有效期<span style="color:#D358A8">3</span>天</div>
-                  <div class="number">有效期至:2022.11.10 16:28</div>
+                  <div class="number">有效期至 2022.11.10 16:28</div>
                 </div>
               </div> -->
   
@@ -378,7 +378,7 @@
   
   
   .popup-container{
-    width: 295px;
+    width: 325px;
     height: 407px;
     background: url('../../../assets/image/activity/double-eleven/bj2.png') no-repeat;
     background-size: 100% 100%;
@@ -387,7 +387,7 @@
     padding-right: 15px;
   
     .coupon{
-      width: 265px;
+      width: 295px;
       height: 95px;
       margin-bottom: 20px;
       .let-title{