modify: 详情页

src/pages/pointDetail/pointDetail.js

@@ -13,7 +13,7 @@ wxService.page({
     dialog: {
       show: false,
       image: '../../assets/imgs/point/bgc.png',
-      content: '积分流水',
+      content: '优惠券和积分流水',
       tip: '立即查看'
     },
     desc: [{ "label": "优惠详情", "value": "使用100积分可兑换一张维记鲜牛奶优惠券，凭券可以4.8元优惠价换购维记鲜牛奶236ML一盒！", "type": 2 }, { "label": "有效时间", "value": "2019-07-12 至 2019-08-06", "type": 2 }, { "label": "兑换说明", "value": "1、点击【立即兑换】，即可兑换成功，每人限兑换10张券\n2、在【会员小程序-优惠券】中可查询到已兑换的券；", "type": 2 }, { "label": "使用须知", "value": "1、凭此优惠券，前往广东7-Eleven有售门店，可以优惠价4.8元换购维记鲜牛奶236ML一盒！2、成功领到优惠券后，请务必在有效期内使用，逾期无效；3、一张券限兑换维记鲜牛奶236ML一盒；4、优惠券不设找零、不可兑换现金； 5、请于交易前向收银员出示此优惠券； 6、使用优惠券发生的交易，广东7-Eleven仅按实际支付金额开具发票；7、如发生退货，仅按顾客实际支付金额退款。 ", "type": 2 }],
@@ -42,13 +42,20 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
-         
+          let dialog = this.data.dialog
+          //  popupType: 0  1 优惠券 2 积分
+          if(data.popupType == 1){
+            dialog.content = '优惠券'
+          } else if(data.popupType == 2) {
+            dialog.content = '积分流水'
+          }
           this.setData({
             activityId: data.id,
             type: data.type,
             popupType: data.popupType,
             goal: data.goal,
-            detailImage: data.detailImage
+            detailImage: data.detailImage,
+            dialog
           }, () => {
             // 会员集点活动统计信息
             this.getPointConsumptionCount(id)
@@ -98,8 +105,6 @@ wxService.page({
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
-          this.setData({
-          })
           // 跳转  popupType: 0  默认不跳转  1 优惠券 2 积分
           const { popupType } = this.data
           if (popupType == 1) {

src/pages/pointDetail/pointDetail.wxml

@@ -3,9 +3,8 @@
 <view class="detail-info border_box">
 	<view class="info-top weui-flex df-j--bt">
 		<view class="info-num">
-			进度：
-			<text class="rate-num"> {{countObj.surplusPoints}}</text>
-			/ {{goal}}
+			集点进度
+			<text class="point_color"> {{countObj.surplusPoints}}</text>/{{goal}}
 		</view>
 		<view class="info-ready-num">
 			已达成 {{countObj.exchangeCount}} 次
@@ -14,21 +13,21 @@
 	<view class="info-progress border_box">
 		<progress
 		 percent="{{currentPercent}}"
-		 activeColor="#C09A74"
+		 activeColor="#05C35B"
 		 stroke-width="10"
 		 active
 		 border-radius="{{20}}"
 		/>
 	</view>
 	<view wx:if="{{countObj.totalPoints}}" class="info-status-btn available border_box" bindtap="handleToGet">
-		可领取奖励 {{countObj.totalPoints}} 次
+		可领取奖励<text class="total-points"> {{countObj.totalPoints}} </text>次
 	</view>
  <view wx:else class="info-status-btn unacommpolished border_box">
     还未达成，继续加油呀
 	</view>
 </view>
 <view class="detail-desc">
-	<view class="detail-active" bindtap="handleCheckGoods" wx:if="{{type == 2}}">查看活动商品 ></view>
+	<view class="detail-active point_color" bindtap="handleCheckGoods" wx:if="{{type == 2}}">查看活动商品 ></view>
 	<view class='integral-list' wx:for="{{desc}}" wx:key="{{index}}">
 		<text class='integral-title'>{{item.label}}</text>
 		<text class='integral-desc wpl'>{{item.value}}</text>

src/pages/pointDetail/pointDetail.wxss

@@ -27,7 +27,7 @@
   margin: 0 50rpx;
   text-align: center;
   height: 88rpx;
-  line-height: 88rpx;
+  line-height: 78rpx;
   border-radius: 44rpx;
   background-color: #FFFFFF;
 }
@@ -66,8 +66,10 @@
 }
 .detail-active {
   height: 33rpx;
-  color: rgba(203, 60, 60, 1);
   font-size: 24rpx;
   text-align: right;
   font-family: PingFangSC-Regular;
+}
+.total-points {
+  font-size: 48rpx;
 }
\ No newline at end of file