Browse Source

clp

feat(pages)Modify style
clp 3 years ago
parent
commit
3ec152c0d0

+ 2 - 2
pages/activityInfo/activityInfo.wxml

@@ -5,8 +5,8 @@
   </view> -->
   <view class="bottom flex-column">
   <!-- <view class="title over-ellipsi">{{activityInfo.name}}</view> -->
-  <view class="title">9.9折{{activityInfo.name}}</view>
-  <view class="coupon-info">含折扣券 (1)
+  <view class="title">{{activityInfo.name}}</view>
+  <view class="coupon-info">含
   <span wx:for="{{activityInfo.couponTypeAndNumObj}}">{{item.typeText}} ({{item.num}}) </span>  
   </view>
   <!-- 生成二维码 -->

+ 3 - 1
pages/myCoupons/myCoupons.wxml

@@ -23,7 +23,9 @@
     <view class="coupon-li-line"></view>
     <view class="coupon-detail">
       <view class="coupon-detail-title">{{item.title}}</view>
-      <view class="full_reduction">满38元可使用</view>
+
+      <!-- <view class="full_reduction">满38元可使用</view> -->
+      
       <view class="coupon-detail-date">{{item.beignTime}}至{{item.endTime}}</view>
     </view>
     <view class="use-button" bindtap="goUseCoupon">立即使用</view>

+ 1 - 1
pages/receiveCoupon/receiveCoupon.js

@@ -11,7 +11,7 @@ Page({
     userMobile:'', //电话
     codeId:'',//code唯一码
     memberMobile:'',//领取人手机号
-    isEffective:false, //是否过期,默认过期
+    isEffective:true, //是否过期,默认过期
     activityInfo:[],
   },
 

+ 4 - 11
pages/receiveCoupon/receiveCoupon.wxml

@@ -1,8 +1,5 @@
-<!-- <view class="contain flex-row"> -->
+
   <view class="info flex-column">
-  <!-- <view class="top flex-row">
-    <image src="/images/logo.png" class="top-image"></image>
-  </view> -->
   <view class="bottom flex-column">
   <view class="title over-ellipsi">{{activityInfo.name}}9.9折</view>
   <view class="coupon-info over-ellipsi">含折扣券(2)
@@ -10,16 +7,12 @@
   </view>
   <!-- 领取 -->
   <view class="receive-button" bindtap="getNowCoupon" wx:if="{{memberMobile.length>0 && isEffective==true}}">立即领取</view>
-  
   <button class="receive-button-button" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" wx:elif="{{memberMobile.length==0 && isEffective==true}}">立即领取</button>
-  <view class="flex-row bottom-date">
+  <view class="bottom-date">
 
-  <view style="font-size: 12px;">有效期:2021-11-01 00:00:00至 2021-11-03 00:00:00</view>
-  <!-- <view style="font-size: 10px;">{{activityInfo.beginTimestamp}} 至 {{activityInfo.endTimestamp}}</view> -->
+  <view style="font-size: 12px;">有效期:{{activityInfo.beginTimestamp}} 至 {{activityInfo.endTimestamp}}</view>
  
   </view>
-  </view>
-
 </view>
 <view class="top-image"><image src="/images/logo.png" class="top-image"></image></view>
-<!-- </view> -->
+  </view>

+ 29 - 37
pages/receiveCoupon/receiveCoupon.wxss

@@ -4,16 +4,16 @@ Page {
   background-color: #BF2637;
   box-sizing: border-box;
   padding-top: 102px;
-  padding-left: 26px;
   background-image: url("https://dy.shpr.top/shareActivity/activityInfo_big.png");
   background-size: 100% 100%;
 }
 .info{
-  width: 327px;
-  height: 428px;
-  /* margin-top: 102px; */
-  align-items: center;
-  /* margin-left: 26px; */
+  width: 100%;
+  /* height: 100%; */
+  justify-content: left!important;
+  align-items: center!important;
+  margin-top: 100px;
+
 }
 .top{
   height: 46px;
@@ -30,8 +30,8 @@ Page {
 .top-image{
   width: 182px;
   height: 35px;
-  margin-left: 45px;
-  margin-top: 89px;
+  
+  margin-top: 119px; 
 }
 
 .bottom{
@@ -39,24 +39,20 @@ Page {
   height: 234px;
   border-radius: 10px 10px 5px 5px;
   box-sizing: border-box;
-  margin: 100px 20px 100px 55px;
   background-image: url("https://dy.shpr.top/shareActivity/couponInfo.png");
   background-size: 100% 100%;
-  justify-content: center;
+  justify-content: left;
   align-items: center;
 }
 .title{
   width: 300px;
-  height: 24px;
+  height: 50px;
   font-size: 46px;
   font-weight: bold;
   text-align: center;
-  line-height: 24px;
-  font-size: 46px;
-  font-weight: bold;
-  line-height: 0px;
+  line-height: 50px;
   color: #000000;
-  margin-top: -65px;
+  margin-top: 29px;
 
 
 
@@ -64,8 +60,6 @@ Page {
 .coupon-info{
   width: 300px;
   height: 18px;
-  font-size: 16px;
-  font-weight: 400;
   text-align: center;
   line-height: 18px;
   margin-top: 10px;
@@ -103,37 +97,35 @@ Page {
   height: 10px;
   font-weight: 400;
   color: #000000;
-  position: absolute;
-  margin-top: 179px;
+  margin-top: 20px;
   margin-left: 15px;
 
 }
 .receive-button {
-  width: 167px;
+  width: 147px !important;
   height: 37px;
-  border-radius: 8rpx!important;
+  border-radius: 4px!important;
   background: #FC5232;
   color:#fff!important;
-  align-items: center!important;
   text-align: center!important;
-  line-height: 37px!important;
-  margin-top: 20rpx!important;
-  cursor: pointer!important;
-  font-size: 25rpx!important;
-  position: absolute;
-  top: 335px;
+  line-height: 37px;
+  margin-top: 45px!important;
+  /* cursor: pointer!important; */
+  font-size: 22px!important;
 }
 .receive-button-button {
-  width: 167px!important;
+  width: 147px !important;
   height: 37px;
-  border-radius: 8rpx!important;
+  border-radius: 4px!important;
   background: #FC5232;
   color:#fff!important;
-  align-items: center!important;
   text-align: center!important;
-  margin-top: 20rpx!important;
-  cursor: pointer!important;
-  font-size: 25rpx!important;
-  position: absolute;
-  top: 335px;
+  line-height: 22px;
+  margin-top: 45px!important;
+  /* cursor: pointer!important; */
+  font-size: 22px!important;
+
 }
+
+
+