wkw 3 долоо хоног өмнө
parent
commit
2ed77fe255

+ 1 - 0
pages/couponDetail/couponDetail.wxml

@@ -38,6 +38,7 @@
       <image class="store-img" src="/static/image/sm.png" mode="aspectFit"/>
       <view class="explanation-text">
         <view>其他说明</view>
+        <view class="period">券描述:{{couponInfo.coupon_remark}}</view>
         <view class="period">时段设置:全天可用 00:00-23:59</view>
       </view>
     </view>

+ 2 - 0
pages/register/register.js

@@ -30,6 +30,7 @@ Page({
     timer: null,
     countdown: 60,
     couponInfo:{},
+    couponList:[],
     filePath: '',  // 上传成功的文件路径
     fileType: '',   // image / pdf
     baseUrl:BASE_URL,
@@ -234,6 +235,7 @@ Page({
       if (!this.data.isEdit) {
         this.setData({
           couponInfo: res.data[0],
+          couponList:res.data,
           showRegistrationSuccess: true
         });
       } else {

+ 5 - 1
pages/register/register.wxml

@@ -169,7 +169,10 @@
   <van-popup class="registration" show="{{showRegistrationSuccess}}" round close-on-click-overlay="{{false}}">
     <view class="pop-content">
       <image class="pop-img" src="{{baseUrl + '/static/image/register/yhq-logo.png'}}" mode="aspectFit"/>
-      <image class="pop-yhq" src="/static/image/register/yhq.png" mode="aspectFit"/>
+      <view class="pop-yhq">
+        <view>恭喜你报名成功</view>
+        <view>获得{{couponList.length}}张优惠券</view>
+      </view>
       <view class="pop-card">
         <image class="pop-card-img" src="/static/image/register/yhq-bg.png" mode="aspectFit"/>
         <view class="pop-card-cont">
@@ -181,6 +184,7 @@
             <view class="m-ellipsis">{{couponInfo.coupon_name}}</view>
             <view class="pop-time">{{couponInfo.end_time}}到期</view>
           </view>
+          <view class="pop-num">x{{couponList.length}}</view>
         </view>
       </view>
       <view class="receive" bindtap="onReceive" hover-class="btn-hover" hover-start-time="50">

+ 13 - 3
pages/register/register.wxss

@@ -172,9 +172,13 @@
   margin: -160rpx auto 0;
 }
 .pop-yhq{
-  width: 196rpx;
-  height: 80rpx;
-  margin: 42rpx auto 42rpx;
+  display: flex;
+  flex-direction: column;
+  font-weight: 600;
+  color: #000;
+  font-size: 28rpx;
+  line-height: 40rpx;
+  margin: 44rpx auto 40rpx;
 }
 .pop-card{
   margin: 0 46rpx;
@@ -228,6 +232,12 @@
   line-height: 28rpx;
   margin-top: 6rpx;
 }
+.pop-num{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #B0B0B0;
+  margin-left: 10rpx;
+}
 .receive{
   margin: 66rpx auto 50rpx;
 }

BIN
static/image/register/yhq.png