nyx-master: 更新

1. quiz-result页面添加跳转至page/my/points/points功能 2. points页面添加tab切换的功能

nyx-master: 更新
1. quiz-result页面添加跳转至page/my/points/points功能 2. points页面添加tab切换的功能
2858cc24 · jscat · 0854d916 · 2858cc24 · 2858cc24 · 2858cc24
Commit 2858cc24 authored Jul 28, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/pages/activity/activity.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity.wxml
 <view class="page">
@@ -33,17 +33,18 @@
          <text>扫一扫</text>
        </view>
      <view class="items">
-        <navigator url="matchStudyDetail/matchStudyDetail?studyType=wset2">
+        <navigator url="/pages/my/points/points">
          <image src="../../icon/activity/points.png"></image>
        </navigator>
        <text>积分</text>
      </view>
-      <view class="items">
+      <!-- todo 0728 热销暂时也不实现 -->
+      <!-- <view class="items">
        <navigator url="matchStudyDetail/matchStudyDetail?studyType=wset3">
          <image src="../../icon/activity/top.png"></image>
        </navigator>
        <text>热销</text>
-      </view>      
+      </view>       -->
    </view>
  </view>

--- a/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.js
+++ b/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.js
 // pages/index/note-info/note-info.js
@@ -106,8 +106,13 @@ Page({
    wx.navigateTo({
      url: "/pages/key/matchDaily/matchDaily"
   });
+  },
+  //跳转到"我的积分"页面 jscat 0728
+  onCheckPoints: function (e) {
+    wx.navigateTo({
+      url: "/pages/my/points/points"
+   });
  },

--- a/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/activity/quiz-result/quiz-result.wxml
 <view class="page">
@@ -43,7 +43,7 @@
      <view class="weui-flex" style="height: 180rpx;">
          <view class="weui-flex__item weui-flex justify align"><view class="placeholder">
            <view class="list">
-              <view class="items">
+              <view class="items" bindtap="onCheckPoints">
                <image src="../../../icon/activity/points.png"></image>
                <text>查看积分</text>
              </view>

--- a/增值产品-小程序及app/nyx-master/pages/my/points/points.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/points/points.js
 // pages/my/rank/rank.js
@@ -30,6 +30,9 @@ Page({
    showModalPoints: false,
    showModalBarcode : false,
+    /* 优惠券 可使用/不可用状态 */
+    validStatus : true,
  },
  /**
@@ -126,6 +129,18 @@ Page({
     })
   },  
+  /**
+   * tab切换
+   */
+  tab: function(e) {
+    //js的e.currentTarget.id 对应wxml的 id="tab0"
+    //js的e.currentTarget.dataSet.id 对应wxml的 data-id="tab0"
+    var id = e.currentTarget.id;
+    var dataId = e.currentTarget.dataset.id
+    this.setData({
+        validStatus: dataId=="tab0"?true:false,
+    })
+  },

--- a/增值产品-小程序及app/nyx-master/pages/my/points/points.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/my/points/points.wxml
 <view class="page"> 
 <view class="page"> 
  <!-- Tab: refer to 有品·优惠券 -->
  <view class="weui-flex" style="height: 120rpx;">
-      <view class="weui-flex__item weui-flex justify align border"><view class="placeholder">
+      <view class="weui-flex__item weui-flex justify align border" data-id="tab0" id="id-tab0" bindtap="tab">
-        <text class="text selected">可使用</text>
+        <view class="placeholder">
+        <text class="text {{validStatus==true?'selected':''}}">可使用</text>
      </view></view>
-      <view class="weui-flex__item weui-flex justify align border"><view class="placeholder">
+      <view class="weui-flex__item weui-flex justify align border" data-id="tab1" id="id-tab1" bindtap="tab">
-        <text class="text">不可用</text>
+        <view class="placeholder">
+        <text class="text {{validStatus==false?'selected':''}}">不可用</text>
      </view></view>
  </view>
  <!-- Content: refer to 有品·优惠券 + 点评(可使用) -->
  <view class="coupon-list">
-    <view class="item stamp stamp01 ">
+    <view class="item stamp {{validStatus==true?'stamp01':'stamp06'}}">
-        <!-- 左侧 -->
+        <!-- 积分详情 -->
        <view class="float-li t1">
            <view class="coupon-left">
              <view class="t1">
                <view class="t1-left">9元</view>
                <view class="t1-right">Renaissance Bar优惠积分</view>
              </view>
-              <view class="t t2">有效期至：2020/07/31 23:59</view>
+              <view class="t2">
+                <view class="t2-left">有效期至：2020/07/31 23:59</view>
+                <view class="t2-right" hidden="{{validStatus==true?true:false}}">
+                  已过期
+                </view>
+              </view> 
+              <view class="t3">
+                <view class="t3-left">好友助力：助力10人，共4积分</view>
+                <view class="t3-right" bindtap="onClickPoints">
+                  <image src="../../../icon/my/points-detail.png"></image>
+                </view>
+              </view>
+              <view class="t4">
+                <view class="t4-left">优惠券码：264669616164</view>
+                <view class="t4-right" bindtap="onClickBarcode">
+                  <image src="../../../icon/my/logo-barcode.png"></image>
+                </view>
+              </view>
+            </view>
+        </view>
+    </view>
+    <view class="item stamp {{validStatus==true?'stamp01':'stamp06'}} ">
+        <!-- 积分详情 -->
+        <view class="float-li t1">
+            <view class="coupon-left">
+              <view class="t1">
+                <view class="t1-left">9元</view>
+                <view class="t1-right">Renaissance Bar优惠积分</view>
+              </view>
+              <view class="t2">
+                <view class="t2-left">有效期至：2020/07/31 23:59</view>
+                <view class="t2-right" hidden="{{validStatus==true?true:false}}">
+                  已过期
+                </view>
+              </view> 
              <view class="t3">
                <view class="t3-left">好友助力：助力10人，共4积分</view>
                <view class="t3-right" bindtap="onClickPoints">
                  <image src="../../../icon/my/points-detail.png"></image>
                </view>
              </view> 
              <view class="t4">
                <view class="t4-left">优惠券码：264669616164</view>
                <view class="t4-right" bindtap="onClickBarcode">
                  <image src="../../../icon/my/logo-barcode.png"></image>
                </view>
-              </view>                           
+              </view>
            </view>
        </view>
-        <!-- 右侧 -->
+    </view>
-        <view class="float-li-right">
-            <view class="coupon-right">
+    <view class="item stamp {{validStatus==true?'stamp01':'stamp06'}} ">
-               <view class="t t1">有效期至</view>
+        <!-- 积分详情 -->
-               <view class="t t2">2018-01-17</view>
+        <view class="float-li t1">
-               <view class="t t2">23:59:00</view>
+            <view class="coupon-left">
-               <view class="t t3"><text>立即领取</text></view>
+              <view class="t1">
+                <view class="t1-left">9元</view>
+                <view class="t1-right">Renaissance Bar优惠积分</view>
+              </view>
+              <view class="t2">
+                <view class="t2-left">有效期至：2020/07/31 23:59</view>
+                <view class="t2-right" hidden="{{validStatus==true?true:false}}">
+                  已过期
+                </view>
+              </view> 
+              <view class="t3">
+                <view class="t3-left">好友助力：助力10人，共4积分</view>
+                <view class="t3-right" bindtap="onClickPoints">
+                  <image src="../../../icon/my/points-detail.png"></image>
+                </view>
+              </view>
+              <view class="t4">
+                <view class="t4-left">优惠券码：264669616164</view>
+                <view class="t4-right" bindtap="onClickBarcode">
+                  <image src="../../../icon/my/logo-barcode.png"></image>
+                </view>
+              </view>
            </view>
        </view>
    </view>
  </view>
  <!-- 查看好友助力-->

--- a/增值产品-小程序及app/nyx-master/pages/my/points/points.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/my/points/points.wxss
 .page{
@@ -41,8 +41,13 @@
 .coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 160rpx; color: #fff}
 .coupon-left .t1-left{width: 160rpx; font-size: 70rpx; font-weight: bold}
 .coupon-left .t1-right{width: 520rpx; font-size: 50rpx; }
-.coupon-left .t2{left: 20rpx; top:160rpx}
-.coupon-left .t3{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 50rpx; height: 50rpx; color: #fff}
+/* .coupon-left .t2{left: 20rpx; top:160rpx} */
+.coupon-left .t2{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}
+.coupon-left .t2-left{width: 520rpx; }
+.coupon-left .t2-right{width: 160rpx;}
+.coupon-left .t3{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}
 .coupon-left .t3-left{width: 520rpx; }
 .coupon-left .t3-right{width: 160rpx;}
 .coupon-left .t3-right image{
@@ -64,10 +69,8 @@
 .coupon-right .t3{padding-top:20rpx}
 .coupon-right .t3 text{background: #fff; color: #333; border-radius: 7rpx; padding: 10rpx 40rpx}
 .note{background: #faeab7}
 .stamp{width:700rpx; height: 250rpx;margin-bottom:50rpx;position:relative;overflow:hidden}
 .stamp i{position: absolute;left: 20%;top: 90rpx;height: 500rpx;width: 700rpx;background-color: rgba(255,255,255,.15);transform: rotate(-30deg);
 }
@@ -78,6 +81,9 @@
 .stamp05{background:radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 30rpx, #D24161 30rpx);background-size:10rpx 10rpx;background-position:9rpx 3rpx; background: #f0229b}
 .stamp05{background:radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 30rpx, #D24161 30rpx);background-size:10rpx 10rpx;background-position:9rpx 3rpx; background: #f0229b}
+/* 失效样式 */
+.stamp06{background:radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 30rpx, #e2e2e2 30rpx);background-size:10rpx 10rpx;background-position:9rpx 3rpx; background: #acacac
+}
 /* start - 小程序自定义弹框css */
 /* 遮罩层 */
@@ -96,8 +102,8 @@
 .modalDlg{
    width: 80%;
    height: 360rpx;
-    position: relative;
+    position: fixed;
-    top: 0px;
+    top: 240rpx;
    left: 0;
    right: 0;
    z-index: 9999;