kk.shi 3 lat temu
rodzic
commit
897de5d6a3
2 zmienionych plików z 12 dodań i 8 usunięć
  1. 10 6
      pages/signIn/record/record.wxml
  2. 2 2
      pages/signIn/record/record.wxss

+ 10 - 6
pages/signIn/record/record.wxml

@@ -9,15 +9,15 @@
   </view>
   <!-- 中部说明 -->
   <view class="explain flex-row">
-    <view class="explain-left flex-column" catchtap="getCoupon">
+    <view class="explain-left flex-column" catchtap="{{isLogin?'getCoupon':''}}">
       <view class="explain-discount">我的优惠</view>
       <view class="{{noCoupon?'explain-column':'explain-columnNo'}}"></view>
     </view>
-    <view class="explain-center flex-column" catchtap="getDetail">
+    <view class="explain-center flex-column" catchtap="{{isLogin?'getDetail':''}}">
       <view class="explain-detailed">获取明细</view>
       <view class="{{noDetail?'explain-column':'explain-columnNo'}}"></view>
     </view>
-    <view class="explain-right flex-column" catchtap="getUtility">
+    <view class="explain-right flex-column" catchtap="{{isLogin?'getUtility':''}}">
       <view class="explain-utility">使用/失效</view>
       <view class="{{noUtility?'explain-column':'explain-columnNo'}}"></view>
     </view>
@@ -63,7 +63,7 @@
       <!-- 获得明细 -->
       <view class="detailed flex-column" hidden="{{hiddenDetail}}">
         <view class="detailed-content" wx:for="{{detailList}}" wx:key="index" data-id="{{item.id}}">
-          <view class="detailed-date flex-column">2021年10月</view>
+          <view class="detailed-date flex-column"></view>
           <view class="detailed-sign flex-row">
             <view class="detailed-sign-index flex-column">
               <view class="detailed-sign-text">{{item.source =='1'?'签到':'任务'}}</view>
@@ -73,20 +73,24 @@
           </view>
           
         </view>
+        <view class="detailed-date flex-column"></view>
       </view>
       <!-- 使用/失效 -->
       <view class="detailed flex-column" hidden="{{hiddenUtility}}">
         <view class="detailed-content" wx:for="{{stateList}}" wx:key="index" data-id="{{item.id}}">
-          <view class="detailed-date flex-column">2021年11月</view>
+          <view class="detailed-date flex-column"></view>
           <view class="detailed-sign flex-row">
             <view class="detailed-sign-index flex-column">
               <view class="detailed-sign-text">{{item.coupon.couponTitle}}</view>
               <view class="detailed-sign-date">{{item.crateTime}}</view>
             </view>
-            <view class="detailed-coupon flex-column" style="color: #8F8F8F;">{{item.invalid?'已失效':'未使用'}}</view>
+            <view class="detailed-coupon flex-column" style="color: #8F8F8F;" wx:if="{{item.invalid}}">已失效</view>
+            <view class="detailed-coupon flex-column" style="color: #8F8F8F;" wx:elif="{{item.used}}">已使用</view>
+            <view class="detailed-coupon flex-column" style="color: #8F8F8F;" wx:else="{{!item.used}}">未使用</view>
           </view>
           
         </view>
+        <view class="detailed-date flex-column"></view>
       </view>
         <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂无可用优惠券 ————</view>
         <view class="no_result" wx:if="{{noMore}}">———— 更多优惠券 | 敬请期待 ————</view>

+ 2 - 2
pages/signIn/record/record.wxss

@@ -244,12 +244,12 @@
 .detailed-content{
   width: 750rpx;
   height: auto;
-  margin-top: 4px;
+  /* margin-top: 4px; */
 }
 
 .detailed-date{
   width: 100%;
-  height: 40px;
+  height: 10px;
   font-size: 14px;
   font-weight: 400;
   color: #6E6E6E;